From 2dc9359cba5065dddb7ca254536e7366fd5fa7e0 Mon Sep 17 00:00:00 2001 From: JumpIfZero Date: Fri, 22 Apr 2022 12:43:18 +0300 Subject: [PATCH] project: hello again rev206 --- .../src/main/java/AbstractArchive.java | 253 +- .../main/java/AbstractByteArrayCopier.java | 435 +- .../src/main/java/AbstractFont.java | 530 +- .../src/main/java/AbstractRasterProvider.java | 26 +- .../src/main/java/AbstractSocket.java | 82 +- .../src/main/java/AbstractSound.java | 2 +- .../src/main/java/AbstractUserComparator.java | 38 +- .../src/main/java/AbstractWorldMapData.java | 358 +- .../src/main/java/AbstractWorldMapIcon.java | 110 +- .../src/main/java/AccessFile.java | 41 +- runescape-client/src/main/java/Actor.java | 460 +- runescape-client/src/main/java/Animation.java | 70 +- .../main/java/ApproximateRouteStrategy.java | 175 +- runescape-client/src/main/java/Archive.java | 980 +- .../src/main/java/ArchiveDisk.java | 72 +- .../src/main/java/ArchiveDiskAction.java | 20 +- .../main/java/ArchiveDiskActionHandler.java | 273 +- .../src/main/java/ArchiveLoader.java | 367 +- .../src/main/java/AttackOption.java | 196 +- .../src/main/java/AudioFilter.java | 110 +- .../src/main/java/BZip2Decompressor.java | 76 +- .../src/main/java/BZip2State.java | 133 +- .../src/main/java/BoundaryObject.java | 43 +- runescape-client/src/main/java/Bounds.java | 100 +- runescape-client/src/main/java/Buddy.java | 26 +- .../src/main/java/BuddyRankComparator.java | 355 +- runescape-client/src/main/java/Buffer.java | 1275 ++- .../src/main/java/BufferedFile.java | 123 +- .../src/main/java/BufferedNetSocket.java | 81 +- .../src/main/java/BufferedSink.java | 183 +- .../src/main/java/BufferedSource.java | 485 +- .../src/main/java/ByteArrayNode.java | 2 +- .../src/main/java/ByteArrayPool.java | 159 +- runescape-client/src/main/java/Calendar.java | 125 +- runescape-client/src/main/java/Canvas.java | 104 +- .../src/main/java/ChatChannel.java | 143 +- .../src/main/java/ClanChannel.java | 513 +- .../src/main/java/ClanChannelMember.java | 107 +- runescape-client/src/main/java/ClanMate.java | 554 +- .../src/main/java/ClanSettings.java | 455 +- runescape-client/src/main/java/Client.java | 8779 ++++++++--------- .../src/main/java/ClientPacket.java | 1040 +- .../src/main/java/ClientPreferences.java | 490 +- runescape-client/src/main/java/Clock.java | 57 +- .../src/main/java/CollisionMap.java | 122 +- runescape-client/src/main/java/Coord.java | 81 +- runescape-client/src/main/java/Decimator.java | 114 +- .../src/main/java/DefaultsGroup.java | 29 +- .../src/main/java/DemotingHashTable.java | 36 +- .../java/DesktopPlatformInfoProvider.java | 206 +- .../src/main/java/DevicePcmPlayer.java | 96 +- .../main/java/DevicePcmPlayerProvider.java | 303 +- .../src/main/java/DirectByteArrayCopier.java | 825 +- .../src/main/java/DirectWrapper.java | 4 +- runescape-client/src/main/java/DualNode.java | 14 +- .../src/main/java/DualNodeDeque.java | 14 +- .../src/main/java/DynamicObject.java | 409 +- .../src/main/java/EnumComposition.java | 123 +- .../main/java/EvictingDualNodeHashTable.java | 80 +- .../src/main/java/FaceNormal.java | 27 +- .../src/main/java/FileSystem.java | 12 +- runescape-client/src/main/java/FillMode.java | 62 +- .../src/main/java/FloorDecoration.java | 226 +- .../src/main/java/FloorOverlayDefinition.java | 364 +- .../main/java/FloorUnderlayDefinition.java | 155 +- runescape-client/src/main/java/Font.java | 4 +- runescape-client/src/main/java/FontName.java | 190 +- runescape-client/src/main/java/Fonts.java | 72 +- runescape-client/src/main/java/Frames.java | 74 +- runescape-client/src/main/java/Friend.java | 26 +- .../src/main/java/FriendLoginUpdate.java | 84 +- .../src/main/java/FriendSystem.java | 751 +- .../src/main/java/FriendsChat.java | 259 +- .../src/main/java/FriendsList.java | 163 +- .../src/main/java/GZipDecompressor.java | 14 +- runescape-client/src/main/java/GameBuild.java | 110 +- .../src/main/java/GameEngine.java | 1345 ++- .../src/main/java/GameObject.java | 129 +- .../src/main/java/GrandExchangeEvent.java | 78 +- .../src/main/java/GrandExchangeEvents.java | 79 +- .../src/main/java/GrandExchangeOffer.java | 96 +- .../java/GrandExchangeOfferAgeComparator.java | 20 +- .../GrandExchangeOfferNameComparator.java | 9 +- .../GrandExchangeOfferOwnWorldComparator.java | 118 +- ...dExchangeOfferTotalQuantityComparator.java | 100 +- ...GrandExchangeOfferUnitPriceComparator.java | 184 +- .../GrandExchangeOfferWorldComparator.java | 179 +- .../src/main/java/GraphicsDefaults.java | 568 +- .../src/main/java/GraphicsObject.java | 107 +- runescape-client/src/main/java/HealthBar.java | 145 +- .../src/main/java/HealthBarDefinition.java | 219 +- .../src/main/java/HealthBarUpdate.java | 419 +- .../src/main/java/HitSplatDefinition.java | 766 +- .../src/main/java/HorizontalAlignment.java | 488 +- runescape-client/src/main/java/Huffman.java | 28 +- .../src/main/java/IgnoreList.java | 72 +- runescape-client/src/main/java/Ignored.java | 23 +- .../src/main/java/IndexedSprite.java | 27 +- .../src/main/java/Instrument.java | 73 +- .../src/main/java/IntHashTable.java | 6 +- .../src/main/java/IntegerNode.java | 2 +- .../src/main/java/InterfaceParent.java | 906 +- .../src/main/java/Interpreter.java | 545 +- .../src/main/java/InvDefinition.java | 83 +- .../src/main/java/IsaacCipher.java | 44 +- .../src/main/java/ItemComposition.java | 604 +- .../src/main/java/ItemContainer.java | 135 +- runescape-client/src/main/java/ItemLayer.java | 252 +- .../src/main/java/IterableDualNodeQueue.java | 68 +- .../java/IterableDualNodeQueueIterator.java | 44 +- .../src/main/java/IterableNodeDeque.java | 214 +- .../IterableNodeDequeDescendingIterator.java | 54 +- .../src/main/java/IterableNodeHashTable.java | 106 +- .../java/IterableNodeHashTableIterator.java | 62 +- .../src/main/java/JagexCache.java | 113 +- .../src/main/java/KeyHandler.java | 418 +- .../src/main/java/KitDefinition.java | 149 +- runescape-client/src/main/java/Language.java | 657 +- runescape-client/src/main/java/Link.java | 10 +- runescape-client/src/main/java/LinkDeque.java | 42 +- runescape-client/src/main/java/Login.java | 472 +- .../src/main/java/LoginPacket.java | 103 +- .../src/main/java/LoginScreenAnimation.java | 392 +- runescape-client/src/main/java/LoginType.java | 104 +- .../src/main/java/MenuAction.java | 110 +- runescape-client/src/main/java/Message.java | 348 +- runescape-client/src/main/java/Messages.java | 72 +- .../src/main/java/MidiFileReader.java | 88 +- .../src/main/java/MidiPcmStream.java | 907 +- .../src/main/java/MilliClock.java | 162 +- runescape-client/src/main/java/ModeWhere.java | 345 +- runescape-client/src/main/java/Model.java | 1303 +-- runescape-client/src/main/java/ModelData.java | 372 +- .../src/main/java/ModelData0.java | 66 +- .../src/main/java/MouseHandler.java | 698 +- .../src/main/java/MouseRecorder.java | 287 +- .../src/main/java/MouseWheel.java | 4 +- .../src/main/java/MouseWheelHandler.java | 14 +- .../src/main/java/MusicPatch.java | 271 +- .../src/main/java/MusicPatchNode.java | 166 +- .../src/main/java/MusicPatchNode2.java | 110 +- .../src/main/java/MusicPatchPcmStream.java | 316 +- .../src/main/java/MusicTrack.java | 16 +- runescape-client/src/main/java/NPC.java | 350 +- .../src/main/java/NPCComposition.java | 434 +- runescape-client/src/main/java/NanoClock.java | 18 +- runescape-client/src/main/java/NetCache.java | 242 +- .../src/main/java/NetFileRequest.java | 99 +- runescape-client/src/main/java/NetSocket.java | 251 +- runescape-client/src/main/java/Node.java | 16 +- runescape-client/src/main/java/NodeDeque.java | 42 +- .../src/main/java/NodeHashTable.java | 28 +- .../jagex/oldscape/pub => }/OAuthApi.java | 8 +- .../src/main/java/ObjectComposition.java | 1056 +- .../src/main/java/ObjectNode.java | 2 +- .../src/main/java/ObjectSound.java | 135 +- runescape-client/src/main/java/Occluder.java | 108 +- .../oldscape/pub => }/OtlTokenRequester.java | 4 +- .../oldscape/pub => }/OtlTokenResponse.java | 4 +- .../src/main/java/PacketBuffer.java | 74 +- .../src/main/java/PacketBufferNode.java | 73 +- .../src/main/java/PacketWriter.java | 304 +- .../src/main/java/ParamComposition.java | 151 +- runescape-client/src/main/java/PcmPlayer.java | 639 +- runescape-client/src/main/java/PcmStream.java | 42 +- .../src/main/java/PcmStreamMixer.java | 130 +- .../src/main/java/PcmStreamMixerListener.java | 8 +- .../src/main/java/PendingSpawn.java | 167 +- .../src/main/java/PlatformInfo.java | 292 +- .../src/main/java/PlatformInfoProvider.java | 6 +- runescape-client/src/main/java/Player.java | 781 +- .../src/main/java/PlayerComposition.java | 575 +- .../src/main/java/PlayerType.java | 408 +- runescape-client/src/main/java/Players.java | 132 +- .../src/main/java/PrivateChatMode.java | 34 +- .../src/main/java/Projectile.java | 712 +- .../src/main/java/RasterProvider.java | 58 +- .../src/main/java/Rasterizer2D.java | 66 +- .../src/main/java/Rasterizer3D.java | 254 +- .../src/main/java/RawPcmStream.java | 976 +- runescape-client/src/main/java/RawSound.java | 16 +- .../src/main/java/ReflectionCheck.java | 199 +- .../src/main/java/Renderable.java | 685 +- .../src/main/java/RouteStrategy.java | 209 +- .../src/main/java/RunException.java | 18 +- runescape-client/src/main/java/Scene.java | 2772 +++--- .../src/main/java/SceneTileModel.java | 70 +- .../src/main/java/SceneTilePaint.java | 84 +- runescape-client/src/main/java/Script.java | 183 +- .../src/main/java/ScriptEvent.java | 90 +- .../src/main/java/ScriptFrame.java | 960 +- .../src/main/java/SecureRandomCallable.java | 279 +- .../src/main/java/SecureRandomFuture.java | 225 +- .../src/main/java/SequenceDefinition.java | 1224 ++- .../src/main/java/ServerPacket.java | 1226 ++- runescape-client/src/main/java/Skeleton.java | 196 +- runescape-client/src/main/java/Skills.java | 47 +- .../src/main/java/SoftWrapper.java | 4 +- .../src/main/java/SoundCache.java | 951 +- .../src/main/java/SoundEffect.java | 22 +- .../src/main/java/SoundEnvelope.java | 30 +- .../src/main/java/SoundSystem.java | 119 +- .../main/java/SpotAnimationDefinition.java | 124 +- .../src/main/java/SpriteMask.java | 86 +- .../src/main/java/SpritePixels.java | 114 +- runescape-client/src/main/java/Strings.java | 305 +- .../src/main/java/StructComposition.java | 146 +- .../src/main/java/StudioGame.java | 253 +- runescape-client/src/main/java/Task.java | 14 +- .../src/main/java/TaskHandler.java | 48 +- runescape-client/src/main/java/Texture.java | 216 +- .../src/main/java/TextureLoader.java | 20 +- .../src/main/java/TextureProvider.java | 181 +- runescape-client/src/main/java/Tile.java | 213 +- runescape-client/src/main/java/TileItem.java | 109 +- runescape-client/src/main/java/Tiles.java | 162 +- runescape-client/src/main/java/Timer.java | 186 +- runescape-client/src/main/java/TriBool.java | 83 +- .../src/main/java/UrlRequest.java | 109 +- .../src/main/java/UrlRequester.java | 184 +- runescape-client/src/main/java/User.java | 46 +- .../src/main/java/UserComparator1.java | 22 +- .../src/main/java/UserComparator10.java | 95 +- .../src/main/java/UserComparator2.java | 115 +- .../src/main/java/UserComparator3.java | 224 +- .../src/main/java/UserComparator4.java | 129 +- .../src/main/java/UserComparator5.java | 116 +- .../src/main/java/UserComparator6.java | 69 +- .../src/main/java/UserComparator7.java | 87 +- .../src/main/java/UserComparator8.java | 321 +- .../src/main/java/UserComparator9.java | 387 +- runescape-client/src/main/java/UserList.java | 319 +- runescape-client/src/main/java/Username.java | 58 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitComposition.java | 137 +- runescape-client/src/main/java/VarcInt.java | 58 +- runescape-client/src/main/java/Varcs.java | 1173 +-- .../src/main/java/VarpDefinition.java | 725 +- runescape-client/src/main/java/Varps.java | 68 +- .../src/main/java/VertexNormal.java | 111 +- .../src/main/java/VerticalAlignment.java | 93 +- .../src/main/java/ViewportMouse.java | 272 +- .../src/main/java/VorbisCodebook.java | 243 +- .../src/main/java/VorbisFloor.java | 150 +- .../src/main/java/VorbisMapping.java | 8 +- .../src/main/java/VorbisResidue.java | 20 +- .../src/main/java/VorbisSample.java | 244 +- .../src/main/java/WallDecoration.java | 86 +- runescape-client/src/main/java/Widget.java | 2188 ++-- runescape-client/src/main/java/World.java | 161 +- runescape-client/src/main/java/WorldMap.java | 1667 ++-- .../src/main/java/WorldMapArchiveLoader.java | 41 +- .../src/main/java/WorldMapArea.java | 470 +- .../src/main/java/WorldMapAreaData.java | 329 +- .../src/main/java/WorldMapCacheName.java | 172 +- .../src/main/java/WorldMapData_0.java | 126 +- .../src/main/java/WorldMapData_1.java | 168 +- .../src/main/java/WorldMapDecoration.java | 23 +- .../src/main/java/WorldMapDecorationType.java | 304 +- .../src/main/java/WorldMapElement.java | 795 +- .../src/main/java/WorldMapEvent.java | 67 +- .../src/main/java/WorldMapID.java | 95 +- .../src/main/java/WorldMapIcon_0.java | 158 +- .../src/main/java/WorldMapIcon_1.java | 503 +- .../src/main/java/WorldMapLabel.java | 394 +- .../src/main/java/WorldMapLabelSize.java | 712 +- .../src/main/java/WorldMapManager.java | 502 +- .../src/main/java/WorldMapRectangle.java | 52 +- .../src/main/java/WorldMapRegion.java | 1534 ++- .../src/main/java/WorldMapScaleHandler.java | 244 +- .../src/main/java/WorldMapSection.java | 30 +- .../src/main/java/WorldMapSection0.java | 226 +- .../src/main/java/WorldMapSection1.java | 360 +- .../src/main/java/WorldMapSection2.java | 201 +- .../src/main/java/WorldMapSectionType.java | 601 +- .../src/main/java/WorldMapSprite.java | 181 +- runescape-client/src/main/java/Wrapper.java | 6 +- runescape-client/src/main/java/class0.java | 27 +- runescape-client/src/main/java/class1.java | 121 +- runescape-client/src/main/java/class10.java | 433 +- runescape-client/src/main/java/class101.java | 163 +- runescape-client/src/main/java/class11.java | 650 +- runescape-client/src/main/java/class113.java | 111 +- runescape-client/src/main/java/class114.java | 45 +- runescape-client/src/main/java/class115.java | 463 +- runescape-client/src/main/java/class116.java | 741 +- runescape-client/src/main/java/class117.java | 579 +- runescape-client/src/main/java/class118.java | 247 +- runescape-client/src/main/java/class119.java | 470 +- runescape-client/src/main/java/class12.java | 364 +- runescape-client/src/main/java/class120.java | 77 +- runescape-client/src/main/java/class121.java | 25 - runescape-client/src/main/java/class122.java | 433 +- runescape-client/src/main/java/class123.java | 182 +- runescape-client/src/main/java/class124.java | 75 +- runescape-client/src/main/java/class125.java | 83 +- runescape-client/src/main/java/class126.java | 164 +- runescape-client/src/main/java/class127.java | 362 +- runescape-client/src/main/java/class128.java | 846 +- runescape-client/src/main/java/class129.java | 115 +- runescape-client/src/main/java/class13.java | 139 +- runescape-client/src/main/java/class131.java | 134 +- runescape-client/src/main/java/class132.java | 901 +- runescape-client/src/main/java/class133.java | 56 +- runescape-client/src/main/java/class134.java | 189 +- runescape-client/src/main/java/class135.java | 496 +- runescape-client/src/main/java/class136.java | 155 +- runescape-client/src/main/java/class137.java | 71 +- runescape-client/src/main/java/class138.java | 217 +- runescape-client/src/main/java/class14.java | 220 +- runescape-client/src/main/java/class140.java | 73 +- runescape-client/src/main/java/class141.java | 188 +- runescape-client/src/main/java/class142.java | 52 +- runescape-client/src/main/java/class143.java | 150 +- runescape-client/src/main/java/class144.java | 145 +- runescape-client/src/main/java/class145.java | 131 +- runescape-client/src/main/java/class146.java | 322 +- runescape-client/src/main/java/class147.java | 95 +- runescape-client/src/main/java/class149.java | 575 +- runescape-client/src/main/java/class15.java | 62 +- runescape-client/src/main/java/class150.java | 215 +- runescape-client/src/main/java/class151.java | 414 +- runescape-client/src/main/java/class152.java | 94 +- runescape-client/src/main/java/class154.java | 315 +- runescape-client/src/main/java/class155.java | 488 +- runescape-client/src/main/java/class158.java | 6 +- runescape-client/src/main/java/class16.java | 134 +- runescape-client/src/main/java/class160.java | 143 +- runescape-client/src/main/java/class162.java | 193 +- runescape-client/src/main/java/class163.java | 206 +- runescape-client/src/main/java/class166.java | 138 +- runescape-client/src/main/java/class168.java | 151 +- runescape-client/src/main/java/class17.java | 830 +- runescape-client/src/main/java/class175.java | 533 +- runescape-client/src/main/java/class18.java | 96 +- runescape-client/src/main/java/class182.java | 39 +- runescape-client/src/main/java/class19.java | 451 +- runescape-client/src/main/java/class193.java | 218 +- runescape-client/src/main/java/class194.java | 1063 +- runescape-client/src/main/java/class196.java | 152 + runescape-client/src/main/java/class2.java | 2 +- runescape-client/src/main/java/class20.java | 343 +- runescape-client/src/main/java/class202.java | 204 - runescape-client/src/main/java/class204.java | 200 + runescape-client/src/main/java/class205.java | 19 + runescape-client/src/main/java/class21.java | 124 +- runescape-client/src/main/java/class214.java | 63 + runescape-client/src/main/java/class216.java | 19 + runescape-client/src/main/java/class221.java | 323 - runescape-client/src/main/java/class229.java | 169 - runescape-client/src/main/java/class230.java | 74 - runescape-client/src/main/java/class231.java | 150 + runescape-client/src/main/java/class239.java | 94 - runescape-client/src/main/java/class241.java | 42 - runescape-client/src/main/java/class249.java | 2 +- runescape-client/src/main/java/class250.java | 32 +- runescape-client/src/main/java/class251.java | 2 +- runescape-client/src/main/java/class252.java | 2 +- runescape-client/src/main/java/class253.java | 4 +- runescape-client/src/main/java/class259.java | 11 + runescape-client/src/main/java/class260.java | 61 +- runescape-client/src/main/java/class261.java | 2 +- runescape-client/src/main/java/class263.java | 185 +- runescape-client/src/main/java/class267.java | 14 +- runescape-client/src/main/java/class268.java | 896 +- runescape-client/src/main/java/class269.java | 12 +- runescape-client/src/main/java/class27.java | 19 +- runescape-client/src/main/java/class270.java | 42 +- runescape-client/src/main/java/class271.java | 451 +- runescape-client/src/main/java/class273.java | 108 +- runescape-client/src/main/java/class28.java | 60 +- runescape-client/src/main/java/class282.java | 91 +- runescape-client/src/main/java/class286.java | 107 +- runescape-client/src/main/java/class29.java | 340 +- runescape-client/src/main/java/class290.java | 259 +- runescape-client/src/main/java/class291.java | 179 +- runescape-client/src/main/java/class293.java | 74 +- runescape-client/src/main/java/class295.java | 35 +- runescape-client/src/main/java/class296.java | 96 +- runescape-client/src/main/java/class299.java | 25 - runescape-client/src/main/java/class3.java | 6 +- runescape-client/src/main/java/class300.java | 22 +- runescape-client/src/main/java/class301.java | 115 +- runescape-client/src/main/java/class302.java | 70 +- runescape-client/src/main/java/class305.java | 141 +- runescape-client/src/main/java/class306.java | 53 +- runescape-client/src/main/java/class307.java | 58 +- runescape-client/src/main/java/class309.java | 58 +- runescape-client/src/main/java/class321.java | 233 +- runescape-client/src/main/java/class326.java | 247 +- runescape-client/src/main/java/class327.java | 89 +- runescape-client/src/main/java/class329.java | 11 +- runescape-client/src/main/java/class33.java | 45 - runescape-client/src/main/java/class340.java | 22 +- runescape-client/src/main/java/class341.java | 428 +- runescape-client/src/main/java/class342.java | 281 +- runescape-client/src/main/java/class345.java | 76 +- runescape-client/src/main/java/class346.java | 365 +- runescape-client/src/main/java/class347.java | 10 + runescape-client/src/main/java/class348.java | 30 + runescape-client/src/main/java/class349.java | 80 +- runescape-client/src/main/java/class350.java | 4 +- runescape-client/src/main/java/class351.java | 54 +- runescape-client/src/main/java/class355.java | 32 - runescape-client/src/main/java/class356.java | 65 +- runescape-client/src/main/java/class357.java | 9 + runescape-client/src/main/java/class358.java | 35 +- runescape-client/src/main/java/class359.java | 66 +- runescape-client/src/main/java/class360.java | 953 +- runescape-client/src/main/java/class361.java | 168 +- runescape-client/src/main/java/class362.java | 40 +- runescape-client/src/main/java/class384.java | 19 + runescape-client/src/main/java/class385.java | 143 +- runescape-client/src/main/java/class386.java | 170 +- runescape-client/src/main/java/class387.java | 759 +- runescape-client/src/main/java/class388.java | 329 +- runescape-client/src/main/java/class389.java | 40 +- runescape-client/src/main/java/class390.java | 44 +- runescape-client/src/main/java/class391.java | 75 +- runescape-client/src/main/java/class392.java | 92 +- runescape-client/src/main/java/class393.java | 18 +- runescape-client/src/main/java/class394.java | 239 +- runescape-client/src/main/java/class396.java | 2 +- runescape-client/src/main/java/class397.java | 32 +- runescape-client/src/main/java/class398.java | 8 +- runescape-client/src/main/java/class399.java | 46 +- runescape-client/src/main/java/class4.java | 83 +- runescape-client/src/main/java/class400.java | 57 +- runescape-client/src/main/java/class401.java | 53 +- runescape-client/src/main/java/class406.java | 2 +- runescape-client/src/main/java/class419.java | 16 +- runescape-client/src/main/java/class420.java | 111 +- runescape-client/src/main/java/class422.java | 14 +- runescape-client/src/main/java/class425.java | 36 +- runescape-client/src/main/java/class426.java | 78 +- runescape-client/src/main/java/class427.java | 16 +- runescape-client/src/main/java/class428.java | 80 +- runescape-client/src/main/java/class429.java | 27 +- runescape-client/src/main/java/class430.java | 64 +- runescape-client/src/main/java/class431.java | 205 +- runescape-client/src/main/java/class432.java | 45 +- runescape-client/src/main/java/class433.java | 42 + runescape-client/src/main/java/class434.java | 13 - runescape-client/src/main/java/class435.java | 34 - runescape-client/src/main/java/class440.java | 6 +- runescape-client/src/main/java/class441.java | 90 +- runescape-client/src/main/java/class444.java | 8 +- runescape-client/src/main/java/class445.java | 42 +- .../main/java/{class47.java => class45.java} | 8 +- runescape-client/src/main/java/class451.java | 31 +- runescape-client/src/main/java/class452.java | 9 - runescape-client/src/main/java/class457.java | 11 - runescape-client/src/main/java/class460.java | 9 - runescape-client/src/main/java/class5.java | 36 +- runescape-client/src/main/java/class54.java | 56 + runescape-client/src/main/java/class6.java | 122 +- runescape-client/src/main/java/class65.java | 320 +- runescape-client/src/main/java/class67.java | 210 +- runescape-client/src/main/java/class7.java | 224 +- runescape-client/src/main/java/class78.java | 192 +- runescape-client/src/main/java/class8.java | 30 +- runescape-client/src/main/java/class82.java | 136 +- runescape-client/src/main/java/class83.java | 129 +- runescape-client/src/main/java/class9.java | 1129 ++- runescape-client/src/main/java/class92.java | 84 +- runescape-client/src/main/java/class93.java | 161 +- 466 files changed, 55930 insertions(+), 56034 deletions(-) rename runescape-client/src/main/java/{com/jagex/oldscape/pub => }/OAuthApi.java (78%) rename runescape-client/src/main/java/{com/jagex/oldscape/pub => }/OtlTokenRequester.java (65%) rename runescape-client/src/main/java/{com/jagex/oldscape/pub => }/OtlTokenResponse.java (59%) delete mode 100644 runescape-client/src/main/java/class121.java create mode 100644 runescape-client/src/main/java/class196.java delete mode 100644 runescape-client/src/main/java/class202.java create mode 100644 runescape-client/src/main/java/class204.java create mode 100644 runescape-client/src/main/java/class205.java create mode 100644 runescape-client/src/main/java/class214.java create mode 100644 runescape-client/src/main/java/class216.java delete mode 100644 runescape-client/src/main/java/class221.java delete mode 100644 runescape-client/src/main/java/class229.java delete mode 100644 runescape-client/src/main/java/class230.java create mode 100644 runescape-client/src/main/java/class231.java delete mode 100644 runescape-client/src/main/java/class239.java delete mode 100644 runescape-client/src/main/java/class241.java create mode 100644 runescape-client/src/main/java/class259.java delete mode 100644 runescape-client/src/main/java/class299.java delete mode 100644 runescape-client/src/main/java/class33.java create mode 100644 runescape-client/src/main/java/class347.java create mode 100644 runescape-client/src/main/java/class348.java delete mode 100644 runescape-client/src/main/java/class355.java create mode 100644 runescape-client/src/main/java/class357.java create mode 100644 runescape-client/src/main/java/class384.java create mode 100644 runescape-client/src/main/java/class433.java delete mode 100644 runescape-client/src/main/java/class434.java delete mode 100644 runescape-client/src/main/java/class435.java rename runescape-client/src/main/java/{class47.java => class45.java} (67%) delete mode 100644 runescape-client/src/main/java/class452.java delete mode 100644 runescape-client/src/main/java/class457.java delete mode 100644 runescape-client/src/main/java/class460.java create mode 100644 runescape-client/src/main/java/class54.java diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index a9d3ce1317..e2100b6d71 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("lq") +@ObfuscatedName("ln") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lqr;" + descriptor = "Lqg;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1581331559 + intValue = -464059087 ) - static int field3960; - @ObfuscatedName("j") + static int field3981; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1795063473 + intValue = -1291007483 ) @Export("groupCount") int groupCount; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("groupIds") int[] groupIds; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lqt;" + descriptor = "Lqc;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("fileIds") int[][] fileIds; @ObfuscatedName("y") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lqt;" + descriptor = "[Lqc;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; @ObfuscatedName("e") @Export("groups") Object[] groups; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("files") Object[][] files; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 2000080145 + intValue = -1671437871 ) @Export("hash") public int hash; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); // L: 23 - field3960 = 0; // L: 27 + field3981 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { @@ -86,45 +86,45 @@ public abstract class AbstractArchive { this.shallowFiles = var2; // L: 33 } // L: 34 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1837860336" + garbageValue = "2136943756" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } // L: 123 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1164111138" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("loadGroup") void loadGroup(int var1) { } // L: 209 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1946405808" + garbageValue = "-1034622346" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; // L: 179 180 } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "0" + descriptor = "([BI)V", + garbageValue = "-258163791" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { int var3 = var1.length; // L: 38 - int var2 = class300.method5768(var1, 0, var3); // L: 40 + int var2 = class144.method3082(var1, 0, var3); // L: 40 this.hash = var2; // L: 42 - Buffer var4 = new Buffer(class149.decompressBytes(var1)); // L: 43 + Buffer var4 = new Buffer(Actor.decompressBytes(var1)); // L: 43 int var5 = var4.readUnsignedByte(); // L: 44 if (var5 >= 5 && var5 <= 7) { // L: 45 if (var5 >= 6) { // L: 46 @@ -133,7 +133,7 @@ public abstract class AbstractArchive { int var6 = var4.readUnsignedByte(); // L: 50 if (var5 >= 7) { // L: 51 - this.groupCount = var4.method7776(); + this.groupCount = var4.method7758(); } else { this.groupCount = var4.readUnsignedShort(); // L: 52 } @@ -144,7 +144,7 @@ public abstract class AbstractArchive { int var9; if (var5 >= 7) { // L: 56 for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 - this.groupIds[var9] = var7 += var4.method7776(); // L: 58 + this.groupIds[var9] = var7 += var4.method7758(); // L: 58 if (this.groupIds[var9] > var8) { // L: 59 var8 = this.groupIds[var9]; } @@ -200,7 +200,7 @@ public abstract class AbstractArchive { this.fileIds[var10] = new int[var11]; // L: 88 for (var13 = 0; var13 < var11; ++var13) { // L: 89 - var14 = this.fileIds[var10][var13] = var7 += var4.method7776(); // L: 90 + var14 = this.fileIds[var10][var13] = var7 += var4.method7758(); // L: 90 if (var14 > var12) { // L: 91 var12 = var14; } @@ -249,20 +249,20 @@ public abstract class AbstractArchive { } } // L: 121 - @ObfuscatedName("ag") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-437713099" + garbageValue = "1032103913" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-1496383197" + garbageValue = "125484375" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -278,7 +278,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = VarpDefinition.method3353(this.files[var1][var2], false); // L: 139 + byte[] var5 = BuddyRankComparator.method2633(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { this.files[var1][var2] = null; // L: 140 } @@ -289,10 +289,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1320078563" + descriptor = "(IIB)Z", + garbageValue = "-104" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -310,12 +310,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1703908783" + garbageValue = "-966653450" ) - public boolean method5876(int var1) { + public boolean method5864(int var1) { if (this.files.length == 1) { // L: 154 return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -325,10 +325,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bk") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-346577736" + descriptor = "(IB)Z", + garbageValue = "1" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -340,10 +340,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bz") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-6" + garbageValue = "106" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -362,10 +362,10 @@ public abstract class AbstractArchive { return var1; // L: 175 } - @ObfuscatedName("bl") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-862865951" + descriptor = "(IB)[B", + garbageValue = "-79" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -378,10 +378,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("be") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(III)[B", - garbageValue = "-1915441897" + descriptor = "(IIB)[B", + garbageValue = "1" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -397,17 +397,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = VarpDefinition.method3353(this.files[var1][var2], false); // L: 199 + byte[] var4 = BuddyRankComparator.method2633(this.files[var1][var2], false); // L: 199 return var4; // L: 200 } else { return null; } } - @ObfuscatedName("bt") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(IB)[B", - garbageValue = "-29" + garbageValue = "20" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -420,40 +420,40 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(IS)[I", - garbageValue = "204" + descriptor = "(II)[I", + garbageValue = "1143817023" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 } - @ObfuscatedName("bg") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-983885018" + garbageValue = "1945641857" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; // L: 219 } - @ObfuscatedName("bq") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-38" + descriptor = "(I)I", + garbageValue = "1218623244" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; // L: 223 } - @ObfuscatedName("by") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-30" + descriptor = "(S)V", + garbageValue = "2607" ) @Export("clearGroups") public void clearGroups() { @@ -463,10 +463,10 @@ public abstract class AbstractArchive { } // L: 228 - @ObfuscatedName("bu") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-61" + descriptor = "(II)V", + garbageValue = "-1966992271" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -476,10 +476,10 @@ public abstract class AbstractArchive { } // L: 232 - @ObfuscatedName("bp") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-112" + descriptor = "(I)V", + garbageValue = "-756494060" ) @Export("clearFiles") public void clearFiles() { @@ -493,10 +493,10 @@ public abstract class AbstractArchive { } // L: 240 - @ObfuscatedName("bb") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "-1289438305" + garbageValue = "-559816234" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -520,23 +520,23 @@ public abstract class AbstractArchive { } else { byte[] var18; if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 - var18 = VarpDefinition.method3353(this.groups[var1], false); // L: 261 + var18 = BuddyRankComparator.method2633(this.groups[var1], false); // L: 261 } else { - var18 = VarpDefinition.method3353(this.groups[var1], true); // L: 257 + var18 = BuddyRankComparator.method2633(this.groups[var1], true); // L: 257 Buffer var8 = new Buffer(var18); // L: 258 var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 } - byte[] var20 = class149.decompressBytes(var18); // L: 264 + byte[] var20 = Actor.decompressBytes(var18); // L: 264 if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } if (var3 > 1) { // L: 283 int var9 = var20.length; // L: 284 - --var9; // L: 285 - int var10 = var20[var9] & 255; - var9 -= var10 * var3 * 4; // L: 286 + --var9; + int var10 = var20[var9] & 255; // L: 285 + var9 -= var3 * var10 * 4; // L: 286 Buffer var11 = new Buffer(var20); // L: 287 int[] var12 = new int[var3]; // L: 288 var11.offset = var9; // L: 289 @@ -575,13 +575,13 @@ public abstract class AbstractArchive { for (var15 = 0; var15 < var3; ++var15) { // L: 313 if (!this.shallowFiles) { // L: 314 - var5[var4[var15]] = PacketWriter.method2511(var19[var15], false); + var5[var4[var15]] = InterfaceParent.method2084(var19[var15], false); } else { var5[var4[var15]] = var19[var15]; // L: 315 } } } else if (!this.shallowFiles) { // L: 319 - var5[var4[0]] = PacketWriter.method2511(var20, false); + var5[var4[0]] = InterfaceParent.method2084(var20, false); } else { var5[var4[0]] = var20; // L: 320 } @@ -591,118 +591,109 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bv") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1282220718" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); // L: 326 - return this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 327 + return this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 327 } - @ObfuscatedName("bs") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)I", - garbageValue = "1129729535" + descriptor = "(ILjava/lang/String;B)I", + garbageValue = "48" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); // L: 331 - return this.fileNameHashTables[var1].get(UrlRequester.hashString(var2)); // L: 332 + return this.fileNameHashTables[var1].get(WorldMapLabelSize.hashString(var2)); // L: 332 } - @ObfuscatedName("bx") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;S)Z", - garbageValue = "-23907" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "1601831829" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); // L: 336 var2 = var2.toLowerCase(); // L: 337 - int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 338 + int var3 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 338 if (var3 < 0) { // L: 339 return false; } else { - int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 340 + int var4 = this.fileNameHashTables[var3].get(WorldMapLabelSize.hashString(var2)); // L: 340 return var4 >= 0; // L: 341 } } - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-31636535" + garbageValue = "-1167091944" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); // L: 346 var2 = var2.toLowerCase(); // L: 347 - int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 348 - int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 349 + int var3 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 348 + int var4 = this.fileNameHashTables[var3].get(WorldMapLabelSize.hashString(var2)); // L: 349 return this.takeFile(var3, var4); // L: 350 } - @ObfuscatedName("bi") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "35" + garbageValue = "-108" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); // L: 354 var2 = var2.toLowerCase(); // L: 355 - int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 356 - int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 357 + int var3 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 356 + int var4 = this.fileNameHashTables[var3].get(WorldMapLabelSize.hashString(var2)); // L: 357 return this.tryLoadFile(var3, var4); // L: 358 } - @ObfuscatedName("bj") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1427800029" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "84" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); // L: 362 - int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 363 + int var2 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 363 return this.tryLoadGroup(var2); // L: 364 } - @ObfuscatedName("bm") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "83" + garbageValue = "22" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); // L: 368 - int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 369 + int var2 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 369 if (var2 >= 0) { // L: 370 this.loadRegionFromGroup(var2); // L: 371 } } // L: 372 - @ObfuscatedName("bn") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)I", - garbageValue = "2" + garbageValue = "9" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); // L: 375 - int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 376 + int var2 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 376 return this.groupLoadPercent(var2); // L: 377 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Lcn;", - garbageValue = "0" - ) - static class82[] method5972() { - return new class82[]{class82.field1069, class82.field1072, class82.field1067, class82.field1064, class82.field1065}; // L: 16 - } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index c155b9594b..61fdccff80 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -2,78 +2,415 @@ 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("jz") +@ObfuscatedName("je") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "-16" + descriptor = "(I)[B", + garbageValue = "2035077648" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-308662955" + garbageValue = "-1279201457" ) @Export("set") - public abstract void set(byte[] var1); + abstract void set(byte[] var1); - @ObfuscatedName("x") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "127" + descriptor = "(ILbd;ZB)I", + garbageValue = "-58" ) - public static String method5528(String var0) { - int var1 = var0.length(); // L: 147 - char[] var2 = new char[var1]; // L: 148 - byte var3 = 2; // L: 149 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 150 - char var5 = var0.charAt(var4); // L: 151 - if (var3 == 0) { // L: 152 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 153 - char var6; - if (var5 != 181 && var5 != 402) { // L: 156 - var6 = Character.toTitleCase(var5); // L: 160 - } else { - var6 = var5; // L: 157 - } - - var5 = var6; // L: 162 + static int method5506(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341 + if (Decimator.friendSystem.field805 == 0) { // L: 2342 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; + } else if (Decimator.friendSystem.field805 == 1) { // L: 2343 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.friendsList.getSize(); // L: 2344 } - if (Character.isLetter(var5)) { // L: 164 - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 165 - if (Character.isSpaceChar(var5)) { // L: 166 - if (var3 != 2) { // L: 167 - var3 = 1; + return 1; // L: 2345 + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2348 + if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2349 + Friend var8 = (Friend)Decimator.friendSystem.friendsList.get(var3); // L: 2350 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2355 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2356 + } + + return 1; // L: 2358 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2361 + if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2362 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Decimator.friendSystem.friendsList.get(var3)).world; // L: 2363 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2365 + } + + return 1; // L: 2366 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2369 + if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2370 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Decimator.friendSystem.friendsList.get(var3)).rank; // L: 2371 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2373 + } + + return 1; // L: 2374 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2377 + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2378 + WorldMapLabelSize.method3903(var5, var6); // L: 2379 + return 1; // L: 2380 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2383 + Decimator.friendSystem.addFriend(var5); // L: 2384 + return 1; // L: 2385 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2388 + Decimator.friendSystem.removeFriend(var5); // L: 2389 + return 1; // L: 2390 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2393 + Decimator.friendSystem.addIgnore(var5); // L: 2394 + return 1; // L: 2395 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2398 + Decimator.friendSystem.removeIgnore(var5); // L: 2399 + return 1; // L: 2400 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2403 + var5 = class160.method3280(var5); // L: 2404 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.isFriended(new Username(var5, class122.loginType), false) ? 1 : 0; // L: 2405 + return 1; // L: 2406 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (ClientPacket.friendsChat != null) { // L: 2409 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.name; // L: 2410 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2412 + } + + return 1; // L: 2413 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (ClientPacket.friendsChat != null) { // L: 2416 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat.getSize(); // L: 2417 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2419 + } + + return 1; // L: 2420 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2423 + if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2424 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.get(var3).getUsername().getName(); // L: 2425 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2427 + } + + return 1; // L: 2428 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2431 + if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2432 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClientPacket.friendsChat.get(var3)).getWorld(); // L: 2433 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2435 + } + + return 1; // L: 2436 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2439 + if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2440 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClientPacket.friendsChat.get(var3)).rank; // L: 2441 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2443 + } + + return 1; // L: 2444 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat != null ? ClientPacket.friendsChat.minKick : 0; // L: 2447 + return 1; // L: 2448 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2451 + MidiPcmStream.clanKickUser(var5); // L: 2452 + return 1; // L: 2453 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat != null ? ClientPacket.friendsChat.rank * -1273194957 * 1318081787 : 0; // L: 2456 + return 1; // L: 2457 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2460 + WorldMapElement.Clan_joinChat(var5); // L: 2461 + return 1; // L: 2462 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + WorldMapSprite.Clan_leaveChat(); // L: 2465 + return 1; // L: 2466 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!Decimator.friendSystem.method1681()) { // L: 2469 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.ignoreList.getSize(); // L: 2470 + } + + return 1; // L: 2471 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2474 + if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.ignoreList.getSize()) { // L: 2475 + Ignored var4 = (Ignored)Decimator.friendSystem.ignoreList.get(var3); // L: 2476 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2481 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2482 + } + + return 1; // L: 2484 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2487 + var5 = class160.method3280(var5); // L: 2488 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.isIgnored(new Username(var5, class122.loginType)) ? 1 : 0; // L: 2489 + return 1; // L: 2490 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2493 + if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ClientPacket.friendsChat.get(var3).getUsername().equals(GrandExchangeEvents.localPlayer.username)) { // L: 2494 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2495 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2497 + } + + return 1; // L: 2498 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (ClientPacket.friendsChat != null && ClientPacket.friendsChat.owner != null) { // L: 2501 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.owner; // L: 2502 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2504 + } + + return 1; // L: 2505 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2508 + if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ((ClanMate)ClientPacket.friendsChat.get(var3)).isFriend()) { // L: 2509 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2510 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2512 + } + + return 1; // L: 2513 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + Decimator.friendSystem.friendsList.removeComparator(); // L: 2524 + return 1; // L: 2525 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2528 + Decimator.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529 + return 1; // L: 2530 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2533 + Decimator.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534 + return 1; // L: 2535 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2538 + Decimator.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539 + return 1; // L: 2540 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2543 + Decimator.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544 + return 1; // L: 2545 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2548 + Decimator.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549 + return 1; // L: 2550 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2553 + Decimator.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554 + return 1; // L: 2555 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2558 + Decimator.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559 + return 1; // L: 2560 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2563 + Decimator.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564 + return 1; // L: 2565 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2568 + Decimator.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569 + return 1; // L: 2570 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2573 + Decimator.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574 + return 1; // L: 2575 + } else if (var0 == 3639) { + Decimator.friendSystem.friendsList.sort(); // L: 2578 + return 1; // L: 2579 + } else if (var0 == 3640) { + Decimator.friendSystem.ignoreList.removeComparator(); // L: 2582 + return 1; // L: 2583 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2586 + Decimator.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587 + return 1; // L: 2588 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2591 + Decimator.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592 + return 1; // L: 2593 + } else if (var0 == 3643) { + Decimator.friendSystem.ignoreList.sort(); // L: 2596 + return 1; // L: 2597 + } else if (var0 == 3644) { + if (ClientPacket.friendsChat != null) { // L: 2600 + ClientPacket.friendsChat.removeComparator(); // L: 2601 + } + + return 1; // L: 2603 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2606 + if (ClientPacket.friendsChat != null) { // L: 2607 + ClientPacket.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608 + } + + return 1; // L: 2610 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2613 + if (ClientPacket.friendsChat != null) { // L: 2614 + ClientPacket.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615 + } + + return 1; // L: 2617 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2620 + if (ClientPacket.friendsChat != null) { // L: 2621 + ClientPacket.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622 + } + + return 1; // L: 2624 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2627 + if (ClientPacket.friendsChat != null) { // L: 2628 + ClientPacket.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629 + } + + return 1; // L: 2631 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2634 + if (ClientPacket.friendsChat != null) { // L: 2635 + ClientPacket.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636 + } + + return 1; // L: 2638 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2641 + if (ClientPacket.friendsChat != null) { // L: 2642 + ClientPacket.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643 + } + + return 1; // L: 2645 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2648 + if (ClientPacket.friendsChat != null) { // L: 2649 + ClientPacket.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650 + } + + return 1; // L: 2652 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2655 + if (ClientPacket.friendsChat != null) { // L: 2656 + ClientPacket.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657 + } + + return 1; // L: 2659 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2662 + if (ClientPacket.friendsChat != null) { // L: 2663 + ClientPacket.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664 + } + + return 1; // L: 2666 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2669 + if (ClientPacket.friendsChat != null) { // L: 2670 + ClientPacket.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671 + } + + return 1; // L: 2673 + } else if (var0 == 3655) { + if (ClientPacket.friendsChat != null) { // L: 2676 + ClientPacket.friendsChat.sort(); // L: 2677 + } + + return 1; // L: 2679 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2682 + Decimator.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683 + return 1; // L: 2684 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2687 + if (ClientPacket.friendsChat != null) { // L: 2688 + ClientPacket.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689 + } + + return 1; // L: 2691 + } else { + return 2; // L: 2693 + } } } else { - var3 = 1; // L: 169 - } - } else { - var3 = 2; - } + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2516 + if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ((ClanMate)ClientPacket.friendsChat.get(var3)).isIgnored()) { // L: 2517 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2518 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2520 + } - var2[var4] = var5; // L: 170 + return 1; // L: 2521 + } + } + } + } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "([Lky;Lky;ZI)V", + garbageValue = "1933510801" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -188983191 * -885606439 : var1.width * -1328038141 * -1237179477; // L: 10789 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 153385713 * -1426770415 : var1.height * 191855667 * -686825733; // L: 10790 + ModelData0.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10791 + if (var1.children != null) { // L: 10792 + ModelData0.resizeInterface(var1.children, var1.id, var3, var4, var2); } - return new String(var2); // L: 172 - } + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10793 + if (var5 != null) { // L: 10794 + int var6 = var5.group; // L: 10795 + if (class155.loadInterface(var6)) { // L: 10797 + ModelData0.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10798 + } + } + + if (var1.contentType == 1337) { // L: 10801 + } + + } // L: 10802 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index cf6d3507b3..6fbc80c081 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,43 +4,43 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("me") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lqx;" + descriptor = "[Lqq;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("AbstractFont_random") static Random AbstractFont_random; @ObfuscatedName("y") @@ -49,31 +49,31 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("v") @Export("pixels") byte[][] pixels; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("advances") int[] advances; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("widths") int[] widths; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("heights") int[] heights; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("leftBearings") int[] leftBearings; @ObfuscatedName("n") @Export("topBearings") int[] topBearings; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("ascent") public int ascent; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("kerning") byte[] kerning; @@ -127,11 +127,11 @@ public abstract class AbstractFont extends Rasterizer2D { @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 58 @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { // L: 90 for (var8 = 0; var8 < 256; ++var8) { // L: 91 if (var8 != 32 && var8 != 160) { // L: 92 - this.kerning[var8 + (var13 << 8)] = (byte)method6386(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 + this.kerning[var8 + (var13 << 8)] = (byte)method6326(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 98 - @ObfuscatedName("f") + @ObfuscatedName("r") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 123 var1 = ' '; } - return this.advances[class123.charToByteCp1252(var1) & 255]; // L: 124 + return this.advances[class327.charToByteCp1252(var1) & 255]; // L: 124 } - @ObfuscatedName("u") + @ObfuscatedName("p") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 128 @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 142 if (var7.startsWith("img=")) { // L: 143 try { - int var8 = class16.method217(var7.substring(4)); // L: 145 + int var8 = class19.method288(var7.substring(4)); // L: 145 var4 += AbstractFont_modIconSprites[var8].width; // L: 146 var3 = -1; // L: 147 } catch (Exception var10) { // L: 149 @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 155 - var4 += this.advances[(char)(class123.charToByteCp1252(var6) & 255)]; // L: 156 + var4 += this.advances[(char)(class327.charToByteCp1252(var6) & 255)]; // L: 156 if (this.kerning != null && var3 != -1) { // L: 157 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 165 @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 204 } else if (var16.startsWith("img=")) { // L: 206 try { - int var17 = class16.method217(var16.substring(4)); // L: 208 + int var17 = class19.method288(var16.substring(4)); // L: 208 var4 += AbstractFont_modIconSprites[var17].width; // L: 209 var11 = 0; // L: 210 } catch (Exception var20) { // L: 212 @@ -391,17 +391,17 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 255 } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259 } - @ObfuscatedName("j") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IILjava/lang/String;II)Lnm;" ) - public Bounds method6432(int var1, int var2, String var3, int var4, int var5) { + public Bounds method6333(int var1, int var2, String var3, int var4, int var5) { if (var3 != null && var3.length() >= var2 + var1) { // L: 280 int var6 = var4 - this.stringWidth(var3) / 2; // L: 283 var6 += this.stringWidth(var3.substring(0, var1)); // L: 284 @@ -414,7 +414,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("t") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 @@ -423,7 +423,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 295 - @ObfuscatedName("s") + @ObfuscatedName("g") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 298 @@ -433,7 +433,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 302 - @ObfuscatedName("b") + @ObfuscatedName("x") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 305 @@ -442,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 308 - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 311 @@ -451,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 314 - @ObfuscatedName("a") + @ObfuscatedName("y") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { // L: 317 @@ -512,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("j") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 352 @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 357 - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 360 @@ -544,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 369 - @ObfuscatedName("y") + @ObfuscatedName("z") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 372 @@ -564,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 379 - @ObfuscatedName("z") + @ObfuscatedName("h") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 382 @@ -585,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 393 - @ObfuscatedName("e") + @ObfuscatedName("ae") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 396 @@ -599,105 +599,95 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; // L: 402 } // L: 403 - @ObfuscatedName("t") + @ObfuscatedName("aq") @Export("decodeTag") void decodeTag(String var1) { try { - int var2; - String var3; if (var1.startsWith("col=")) { // L: 407 - var3 = var1.substring(4); // L: 409 - var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 411 - AbstractFont_color = var2; // L: 413 - } else if (var1.equals("/col")) { // L: 415 + AbstractFont_color = PcmPlayer.method746(var1.substring(4), 16); + } else if (var1.equals("/col")) { // L: 408 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { // L: 416 - var3 = var1.substring(4); // L: 418 - var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 420 - AbstractFont_strike = var2; // L: 422 - } else if (var1.equals("str")) { // L: 424 + } else if (var1.startsWith("str=")) { // L: 409 + AbstractFont_strike = PcmPlayer.method746(var1.substring(4), 16); + } else if (var1.equals("str")) { // L: 410 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { // L: 425 + } else if (var1.equals("/str")) { // L: 411 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { // L: 426 - var3 = var1.substring(2); // L: 428 - var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 430 - AbstractFont_underline = var2; // L: 432 - } else if (var1.equals("u")) { // L: 434 + } else if (var1.startsWith("u=")) { // L: 412 + AbstractFont_underline = PcmPlayer.method746(var1.substring(2), 16); + } else if (var1.equals("u")) { // L: 413 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { // L: 435 + } else if (var1.equals("/u")) { // L: 414 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { // L: 436 - var3 = var1.substring(5); // L: 438 - var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 440 - AbstractFont_shadow = var2; // L: 442 - } else if (var1.equals("shad")) { // L: 444 + } else if (var1.startsWith("shad=")) { // L: 415 + AbstractFont_shadow = PcmPlayer.method746(var1.substring(5), 16); + } else if (var1.equals("shad")) { // L: 416 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { // L: 445 + } else if (var1.equals("/shad")) { // L: 417 AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 446 + } else if (var1.equals("br")) { // L: 418 + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var5) { // L: 448 + } catch (Exception var3) { // L: 420 } - } // L: 449 + } // L: 421 - @ObfuscatedName("i") + @ObfuscatedName("aw") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; // L: 452 - boolean var4 = false; // L: 453 + int var3 = 0; // L: 424 + boolean var4 = false; // L: 425 - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 454 - char var6 = var1.charAt(var5); // L: 455 - if (var6 == '<') { // L: 456 + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 426 + char var6 = var1.charAt(var5); // L: 427 + if (var6 == '<') { // L: 428 var4 = true; - } else if (var6 == '>') { // L: 457 + } else if (var6 == '>') { // L: 429 var4 = false; - } else if (!var4 && var6 == ' ') { // L: 458 + } else if (!var4 && var6 == ' ') { // L: 430 ++var3; } } - if (var3 > 0) { // L: 460 + if (var3 > 0) { // L: 432 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } // L: 461 + } // L: 433 - @ObfuscatedName("ac") + @ObfuscatedName("am") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; // L: 464 - int var4 = -1; // L: 465 - int var5 = -1; // L: 466 + var3 -= this.ascent; // L: 436 + int var4 = -1; // L: 437 + int var5 = -1; // L: 438 - for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 467 - if (var1.charAt(var6) != 0) { // L: 468 - char var7 = (char)(class123.charToByteCp1252(var1.charAt(var6)) & 255); // L: 469 - if (var7 == '<') { // L: 470 - var4 = var6; // L: 471 + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 439 + if (var1.charAt(var6) != 0) { // L: 440 + char var7 = (char)(class327.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441 + if (var7 == '<') { // L: 442 + var4 = var6; // L: 443 } else { int var9; - if (var7 == '>' && var4 != -1) { // L: 474 - String var8 = var1.substring(var4 + 1, var6); // L: 475 - var4 = -1; // L: 476 - if (var8.equals("lt")) { // L: 477 + if (var7 == '>' && var4 != -1) { // L: 446 + String var8 = var1.substring(var4 + 1, var6); // L: 447 + var4 = -1; // L: 448 + if (var8.equals("lt")) { // L: 449 var7 = '<'; } else { - if (!var8.equals("gt")) { // L: 478 - if (var8.startsWith("img=")) { // L: 479 + if (!var8.equals("gt")) { // L: 450 + if (var8.startsWith("img=")) { // L: 451 try { - var9 = class16.method217(var8.substring(4)); // L: 481 - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 482 - var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 483 - var2 += var10.width; // L: 484 - var5 = -1; // L: 485 - } catch (Exception var14) { // L: 487 + var9 = class19.method288(var8.substring(4)); // L: 453 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 454 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 455 + var2 += var10.width; // L: 456 + var5 = -1; // L: 457 + } catch (Exception var14) { // L: 459 } } else { - this.decodeTag(var8); // L: 491 + this.decodeTag(var8); // L: 463 } continue; } @@ -706,103 +696,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { // L: 495 + if (var7 == 160) { // L: 467 var7 = ' '; } - if (var4 == -1) { // L: 496 - if (this.kerning != null && var5 != -1) { // L: 497 + if (var4 == -1) { // L: 468 + if (this.kerning != null && var5 != -1) { // L: 469 var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; // L: 498 - var9 = this.heights[var7]; // L: 499 - if (var7 != ' ') { // L: 500 - if (AbstractFont_alpha == 256) { // L: 501 - if (AbstractFont_shadow != -1) { // L: 502 + int var12 = this.widths[var7]; // L: 470 + var9 = this.heights[var7]; // L: 471 + if (var7 != ' ') { // L: 472 + if (AbstractFont_alpha == 256) { // L: 473 + if (AbstractFont_shadow != -1) { // L: 474 AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 503 + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 475 } else { - if (AbstractFont_shadow != -1) { // L: 506 + if (AbstractFont_shadow != -1) { // L: 478 AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 507 + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 479 } - } else if (AbstractFont_justificationTotal > 0) { // L: 511 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 512 - var2 += AbstractFont_justificationCurrent >> 8; // L: 513 - AbstractFont_justificationCurrent &= 255; // L: 514 + } else if (AbstractFont_justificationTotal > 0) { // L: 483 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 484 + var2 += AbstractFont_justificationCurrent >> 8; // L: 485 + AbstractFont_justificationCurrent &= 255; // L: 486 } - int var13 = this.advances[var7]; // L: 517 - if (AbstractFont_strike != -1) { // L: 518 + int var13 = this.advances[var7]; // L: 489 + if (AbstractFont_strike != -1) { // L: 490 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 519 + if (AbstractFont_underline != -1) { // L: 491 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; // L: 520 - var5 = var7; // L: 521 + var2 += var13; // L: 492 + var5 = var7; // L: 493 } } } } - } // L: 524 + } // L: 496 - @ObfuscatedName("ax") + @ObfuscatedName("ak") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; // L: 527 - int var6 = -1; // L: 528 - int var7 = -1; // L: 529 - int var8 = 0; // L: 530 + var3 -= this.ascent; // L: 499 + int var6 = -1; // L: 500 + int var7 = -1; // L: 501 + int var8 = 0; // L: 502 - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 531 - if (var1.charAt(var9) != 0) { // L: 532 - char var10 = (char)(class123.charToByteCp1252(var1.charAt(var9)) & 255); // L: 533 - if (var10 == '<') { // L: 534 - var6 = var9; // L: 535 + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 503 + if (var1.charAt(var9) != 0) { // L: 504 + char var10 = (char)(class327.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505 + if (var10 == '<') { // L: 506 + var6 = var9; // L: 507 } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { // L: 538 - String var11 = var1.substring(var6 + 1, var9); // L: 539 - var6 = -1; // L: 540 - if (var11.equals("lt")) { // L: 541 + if (var10 == '>' && var6 != -1) { // L: 510 + String var11 = var1.substring(var6 + 1, var9); // L: 511 + var6 = -1; // L: 512 + if (var11.equals("lt")) { // L: 513 var10 = '<'; } else { - if (!var11.equals("gt")) { // L: 542 - if (var11.startsWith("img=")) { // L: 543 + if (!var11.equals("gt")) { // L: 514 + if (var11.startsWith("img=")) { // L: 515 try { - if (var4 != null) { // L: 546 + if (var4 != null) { // L: 518 var12 = var4[var8]; } else { - var12 = 0; // L: 547 + var12 = 0; // L: 519 } - if (var5 != null) { // L: 549 + if (var5 != null) { // L: 521 var13 = var5[var8]; } else { - var13 = 0; // L: 550 + var13 = 0; // L: 522 } - ++var8; // L: 551 - var14 = class16.method217(var11.substring(4)); // L: 552 - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 553 - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 554 - var2 += var15.width; // L: 555 - var7 = -1; // L: 556 - } catch (Exception var19) { // L: 558 + ++var8; // L: 523 + var14 = class19.method288(var11.substring(4)); // L: 524 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 525 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 526 + var2 += var15.width; // L: 527 + var7 = -1; // L: 528 + } catch (Exception var19) { // L: 530 } } else { - this.decodeTag(var11); // L: 562 + this.decodeTag(var11); // L: 534 } continue; } @@ -811,70 +801,70 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { // L: 566 + if (var10 == 160) { // L: 538 var10 = ' '; } - if (var6 == -1) { // L: 567 - if (this.kerning != null && var7 != -1) { // L: 568 + if (var6 == -1) { // L: 539 + if (this.kerning != null && var7 != -1) { // L: 540 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; // L: 569 - var12 = this.heights[var10]; // L: 570 - if (var4 != null) { // L: 572 + int var17 = this.widths[var10]; // L: 541 + var12 = this.heights[var10]; // L: 542 + if (var4 != null) { // L: 544 var13 = var4[var8]; } else { - var13 = 0; // L: 573 + var13 = 0; // L: 545 } - if (var5 != null) { // L: 575 + if (var5 != null) { // L: 547 var14 = var5[var8]; } else { - var14 = 0; // L: 576 + var14 = 0; // L: 548 } - ++var8; // L: 577 - if (var10 != ' ') { // L: 578 - if (AbstractFont_alpha == 256) { // L: 579 - if (AbstractFont_shadow != -1) { // L: 580 + ++var8; // L: 549 + if (var10 != ' ') { // L: 550 + if (AbstractFont_alpha == 256) { // L: 551 + if (AbstractFont_shadow != -1) { // L: 552 AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 581 + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 553 } else { - if (AbstractFont_shadow != -1) { // L: 584 + if (AbstractFont_shadow != -1) { // L: 556 AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 585 + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 557 } - } else if (AbstractFont_justificationTotal > 0) { // L: 589 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 590 - var2 += AbstractFont_justificationCurrent >> 8; // L: 591 - AbstractFont_justificationCurrent &= 255; // L: 592 + } else if (AbstractFont_justificationTotal > 0) { // L: 561 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 562 + var2 += AbstractFont_justificationCurrent >> 8; // L: 563 + AbstractFont_justificationCurrent &= 255; // L: 564 } - int var18 = this.advances[var10]; // L: 595 - if (AbstractFont_strike != -1) { // L: 596 + int var18 = this.advances[var10]; // L: 567 + if (AbstractFont_strike != -1) { // L: 568 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 597 + if (AbstractFont_underline != -1) { // L: 569 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; // L: 598 - var7 = var10; // L: 599 + var2 += var18; // L: 570 + var7 = var10; // L: 571 } } } } - } // L: 602 + } // L: 574 - @ObfuscatedName("d") - static int method6386(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("o") + static int method6326(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; // L: 101 int var8 = var7 + var4[var5]; // L: 102 int var9 = var2[var6]; // L: 103 @@ -909,7 +899,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 119 } - @ObfuscatedName("c") + @ObfuscatedName("m") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 263 @@ -938,157 +928,157 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); // L: 276 } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 608 - int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 609 - int var8 = 0; // L: 610 - int var9 = 0; // L: 611 + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 580 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 581 + int var8 = 0; // L: 582 + int var9 = 0; // L: 583 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 612 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 613 - var4 -= var10; // L: 614 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 615 - var9 += var3 * var10; // L: 616 - var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 617 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 584 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 585 + var4 -= var10; // L: 586 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 587 + var9 += var3 * var10; // L: 588 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 589 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 619 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 591 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 620 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 621 - var3 -= var10; // L: 622 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 623 - var9 += var10; // L: 624 - var6 += var10; // L: 625 - var8 += var10; // L: 626 - var7 += var10; // L: 627 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 592 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 593 + var3 -= var10; // L: 594 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 595 + var9 += var10; // L: 596 + var6 += var10; // L: 597 + var8 += var10; // L: 598 + var7 += var10; // L: 599 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 629 - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 630 - var3 -= var10; // L: 631 - var8 += var10; // L: 632 - var7 += var10; // L: 633 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 601 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 602 + var3 -= var10; // L: 603 + var8 += var10; // L: 604 + var7 += var10; // L: 605 } - if (var3 > 0 && var4 > 0) { // L: 635 - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 636 + if (var3 > 0 && var4 > 0) { // L: 607 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 608 } - } // L: 637 + } // L: 609 - @ObfuscatedName("au") + @ObfuscatedName("aj") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); // L: 640 - var5 = -(var5 & 3); // L: 641 + int var9 = -(var5 >> 2); // L: 612 + var5 = -(var5 & 3); // L: 613 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 642 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 614 int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 643 - if (var1[var3++] != 0) { // L: 644 + for (var11 = var9; var11 < 0; ++var11) { // L: 615 + if (var1[var3++] != 0) { // L: 616 var0[var4++] = var2; } else { - ++var4; // L: 645 + ++var4; // L: 617 } - if (var1[var3++] != 0) { // L: 646 + if (var1[var3++] != 0) { // L: 618 var0[var4++] = var2; } else { - ++var4; // L: 647 + ++var4; // L: 619 } - if (var1[var3++] != 0) { // L: 648 + if (var1[var3++] != 0) { // L: 620 var0[var4++] = var2; } else { - ++var4; // L: 649 + ++var4; // L: 621 } - if (var1[var3++] != 0) { // L: 650 + if (var1[var3++] != 0) { // L: 622 var0[var4++] = var2; } else { - ++var4; // L: 651 + ++var4; // L: 623 } } - for (var11 = var5; var11 < 0; ++var11) { // L: 653 - if (var1[var3++] != 0) { // L: 654 + for (var11 = var5; var11 < 0; ++var11) { // L: 625 + if (var1[var3++] != 0) { // L: 626 var0[var4++] = var2; } else { - ++var4; // L: 655 + ++var4; // L: 627 } } - var4 += var7; // L: 657 - var3 += var8; // L: 658 + var4 += var7; // L: 629 + var3 += var8; // L: 630 } - } // L: 660 + } // L: 632 - @ObfuscatedName("at") + @ObfuscatedName("al") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 663 - int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 664 - int var9 = 0; // L: 665 - int var10 = 0; // L: 666 + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 635 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 636 + int var9 = 0; // L: 637 + int var10 = 0; // L: 638 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 667 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 668 - var4 -= var11; // L: 669 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 670 - var10 += var3 * var11; // L: 671 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 672 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 639 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 640 + var4 -= var11; // L: 641 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 642 + var10 += var3 * var11; // L: 643 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 644 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 674 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 646 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 675 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 676 - var3 -= var11; // L: 677 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 678 - var10 += var11; // L: 679 - var7 += var11; // L: 680 - var9 += var11; // L: 681 - var8 += var11; // L: 682 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 647 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 648 + var3 -= var11; // L: 649 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 650 + var10 += var11; // L: 651 + var7 += var11; // L: 652 + var9 += var11; // L: 653 + var8 += var11; // L: 654 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 684 - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 685 - var3 -= var11; // L: 686 - var9 += var11; // L: 687 - var8 += var11; // L: 688 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 656 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 657 + var3 -= var11; // L: 658 + var9 += var11; // L: 659 + var8 += var11; // L: 660 } - if (var3 > 0 && var4 > 0) { // L: 690 - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 691 + if (var3 > 0 && var4 > 0) { // L: 662 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 663 } - } // L: 692 + } // L: 664 - @ObfuscatedName("aw") + @ObfuscatedName("av") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 695 - var9 = 256 - var9; // L: 696 + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 667 + var9 = 256 - var9; // L: 668 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 697 - for (int var11 = -var5; var11 < 0; ++var11) { // L: 698 - if (var1[var3++] != 0) { // L: 699 - int var12 = var0[var4]; // L: 700 - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 701 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 669 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 670 + if (var1[var3++] != 0) { // L: 671 + int var12 = var0[var4]; // L: 672 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 673 } else { - ++var4; // L: 703 + ++var4; // L: 675 } } - var4 += var7; // L: 705 - var3 += var8; // L: 706 + var4 += var7; // L: 677 + var3 += var8; // L: 678 } - } // L: 708 + } // L: 680 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index a61f5c1ba0..3f658d194c 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qh") +@ObfuscatedName("qu") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("pixels") public int[] pixels; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -56601375 + intValue = 1418570525 ) @Export("width") public int width; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 749684829 + intValue = -845833355 ) @Export("height") public int height; @@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1725746556" + descriptor = "(IIS)V", + garbageValue = "131" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1732987846" + garbageValue = "-1598391098" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1395809863" + garbageValue = "1263903710" ) @Export("apply") public final void apply() { diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 13a17b7b78..939c452e63 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -1,83 +1,95 @@ 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("nj") +@ObfuscatedName("ny") @Implements("AbstractSocket") public abstract class AbstractSocket { + @ObfuscatedName("bk") + @ObfuscatedGetter( + intValue = 770576215 + ) + static int field4275; + protected AbstractSocket() { } // L: 7 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "105" + descriptor = "(S)V", + garbageValue = "-13138" ) @Export("close") public abstract void close(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1669312252" + garbageValue = "-891040314" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1264669351" + descriptor = "(B)I", + garbageValue = "46" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "396806768" + descriptor = "(IB)Z", + garbageValue = "27" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "52142940" + descriptor = "([BIIB)I", + garbageValue = "-118" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-57" + descriptor = "([BIII)V", + garbageValue = "-1359342670" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("u") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Llq;Llq;Ljava/lang/String;Ljava/lang/String;I)Lmr;", - garbageValue = "1832446298" + descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;B)Lqq;", + garbageValue = "3" ) - public static Font method6899(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); // L: 94 - int var5 = var0.getFileId(var4, var3); // L: 95 - return class19.method319(var0, var1, var4, var5); // L: 96 - } + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 125 + int var4 = var0.getFileId(var3, var2); // L: 126 + byte[] var7 = var0.takeFile(var3, var4); // L: 131 + boolean var6; + if (var7 == null) { // L: 132 + var6 = false; // L: 133 + } else { + WorldMapArea.SpriteBuffer_decode(var7); // L: 136 + var6 = true; // L: 137 + } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1681140308" - ) - static final int method6884(int var0, int var1) { - int var2 = var1 * 57 + var0; // L: 1006 - var2 ^= var2 << 13; // L: 1007 - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 1008 - return var3 >> 19 & 255; // L: 1009 + IndexedSprite var5; + if (!var6) { // L: 139 + var5 = null; // L: 140 + } else { + var5 = HorizontalAlignment.method3492(); // L: 143 + } + + return var5; // L: 145 } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 95d442e464..6ae6579585 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("be") +@ObfuscatedName("bm") @Implements("AbstractSound") public abstract class AbstractSound extends Node { @ObfuscatedName("n") diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 95b53ea661..5b5909f1b8 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,29 +1,23 @@ 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("nq") +@ObfuscatedName("nz") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1477105489 - ) - static int field4268; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-1235523353" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "-80" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -35,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnc;Lnc;I)I", - garbageValue = "1354743050" + descriptor = "(Lnn;Lnn;I)I", + garbageValue = "1222967356" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -49,18 +43,16 @@ public abstract class AbstractUserComparator implements Comparator { return super.equals(var1); // L: 25 } - @ObfuscatedName("p") + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(Llq;IB)Z", - garbageValue = "-20" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-89739893" ) - static boolean method6771(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); // L: 161 - if (var2 == null) { // L: 162 - return false; + static String method6736(int var0) { + if (var0 < 0) { // L: 9848 + return ""; } else { - ClientPreferences.SpriteBuffer_decode(var2); // L: 163 - return true; // L: 164 + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9849 9850 } } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 0d542249ac..16c33a54da 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,116 +1,122 @@ +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.LinkedList; -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; +import net.runelite.rs.Reflection; -@ObfuscatedName("iu") +@ObfuscatedName("hz") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("ff") - static String field2796; - @ObfuscatedName("l") + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2134162895 + intValue = 406251203 ) @Export("regionXLow") int regionXLow; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 466431409 + intValue = -110127755 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1382300835 + intValue = 100910989 ) @Export("regionX") int regionX; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1154191837 + intValue = 654356143 ) @Export("regionY") int regionY; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1056941337 + intValue = 27961817 ) @Export("minPlane") int minPlane; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1127387871 + intValue = -1476238073 ) @Export("planes") int planes; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1648265251 + intValue = 1237188241 ) @Export("groupId") int groupId; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1093905309 + intValue = 1492092043 ) @Export("fileId") int fileId; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("p") - byte[][][] field2793; - @ObfuscatedName("s") - byte[][][] field2792; - @ObfuscatedName("b") + @ObfuscatedName("d") + byte[][][] field2334; + @ObfuscatedName("m") + byte[][][] field2342; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[[[[Lij;" + descriptor = "[[[[Lhl;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("w") - boolean field2794; - @ObfuscatedName("a") - boolean field2795; + @ObfuscatedName("t") + boolean field2346; + @ObfuscatedName("g") + boolean field2347; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field2794 = false; // L: 26 - this.field2795 = false; // L: 27 - } // L: 29 + this.field2346 = false; + this.field2347 = false; + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1809174469" + descriptor = "(Lpi;I)V", + garbageValue = "169222990" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("e") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2021413302" + descriptor = "(B)Z", + garbageValue = "95" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2794 && this.field2795; // L: 32 + return this.field2346 && this.field2347; // L: 32 } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Llq;I)V", - garbageValue = "1505818240" + descriptor = "(Lln;B)V", + garbageValue = "-10" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -118,70 +124,70 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 if (var2 != null) { // L: 38 this.readGeography(new Buffer(var2)); // L: 39 - this.field2794 = true; // L: 40 - this.field2795 = true; // L: 41 + this.field2346 = true; // L: 40 + this.field2347 = true; // L: 41 } } } // L: 43 - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1763355958" + descriptor = "(B)V", + garbageValue = "-50" ) @Export("reset") void reset() { this.floorUnderlayIds = null; // L: 46 this.floorOverlayIds = null; // L: 47 - this.field2793 = null; // L: 48 - this.field2792 = null; // L: 49 + this.field2334 = null; // L: 48 + this.field2342 = null; // L: 49 this.decorations = null; // L: 50 - this.field2794 = false; // L: 51 - this.field2795 = false; // L: 52 + this.field2346 = false; // L: 51 + this.field2347 = false; // L: 52 } // L: 53 - @ObfuscatedName("ac") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IILpd;B)V", - garbageValue = "-26" + descriptor = "(IILpi;I)V", + garbageValue = "289519849" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); // L: 56 - if (var4 != 0) { - if ((var4 & 1) != 0) { - this.method4981(var1, var2, var3, var4); + if (var4 != 0) { // L: 57 + if ((var4 & 1) != 0) { // L: 60 + this.method4319(var1, var2, var3, var4); // L: 61 } else { - this.method4960(var1, var2, var3, var4); + this.method4320(var1, var2, var3, var4); // L: 64 } } - } + } // L: 58 66 - @ObfuscatedName("ax") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IILpd;II)V", - garbageValue = "2062281741" + descriptor = "(IILpi;II)V", + garbageValue = "-1881481092" ) - void method4981(int var1, int var2, Buffer var3, int var4) { - boolean var5 = (var4 & 2) != 0; - if (var5) { + void method4319(int var1, int var2, Buffer var3, int var4) { + boolean var5 = (var4 & 2) != 0; // L: 69 + if (var5) { // L: 70 this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); - } + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 + } // L: 74 - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IILpd;IB)V", - garbageValue = "-17" + descriptor = "(IILpi;IB)V", + garbageValue = "-121" ) - void method4960(int var1, int var2, Buffer var3, int var4) { + void method4320(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; // L: 77 - boolean var6 = (var4 & 2) != 0; - boolean var7 = (var4 & 4) != 0; + boolean var6 = (var4 & 2) != 0; // L: 78 + boolean var7 = (var4 & 4) != 0; // L: 79 this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 int var8; int var9; @@ -194,8 +200,8 @@ public abstract class AbstractWorldMapData { if (var14 != 0) { // L: 85 this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 var11 = var3.readUnsignedByte(); // L: 87 - this.field2793[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field2792[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + this.field2334[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2342[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } @@ -207,7 +213,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method7742(); // L: 101 + int var12 = var3.method7692(); // L: 101 int var13 = var3.readUnsignedByte(); // L: 102 var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } @@ -217,68 +223,186 @@ public abstract class AbstractWorldMapData { } // L: 107 - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1156452481" + garbageValue = "964749640" ) @Export("getRegionX") int getRegionX() { - return this.regionX; // L: 112 + return this.regionX; } - @ObfuscatedName("at") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1671134455" + garbageValue = "-1283249810" ) @Export("getRegionY") int getRegionY() { - return this.regionY; // L: 116 + return this.regionY; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfw;III)Lao;", - garbageValue = "-558526077" + descriptor = "(Lln;Lln;Lln;Lji;I)Z", + garbageValue = "1083179858" ) - public static final PcmPlayer method4986(TaskHandler var0, int var1, int var2) { - if (var1 >= 0 && var1 < 2) { // L: 57 - if (var2 < 256) { // L: 58 - var2 = 256; + public static boolean method4342(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class273.musicPatchesArchive = var0; // L: 26 + class273.musicSamplesArchive = var1; // L: 27 + class273.soundEffectsArchive = var2; // L: 28 + class273.midiPcmStream = var3; // L: 29 + return true; // L: 30 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Lca;", + garbageValue = "-1138182451" + ) + static ClientPreferences method4344() { + AccessFile var0 = null; // L: 112 + ClientPreferences var1 = new ClientPreferences(); // L: 113 + + try { + var0 = ModeWhere.getPreferencesFile("", Messages.field1305.name, false); // L: 115 + byte[] var2 = new byte[(int)var0.length()]; // L: 116 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 117 118 121 + var4 = var0.read(var2, var3, var2.length - var3); // L: 119 + if (var4 == -1) { + throw new IOException(); // L: 120 + } } + var1 = new ClientPreferences(new Buffer(var2)); // L: 123 + } catch (Exception var6) { // L: 125 + } + + try { + if (var0 != null) { // L: 127 + var0.close(); + } + } catch (Exception var5) { // L: 129 + } + + return var1; // L: 130 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lpi;II)V", + garbageValue = "-2052179879" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 133 + var2.size = var0.readUnsignedByte(); // L: 134 + var2.id = var0.readInt(); // L: 135 + var2.operations = new int[var2.size]; // L: 136 + var2.creationErrors = new int[var2.size]; // L: 137 + var2.fields = new Field[var2.size]; // L: 138 + var2.intReplaceValues = new int[var2.size]; // L: 139 + var2.methods = new Method[var2.size]; // L: 140 + var2.arguments = new byte[var2.size][][]; // L: 141 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 try { - PcmPlayer var3 = BuddyRankComparator.pcmPlayerProvider.player(); // L: 60 - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 61 - var3.field282 = var2; // L: 62 - var3.init(); // L: 63 - var3.capacity = (var2 & -1024) + 1024; // L: 64 - if (var3.capacity > 16384) { // L: 65 - var3.capacity = 16384; - } + int var4 = var0.readUnsignedByte(); // L: 144 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 + if (var4 == 3 || var4 == 4) { // L: 155 + var5 = var0.readStringCp1252NullTerminated(); // L: 156 + var6 = var0.readStringCp1252NullTerminated(); // L: 157 + var7 = var0.readUnsignedByte(); // L: 158 + String[] var8 = new String[var7]; // L: 159 - var3.open(var3.capacity); // L: 66 - if (class33.field237 > 0 && VarpDefinition.soundSystem == null) { // L: 67 - VarpDefinition.soundSystem = new SoundSystem(); // L: 68 - class342.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 69 - class342.soundSystemExecutor.scheduleAtFixedRate(VarpDefinition.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 70 - } + for (int var9 = 0; var9 < var7; ++var9) { // L: 160 + var8[var9] = var0.readStringCp1252NullTerminated(); + } - if (VarpDefinition.soundSystem != null) { // L: 72 - if (VarpDefinition.soundSystem.players[var1] != null) { // L: 73 - throw new IllegalArgumentException(); + String var20 = var0.readStringCp1252NullTerminated(); // L: 161 + byte[][] var10 = new byte[var7][]; // L: 162 + int var12; + if (var4 == 3) { // L: 163 + for (int var11 = 0; var11 < var7; ++var11) { // L: 164 + var12 = var0.readInt(); // L: 165 + var10[var11] = new byte[var12]; // L: 166 + var0.readBytes(var10[var11], 0, var12); // L: 167 + } + } + + var2.operations[var3] = var4; // L: 170 + Class[] var21 = new Class[var7]; // L: 171 + + for (var12 = 0; var12 < var7; ++var12) { // L: 172 + var21[var12] = class430.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = class430.loadClassFromDescriptor(var20); // L: 173 + if (class430.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 + throw new SecurityException(); + } + + Method[] var13 = class430.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175 + Method[] var14 = var13; // L: 177 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178 + Method var16 = var14[var15]; // L: 179 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 181 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 182 + if (var17.length == var21.length) { // L: 183 + boolean var18 = true; // L: 184 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 + if (var17[var19] != var21[var19]) { // L: 186 + var18 = false; // L: 187 + break; // L: 188 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 191 + var2.methods[var3] = var16; // L: 192 + } + } + } + } + + var2.arguments[var3] = var10; // L: 199 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 146 + var6 = var0.readStringCp1252NullTerminated(); // L: 147 + var7 = 0; // L: 148 + if (var4 == 1) { // L: 149 + var7 = var0.readInt(); } - VarpDefinition.soundSystem.players[var1] = var3; // L: 74 - } + var2.operations[var3] = var4; // L: 150 + var2.intReplaceValues[var3] = var7; // L: 151 + if (class430.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 + throw new SecurityException(); + } - return var3; // L: 76 - } catch (Throwable var4) { // L: 78 - return new PcmPlayer(); // L: 79 + var2.fields[var3] = Reflection.findField(class430.loadClassFromDescriptor(var5), var6); // L: 153 + } + } catch (ClassNotFoundException var24) { // L: 202 + var2.creationErrors[var3] = -1; // L: 203 + } catch (SecurityException var25) { // L: 205 + var2.creationErrors[var3] = -2; // L: 206 + } catch (NullPointerException var26) { // L: 208 + var2.creationErrors[var3] = -3; // L: 209 + } catch (Exception var27) { // L: 211 + var2.creationErrors[var3] = -4; // L: 212 + } catch (Throwable var28) { // L: 214 + var2.creationErrors[var3] = -5; // L: 215 } - } else { - throw new IllegalArgumentException(); } - } + + class54.reflectionChecks.addFirst(var2); // L: 218 + } // L: 219 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 086a54426e..bf21453f3b 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,81 +1,83 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("hq") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lks;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lks;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 26016061 + intValue = 331814097 ) @Export("screenX") int screenX; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1132630309 + intValue = -247318993 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lko;Lko;)V" + descriptor = "(Lks;Lks;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 - this.coord2 = var2; // L: 14 + this.coord2 = var2; } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2078584239" + garbageValue = "364835409" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "-2105037058" + descriptor = "(B)Lho;", + garbageValue = "-32" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "388705804" + garbageValue = "-915724910" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-54" + descriptor = "(I)I", + garbageValue = "1982860019" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1964398833" + descriptor = "(IIB)Z", + garbageValue = "-95" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -86,32 +88,32 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("a") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1239297952" + garbageValue = "1632005333" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; // L: 33 } - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "787430314" + garbageValue = "845547829" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = class19.WorldMapElement_get(this.getElement()); // L: 38 + WorldMapElement var3 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 38 int var4 = this.getSubWidth(); // L: 39 int var5 = this.getSubHeight(); // L: 40 switch(var3.horizontalAlignment.value) { // L: 41 case 0: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49 + if (var1 >= this.screenX && var1 < var4 + this.screenX) { // L: 54 break; } @@ -122,20 +124,20 @@ public abstract class AbstractWorldMapIcon { } break; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 54 + if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 49 return false; } } switch(var3.verticalAlignment.value) { // L: 58 case 0: - if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66 + if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 61 break; } return false; case 1: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 61 + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66 break; } @@ -150,10 +152,10 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("q") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1182827308" + garbageValue = "-1755965847" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -168,11 +170,41 @@ public abstract class AbstractWorldMapIcon { } @ObfuscatedName("v") + public static double method4415(double var0, double var2, double var4) { + double var8 = (var0 - var2) / var4; // L: 10 + double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 + return var6 / var4; // L: 14 + } + + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)[Ldo;", - garbageValue = "336008502" + descriptor = "(I)V", + garbageValue = "-151614308" ) - static class119[] method5059() { - return new class119[]{class119.field1457, class119.field1454, class119.field1455, class119.field1456, class119.field1471, class119.field1458, class119.field1459, class119.field1453, class119.field1465, class119.field1468, class119.field1463, class119.field1464, class119.field1462, class119.field1466, class119.field1467, class119.field1460, class119.field1469}; // L: 64 + static void method4429() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 47 + } // L: 48 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;ZB)Z", + garbageValue = "-95" + ) + static boolean method4405(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 232 + int var3 = var2.read(); // L: 233 + var2.seek(0L); // L: 234 + var2.write(var3); // L: 235 + var2.seek(0L); // L: 236 + var2.close(); // L: 237 + if (var1) { // L: 238 + var0.delete(); + } + + return true; // L: 239 + } catch (Exception var4) { // L: 241 + return false; // L: 242 + } } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 8e065e8099..6258f77372 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,30 +9,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pr") +@ObfuscatedName("ph") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("g") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -104839557 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; @ObfuscatedName("v") @Export("file") RandomAccessFile file; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -4942939596306501935L + longValue = -766606768005877029L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 4304485669335873983L + longValue = 6664878474339586353L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (-1L == var3) { // L: 11 + if (var3 == -1L) { // L: 11 var3 = Long.MAX_VALUE; } @@ -59,10 +62,10 @@ public final class AccessFile { this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "2079249014" + garbageValue = "-26128943" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -76,20 +79,20 @@ public final class AccessFile { } } // L: 39 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2140473011" + garbageValue = "1730487128" ) @Export("close") public final void close() throws IOException { this.closeSync(false); // L: 42 } // L: 43 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "14731" + descriptor = "(ZI)V", + garbageValue = "-1333706766" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -107,10 +110,10 @@ public final class AccessFile { } // L: 56 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "446364801" + garbageValue = "1939570997" ) @Export("length") public final long length() throws IOException { @@ -120,7 +123,7 @@ public final class AccessFile { @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "-83" + garbageValue = "-22" ) @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 5e90e16e5b..31ae4f183e 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,359 +4,359 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cb") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -243732171 + intValue = -737197671 ) @Export("x") int x; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1689270295 + intValue = -1503029363 ) @Export("y") int y; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -140599245 + intValue = 949937203 ) @Export("rotation") int rotation; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("isWalking") boolean isWalking; - @ObfuscatedName("ab") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 2082986637 + intValue = -783744909 ) - int field1145; - @ObfuscatedName("aa") + int field1150; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 928814055 + intValue = 2090551411 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2001174681 + intValue = 232574947 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -2071019383 + intValue = 1143253727 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1481660425 + intValue = -1560864183 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -770719891 + intValue = -1127685057 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1457598045 + intValue = 744886811 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1531156735 + intValue = -956659469 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 2066302829 + intValue = 184480963 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1738511053 + intValue = -1130956487 ) @Export("runSequence") int runSequence; - @ObfuscatedName("am") + @ObfuscatedName("ad") @Export("overheadText") String overheadText; - @ObfuscatedName("al") + @ObfuscatedName("ai") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ak") - boolean field1152; - @ObfuscatedName("az") + @ObfuscatedName("ax") + boolean field1130; + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -763990675 + intValue = -1982594461 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1295917443 + intValue = -634626739 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("af") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 632811089 + intValue = -775634919 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("bk") + @ObfuscatedName("bj") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bz") + @ObfuscatedName("bm") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bl") + @ObfuscatedName("br") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("be") + @ObfuscatedName("bo") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("ba") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llk;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 2070222075 + intValue = -1015640839 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @Export("false0") boolean false0; - @ObfuscatedName("br") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 1308262457 + intValue = 2088058279 ) - int field1160; - @ObfuscatedName("bc") - boolean field1183; - @ObfuscatedName("bd") + int field1121; + @ObfuscatedName("bw") + boolean field1144; + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 403424131 + intValue = 1146125633 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bf") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1321838793 + intValue = 898293505 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("by") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1594151757 + intValue = -112560555 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bu") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 575683211 + intValue = 10456859 ) @Export("sequence") int sequence; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 190938797 + intValue = 560334071 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1492406229 + intValue = 1378795463 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -169397669 + intValue = 404973767 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bs") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 913353811 + intValue = 483100279 ) - int field1169; - @ObfuscatedName("bx") + int field1152; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 64571753 + intValue = 949581517 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bo") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 912175547 + intValue = -246855743 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bi") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1527911221 + intValue = 428527393 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bj") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 914678487 + intValue = -1353205367 ) - int field1173; - @ObfuscatedName("bm") + int field1134; + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 548528549 + intValue = -848140033 ) @Export("spotAnimationHeight") int spotAnimationHeight; - @ObfuscatedName("bn") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -124454417 + intValue = 2105127011 ) - int field1175; - @ObfuscatedName("bw") + int field1129; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -298998957 + intValue = 2045898909 ) - int field1176; - @ObfuscatedName("bh") + int field1132; + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 2023300915 + intValue = -1275901079 ) - int field1177; - @ObfuscatedName("cd") + int field1160; + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -1753319677 + intValue = -9234697 ) - int field1178; - @ObfuscatedName("cy") + int field1161; + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -1977620089 + intValue = 46528465 ) - int field1179; - @ObfuscatedName("ca") + int field1143; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 897769849 + intValue = -1381806485 ) - int field1180; - @ObfuscatedName("cr") + int field1163; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 59479215 + intValue = 988836337 ) - int field1181; - @ObfuscatedName("cn") + int field1135; + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -441727743 + intValue = 871764515 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cp") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 1004897691 + intValue = 512453881 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cw") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -2031811309 + intValue = 688985935 ) - int field1133; - @ObfuscatedName("ck") + int field1167; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -618210081 + intValue = 1582188565 ) - int field1185; + int field1168; + @ObfuscatedName("cb") + byte field1169; + @ObfuscatedName("cp") + byte field1114; @ObfuscatedName("co") - byte field1146; - @ObfuscatedName("cu") - byte field1187; - @ObfuscatedName("cl") - byte field1188; - @ObfuscatedName("cv") - byte field1189; - @ObfuscatedName("cc") + byte field1171; + @ObfuscatedName("ca") + byte field1122; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 576355457 + intValue = 1373710797 ) @Export("orientation") int orientation; - @ObfuscatedName("cx") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -2007935065 + intValue = 1390704935 ) - int field1131; - @ObfuscatedName("cg") + int field1174; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1413434473 + intValue = -1419386607 ) - int field1192; - @ObfuscatedName("cz") + int field1175; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -838911281 + intValue = 661195985 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @Export("pathX") int[] pathX; - @ObfuscatedName("cq") + @ObfuscatedName("cu") @Export("pathY") int[] pathY; - @ObfuscatedName("cf") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "[Lgm;" ) @Export("pathTraversed") class193[] pathTraversed; - @ObfuscatedName("cm") - @ObfuscatedGetter( - intValue = -738645237 - ) - int field1197; - @ObfuscatedName("ch") - @ObfuscatedGetter( - intValue = 787083707 - ) - int field1134; @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1966879477 + intValue = -1219276617 ) - int field1161; + int field1179; + @ObfuscatedName("ce") + @ObfuscatedGetter( + intValue = -167546627 + ) + int field1170; + @ObfuscatedName("cl") + @ObfuscatedGetter( + intValue = -1781781251 + ) + int field1182; Actor() { this.isWalking = false; // L: 13 - this.field1145 = 1; // L: 14 + this.field1150 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 - this.walkSequence = -1; // L: 19 - this.walkBackSequence = -1; // L: 20 + this.walkSequence = -1; + this.walkBackSequence = -1; this.walkLeftSequence = -1; // L: 21 this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 this.overheadText = null; // L: 24 - this.field1152 = false; // L: 26 + this.field1130 = false; // L: 26 this.overheadTextCyclesRemaining = 100; // L: 27 this.overheadTextColor = 0; // L: 28 this.overheadTextEffect = 0; // L: 29 @@ -369,7 +369,7 @@ public abstract class Actor extends Renderable { this.healthBars = new IterableNodeDeque(); // L: 37 this.targetIndex = -1; // L: 38 this.false0 = false; // L: 39 - this.field1160 = -1; // L: 40 + this.field1121 = -1; // L: 40 this.movementSequence = -1; // L: 42 this.movementFrame = 0; // L: 43 this.movementFrameCycle = 0; // L: 44 @@ -377,49 +377,49 @@ public abstract class Actor extends Renderable { this.sequenceFrame = 0; // L: 46 this.sequenceFrameCycle = 0; // L: 47 this.sequenceDelay = 0; // L: 48 - this.field1169 = 0; // L: 49 - this.spotAnimation = -1; // L: 50 - this.spotAnimationFrame = 0; // L: 51 - this.spotAnimationFrameCycle = 0; // L: 52 - this.npcCycle = 0; // L: 62 - this.defaultHeight = 200; // L: 63 - this.field1133 = -1; // L: 64 - this.field1185 = -1; // L: 65 - this.field1131 = 0; // L: 71 - this.field1192 = 32; // L: 72 + this.field1152 = 0; // L: 49 + this.spotAnimation = -1; + this.spotAnimationFrame = 0; + this.spotAnimationFrameCycle = 0; + this.npcCycle = 0; + this.defaultHeight = 200; + this.field1167 = -1; + this.field1168 = -1; + this.field1174 = 0; // L: 71 + this.field1175 = 32; // L: 72 this.pathLength = 0; // L: 73 this.pathX = new int[10]; // L: 74 this.pathY = new int[10]; // L: 75 this.pathTraversed = new class193[10]; // L: 76 - this.field1197 = 0; // L: 77 - this.field1134 = 0; // L: 78 - this.field1161 = -1; // L: 79 + this.field1179 = 0; // L: 77 + this.field1170 = 0; // L: 78 + this.field1182 = -1; // L: 79 } // L: 81 - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-450224469" + garbageValue = "-323504433" ) @Export("isVisible") boolean isVisible() { return false; // L: 89 } - @ObfuscatedName("ba") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1354401176" + descriptor = "(B)V", + garbageValue = "-124" ) - final void method2205() { + final void method2179() { this.pathLength = 0; // L: 84 - this.field1134 = 0; // L: 85 + this.field1170 = 0; // L: 85 } // L: 86 - @ObfuscatedName("bg") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "1153359285" + descriptor = "(IIIIIIB)V", + garbageValue = "32" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -439,9 +439,9 @@ public abstract class Actor extends Renderable { int var10 = -1; // L: 100 int var11 = 0; // L: 101 if (var1 >= 0) { // L: 102 - HitSplatDefinition var12 = GameEngine.method589(var1); // L: 103 - var10 = var12.field2020; // L: 104 - var11 = var12.field2025; // L: 105 + HitSplatDefinition var12 = UserComparator3.method2602(var1); // L: 103 + var10 = var12.field2007; // L: 104 + var11 = var12.field1998; // L: 105 } int var14; @@ -497,14 +497,14 @@ public abstract class Actor extends Renderable { } } // L: 146 - @ObfuscatedName("bq") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "108057759" + garbageValue = "-36044149" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = HitSplatDefinition.method3619(var1); // L: 149 + HealthBarDefinition var7 = ClanChannelMember.method2870(var1); // L: 149 HealthBar var8 = null; // L: 150 HealthBar var9 = null; // L: 151 int var10 = var7.int2; // L: 152 @@ -513,7 +513,7 @@ public abstract class Actor extends Renderable { HealthBar var12; for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 154 ++var11; // L: 155 - if (var12.definition.field1871 == var7.field1871) { // L: 156 + if (var12.definition.field1862 == var7.field1862) { // L: 156 var12.put(var2 + var4, var5, var6, var3); // L: 157 return; // L: 158 } @@ -544,14 +544,14 @@ public abstract class Actor extends Renderable { } } // L: 172 - @ObfuscatedName("by") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "29" + descriptor = "(II)V", + garbageValue = "-2121685273" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = HitSplatDefinition.method3619(var1); // L: 175 + HealthBarDefinition var2 = ClanChannelMember.method2870(var1); // L: 175 for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 176 if (var2 == var3.definition) { // L: 177 @@ -561,4 +561,92 @@ public abstract class Actor extends Renderable { } } // L: 182 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-954026724" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class301.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + public static void method2183(int var0) { + class273.musicPlayerStatus = 1; // L: 60 + class273.musicTrackArchive = null; // L: 61 + AccessFile.musicTrackGroupId = -1; // L: 62 + class273.musicTrackFileId = -1; // L: 63 + class273.musicTrackVolume = 0; // L: 64 + class17.musicTrackBoolean = false; // L: 65 + class273.pcmSampleLength = var0; // L: 66 + } // L: 67 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-24811" + ) + static void method2177() { + Messages.Messages_channels.clear(); // L: 50 + Messages.Messages_hashTable.clear(); // L: 51 + Messages.Messages_queue.clear(); // L: 52 + Messages.Messages_count = 0; // L: 53 + } // L: 54 + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "-1778836338" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 381 + int var2 = var1.readUnsignedByte(); // L: 382 + int var3 = var1.readInt(); // L: 383 + if (var3 < 0 || AbstractArchive.field3981 != 0 && var3 > AbstractArchive.field3981) { // L: 384 + throw new RuntimeException(); // L: 385 + } else if (var2 == 0) { // L: 387 + byte[] var6 = new byte[var3]; // L: 388 + var1.readBytes(var6, 0, var3); // L: 389 + return var6; // L: 390 + } else { + int var4 = var1.readInt(); // L: 393 + if (var4 >= 0 && (AbstractArchive.field3981 == 0 || var4 <= AbstractArchive.field3981)) { // L: 394 + byte[] var5 = new byte[var4]; // L: 397 + if (var2 == 1) { // L: 398 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 + } + + return var5; // L: 400 + } else { + throw new RuntimeException(); // L: 395 + } + } + } + + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "53" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class131.clientPreferences.method2243() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3597 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3598 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3599 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3600 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3601 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3602 + ++Client.soundEffectCount; // L: 3603 + } + + } // L: 3605 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 48b4840552..1ba9a77e53 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("gi") +@ObfuscatedName("hf") @Implements("Animation") public class Animation { @ObfuscatedName("v") - static int[] field2293; - @ObfuscatedName("o") - static int[] field2287; - @ObfuscatedName("h") - static int[] field2286; - @ObfuscatedName("g") - static int[] field2289; - @ObfuscatedName("l") + static int[] field2515; + @ObfuscatedName("c") + static int[] field2517; + @ObfuscatedName("i") + static int[] field2516; + @ObfuscatedName("f") + static int[] field2523; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lha;" ) @Export("skeleton") Skeleton skeleton; @ObfuscatedName("n") @Export("transformCount") int transformCount; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("transformXs") int[] transformXs; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("transformYs") int[] transformYs; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("transformZs") int[] transformZs; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2293 = new int[500]; // L: 8 - field2287 = new int[500]; // L: 9 - field2286 = new int[500]; // L: 10 - field2289 = new int[500]; // L: 11 + field2515 = new int[500]; // L: 8 + field2517 = new int[500]; // L: 9 + field2516 = new int[500]; // L: 10 + field2523 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLgq;)V" + descriptor = "([BLha;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { // L: 32 for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 if (this.skeleton.transformTypes[var10] == 0) { // L: 34 - field2293[var7] = var10; // L: 35 - field2287[var7] = 0; // L: 36 - field2286[var7] = 0; // L: 37 - field2289[var7] = 0; // L: 38 + field2515[var7] = var10; // L: 35 + field2517[var7] = 0; // L: 36 + field2516[var7] = 0; // L: 37 + field2523[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field2293[var7] = var8; // L: 44 + field2515[var7] = var8; // L: 44 short var11 = 0; // L: 45 if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } if ((var9 & 1) != 0) { // L: 47 - field2287[var7] = var4.readShortSmart(); + field2517[var7] = var4.readShortSmart(); } else { - field2287[var7] = var11; // L: 48 + field2517[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field2286[var7] = var4.readShortSmart(); + field2516[var7] = var4.readShortSmart(); } else { - field2286[var7] = var11; // L: 50 + field2516[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field2289[var7] = var4.readShortSmart(); + field2523[var7] = var4.readShortSmart(); } else { - field2289[var7] = var11; // L: 52 + field2523[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field2293[var8]; // L: 67 - this.transformXs[var8] = field2287[var8]; // L: 68 - this.transformYs[var8] = field2286[var8]; // L: 69 - this.transformZs[var8] = field2289[var8]; // L: 70 + this.transformSkeletonLabels[var8] = field2515[var8]; // L: 67 + this.transformXs[var8] = field2517[var8]; // L: 68 + this.transformYs[var8] = field2516[var8]; // L: 69 + this.transformZs[var8] = field2523[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 110c8c8172..ca46436f96 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,58 +1,163 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("bh") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("dt") + @ObfuscatedName("eg") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Llx;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("hl") - @ObfuscatedGetter( - intValue = -1234921851 - ) - @Export("baseX") - static int baseX; + @Export("archive20") + static Archive archive20; ApproximateRouteStrategy() { - } // L: 12022 + } // L: 12726 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIILgf;I)Z", - garbageValue = "-2070013036" + descriptor = "(IIILgv;I)Z", + garbageValue = "773884525" ) @Export("hasArrived") - protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12026 + public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12729 } - @ObfuscatedName("io") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-22" + descriptor = "([BB)Ljava/lang/String;", + garbageValue = "79" ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = class143.getWidgetChild(var0, var1); // L: 9044 - if (var4 != null && var4.onTargetEnter != null) { // L: 9045 - ScriptEvent var5 = new ScriptEvent(); // L: 9046 - var5.widget = var4; // L: 9047 - var5.args = var4.onTargetEnter; // L: 9048 - class1.runScriptEvent(var5); // L: 9049 + public static String method1125(byte[] var0) { + return WorldMapData_1.method4226(var0, 0, var0.length); // L: 58 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-227036396" + ) + static int method1124(int var0, Script var1, boolean var2) { + Widget var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1312 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1314 + return 1; // L: 1315 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1318 + return 1; // L: 1319 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1322 + return 1; // L: 1323 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1326 + return 1; // L: 1327 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330 + return 1; // L: 1331 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334 + return 1; // L: 1335 + } else { + return 2; // L: 1337 + } + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "-54" + ) + static int method1123(int var0, Script var1, boolean var2) { + if (var0 == 7400) { // L: 4670 + --Interpreter.Interpreter_intStackSize; // L: 4671 + --class122.Interpreter_stringStackSize; // L: 4672 + return 1; // L: 4673 + } else if (var0 == 7401) { // L: 4675 + --Interpreter.Interpreter_intStackSize; // L: 4676 + --class122.Interpreter_stringStackSize; // L: 4677 + return 1; // L: 4678 + } else if (var0 == 7402) { // L: 4680 + Interpreter.Interpreter_intStackSize -= 2; // L: 4681 + --class122.Interpreter_stringStackSize; // L: 4682 + return 1; // L: 4683 + } else if (var0 == 7403) { // L: 4685 + Interpreter.Interpreter_intStackSize -= 2; // L: 4686 + --class122.Interpreter_stringStackSize; // L: 4687 + return 1; // L: 4688 + } else if (var0 == 7404) { // L: 4690 + --Interpreter.Interpreter_intStackSize; // L: 4691 + --class122.Interpreter_stringStackSize; // L: 4692 + return 1; // L: 4693 + } else if (var0 == 7405) { // L: 4695 + Interpreter.Interpreter_intStackSize -= 2; // L: 4696 + return 1; // L: 4697 + } else if (var0 == 7406) { // L: 4699 + --Interpreter.Interpreter_intStackSize; // L: 4700 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4701 + return 1; // L: 4702 + } else if (var0 == 7407) { // L: 4704 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4705 + return 1; // L: 4706 + } else if (var0 == 7408) { // L: 4708 + Interpreter.Interpreter_intStackSize -= 2; // L: 4709 + --class122.Interpreter_stringStackSize; // L: 4710 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4711 + return 1; // L: 4712 + } else if (var0 == 7409) { // L: 4714 + --Interpreter.Interpreter_intStackSize; // L: 4715 + return 1; // L: 4716 + } else { + return 2; // L: 4718 + } + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(Lky;IIZI)V", + garbageValue = "229748808" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 10820 + int var5 = var0.height; // L: 10821 + if (var0.widthAlignment == 0) { // L: 10822 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 10823 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10824 + var0.width = var0.rawWidth * var1 >> 14; } - Client.selectedSpellItemId = var3; // L: 9051 - Client.isSpellSelected = true; // L: 9052 - class92.selectedSpellWidget = var0; // L: 9053 - Client.selectedSpellChildIndex = var1; // L: 9054 - class154.selectedSpellFlags = var2; // L: 9055 - class290.invalidateWidget(var4); // L: 9056 - } // L: 9057 + if (var0.heightAlignment == 0) { // L: 10825 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10826 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { // L: 10827 + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { // L: 10828 + var0.width = var0.field3352 * var0.height / var0.field3353; + } + + if (var0.heightAlignment == 4) { // L: 10829 + var0.height = var0.field3353 * var0.width / var0.field3352; + } + + if (var0.contentType == 1337) { // L: 10830 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10831 + ScriptEvent var6 = new ScriptEvent(); // L: 10832 + var6.widget = var0; // L: 10833 + var6.args = var0.onResize; // L: 10834 + Client.scriptEvents.addFirst(var6); // L: 10835 + } + + } // L: 10837 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 43edb32753..200f5f7490 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,482 +5,882 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lx") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lnw;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lnw;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 128196261 + intValue = 1229527393 ) @Export("index") int index; @ObfuscatedName("n") - volatile boolean field3953; - @ObfuscatedName("d") - boolean field3950; - @ObfuscatedName("f") + volatile boolean field3952; + @ObfuscatedName("s") + boolean field3953; + @ObfuscatedName("l") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1102130091 + intValue = -359474927 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1387834119 + intValue = -1182663877 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1289318369 + intValue = -523880279 ) - int field3955; + int field3947; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Lnn;Lnn;IZZZ)V" + descriptor = "(Lnw;Lnw;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); // L: 23 - this.field3953 = false; // L: 14 - this.field3950 = false; // L: 15 - this.field3955 = -1; // L: 20 + this.field3952 = false; // L: 14 + this.field3953 = false; // L: 15 + this.field3947 = -1; // L: 20 this.archiveDisk = var1; // L: 24 this.masterDisk = var2; // L: 25 this.index = var3; // L: 26 - this.field3950 = var6; // L: 27 - RouteStrategy.method3873(this, this.index); // L: 28 - } // L: 29 + this.field3953 = var6; // L: 27 + int var8 = this.index; // L: 29 + if (Huffman.NetCache_reference != null) { // L: 31 + Huffman.NetCache_reference.offset = var8 * 8 + 5; // L: 32 + int var9 = Huffman.NetCache_reference.readInt(); // L: 33 + int var10 = Huffman.NetCache_reference.readInt(); // L: 34 + this.loadIndex(var9, var10); // L: 35 + } else { + Language.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 + NetCache.NetCache_archives[var8] = this; // L: 39 + } + + } // L: 41 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1312612770" + garbageValue = "1338724730" ) - public boolean method5819() { - return this.field3953; // L: 32 + public boolean method5815() { + return this.field3952; // L: 44 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-94" + garbageValue = "-101" ) @Export("percentage") public int percentage() { - if (this.field3953) { // L: 36 + if (this.field3952) { // L: 48 return 100; - } else if (super.groups != null) { // L: 37 + } else if (super.groups != null) { // L: 49 return 99; } else { - int var1 = UserComparator4.method2563(255, this.index); // L: 38 - if (var1 >= 100) { // L: 39 - var1 = 99; + int var2 = this.index; // L: 51 + long var3 = (long)(var2 + 16711680); // L: 53 + int var1; + if (class271.NetCache_currentResponse != null && class271.NetCache_currentResponse.key == var3) { // L: 54 + var1 = class194.NetCache_responseArchiveBuffer.offset * 99 / (class194.NetCache_responseArchiveBuffer.array.length - class271.NetCache_currentResponse.padding) + 1; // L: 58 + } else { + var1 = 0; // L: 55 } - return var1; // L: 40 + int var5 = var1; // L: 60 + if (var1 >= 100) { // L: 61 + var5 = 99; + } + + return var5; // L: 62 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1837860336" + garbageValue = "2136943756" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - int var2 = this.index; // L: 44 - long var3 = (long)((var2 << 16) + var1); // L: 46 - NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 47 - if (var5 != null) { // L: 48 - NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 49 - } + Projectile.method1975(this.index, var1); // L: 66 + } // L: 67 - } // L: 51 - - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1164111138" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("loadGroup") void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 54 - ArchiveDisk var2 = this.archiveDisk; // L: 55 - byte[] var4 = null; // L: 58 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 59 - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 60 - if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 61 - var4 = var6.data; // L: 62 - break; // L: 63 - } - } - } - - if (var4 != null) { // L: 67 - this.load(var2, var1, var4, true); // L: 68 - } else { - byte[] var5 = var2.read(var1); // L: 71 - this.load(var2, var1, var5, true); // L: 72 - } + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { + class17.method256(var1, this.archiveDisk, this); // L: 70 } else { - TriBool.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 75 + Language.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 71 } - } // L: 76 + } // L: 72 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1941382512" + garbageValue = "-2075639401" ) @Export("loadIndex") - void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 79 - this.indexVersion = var2; // L: 80 - if (this.masterDisk != null) { // L: 81 - int var3 = this.index; // L: 82 - ArchiveDisk var4 = this.masterDisk; // L: 83 - byte[] var6 = null; // L: 86 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 87 - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 88 - if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 89 - var6 = var8.data; // L: 90 - break; // L: 91 - } - } - } - - if (var6 != null) { // L: 95 - this.load(var4, var3, var6, true); // L: 96 - } else { - byte[] var7 = var4.read(var3); // L: 99 - this.load(var4, var3, var7, true); // L: 100 - } + public void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 75 + this.indexVersion = var2; // L: 76 + if (this.masterDisk != null) { // L: 77 + class17.method256(this.index, this.masterDisk, this); } else { - TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 103 + Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 78 } - } // L: 104 + } // L: 79 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I[BZZI)V", - garbageValue = "-1753203382" + garbageValue = "2057711923" ) @Export("write") - void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 107 - if (this.field3953) { // L: 108 - throw new RuntimeException(); // L: 109 + public void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 82 + if (this.field3952) { // L: 83 + throw new RuntimeException(); // L: 84 } - if (this.masterDisk != null) { // L: 111 - int var5 = this.index; // L: 112 - ArchiveDisk var6 = this.masterDisk; // L: 113 - ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 115 - var7.type = 0; // L: 116 - var7.key = (long)var5; // L: 117 - var7.data = var2; // L: 118 - var7.archiveDisk = var6; // L: 119 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 120 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 121 - } // L: 122 + if (this.masterDisk != null) { // L: 86 + int var5 = this.index; // L: 87 + ArchiveDisk var6 = this.masterDisk; // L: 88 + ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 90 + var7.type = 0; // L: 91 + var7.key = (long)var5; // L: 92 + var7.data = var2; // L: 93 + var7.archiveDisk = var6; // L: 94 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 95 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 96 + } // L: 97 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 124 - if (ArchiveDiskActionHandler.field3940 == 0) { // L: 125 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 126 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 127 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 128 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 129 - } - - ArchiveDiskActionHandler.field3940 = 600; // L: 131 - } + TileItem.method2395(); // L: 98 } - this.decodeIndex(var2); // L: 136 - this.loadAllLocal(); // L: 137 + this.decodeIndex(var2); // L: 101 + this.loadAllLocal(); // L: 102 } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 140 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 141 - if (this.archiveDisk != null) { // L: 142 - ArchiveDisk var13 = this.archiveDisk; // L: 143 - ArchiveDiskAction var18 = new ArchiveDiskAction(); // L: 145 - var18.type = 0; // L: 146 - var18.key = (long)var1; // L: 147 - var18.data = var2; // L: 148 - var18.archiveDisk = var13; // L: 149 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 150 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var18); // L: 151 - } // L: 152 + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 105 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 106 + if (this.archiveDisk != null) { // L: 107 + ArchiveDisk var11 = this.archiveDisk; // L: 108 + ArchiveDiskAction var14 = new ArchiveDiskAction(); // L: 110 + var14.type = 0; // L: 111 + var14.key = (long)var1; // L: 112 + var14.data = var2; // L: 113 + var14.archiveDisk = var11; // L: 114 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 115 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var14); // L: 116 + } // L: 117 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 154 - if (ArchiveDiskActionHandler.field3940 == 0) { // L: 155 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 156 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 157 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 158 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 159 - } - - ArchiveDiskActionHandler.field3940 = 600; // L: 161 - } - - this.validGroups[var1] = true; // L: 165 + TileItem.method2395(); // L: 118 + this.validGroups[var1] = true; // L: 120 } - if (var4) { // L: 167 - super.groups[var1] = PacketWriter.method2511(var2, false); + if (var4) { + super.groups[var1] = InterfaceParent.method2084(var2, false); // L: 122 } } - } // L: 169 + } // L: 124 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnn;I[BZB)V", - garbageValue = "57" + descriptor = "(Lnw;I[BZB)V", + garbageValue = "82" ) @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) { // L: 172 - if (this.field3953) { // L: 173 - throw new RuntimeException(); // L: 174 + if (var1 == this.masterDisk) { // L: 127 + if (this.field3952) { // L: 128 + throw new RuntimeException(); // L: 129 } - if (var3 == null) { // L: 176 - TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 177 - return; // L: 178 + if (var3 == null) { // L: 131 + Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 132 + return; // L: 133 } - Archive_crc.reset(); // L: 180 - Archive_crc.update(var3, 0, var3.length); // L: 181 - var5 = (int)Archive_crc.getValue(); // L: 182 - if (var5 != this.indexCrc) { // L: 183 - TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 184 - return; // L: 185 + Archive_crc.reset(); // L: 135 + Archive_crc.update(var3, 0, var3.length); // L: 136 + var5 = (int)Archive_crc.getValue(); // L: 137 + if (var5 != this.indexCrc) { // L: 138 + Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 139 + return; // L: 140 } - Buffer var11 = new Buffer(class149.decompressBytes(var3)); // L: 187 - int var12 = var11.readUnsignedByte(); // L: 188 - if (var12 != 5 && var12 != 6) { // L: 189 - throw new RuntimeException(var12 + "," + this.index + "," + var2); + Buffer var9 = new Buffer(Actor.decompressBytes(var3)); // L: 142 + int var7 = var9.readUnsignedByte(); // L: 143 + if (var7 != 5 && var7 != 6) { // L: 144 + throw new RuntimeException(var7 + "," + this.index + "," + var2); } - int var8 = 0; // L: 190 - if (var12 >= 6) { // L: 191 - var8 = var11.readInt(); + int var8 = 0; // L: 145 + if (var7 >= 6) { // L: 146 + var8 = var9.readInt(); } - if (var8 != this.indexVersion) { // L: 192 - TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 193 - return; // L: 194 + if (var8 != this.indexVersion) { // L: 147 + Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 148 + return; // L: 149 } - this.decodeIndex(var3); // L: 196 - this.loadAllLocal(); // L: 197 + this.decodeIndex(var3); // L: 151 + this.loadAllLocal(); // L: 152 } else { - if (!var4 && var2 == this.field3955) { // L: 200 - this.field3953 = true; // L: 201 + if (!var4 && var2 == this.field3947) { // L: 155 + this.field3952 = true; // L: 156 } - if (var3 == null || var3.length <= 2) { // L: 203 - this.validGroups[var2] = false; // L: 204 - if (this.field3950 || var4) { // L: 205 - TriBool.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (var3 == null || var3.length <= 2) { // L: 158 + this.validGroups[var2] = false; // L: 159 + if (this.field3953 || var4) { // L: 160 + Language.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 206 + return; // L: 161 } - Archive_crc.reset(); // L: 208 - Archive_crc.update(var3, 0, var3.length - 2); // L: 209 - var5 = (int)Archive_crc.getValue(); // L: 210 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 211 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 212 - this.validGroups[var2] = false; // L: 213 - if (this.field3950 || var4) { // L: 214 - TriBool.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + Archive_crc.reset(); // L: 163 + Archive_crc.update(var3, 0, var3.length - 2); // L: 164 + var5 = (int)Archive_crc.getValue(); // L: 165 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 166 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 167 + this.validGroups[var2] = false; // L: 168 + if (this.field3953 || var4) { // L: 169 + Language.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 215 + return; // L: 170 } - this.validGroups[var2] = true; // L: 217 - if (var4) { // L: 218 - Object[] var7 = super.groups; // L: 219 - Object var9; - if (var3 == null) { // L: 223 - var9 = null; // L: 224 - } else if (var3.length > 136) { // L: 227 - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 229 - var10.set(var3); // L: 230 - var9 = var10; // L: 231 - } else { - var9 = var3; // L: 236 - } - - var7[var2] = var9; // L: 238 + this.validGroups[var2] = true; // L: 172 + if (var4) { // L: 173 + super.groups[var2] = InterfaceParent.method2084(var3, false); } } - } // L: 241 + } // L: 175 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "113" + garbageValue = "8" ) @Export("loadAllLocal") void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 244 + this.validGroups = new boolean[super.groups.length]; // L: 178 int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 245 + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 179 this.validGroups[var1] = false; } - if (this.archiveDisk == null) { // L: 246 - this.field3953 = true; // L: 247 + if (this.archiveDisk == null) { // L: 180 + this.field3952 = true; // L: 181 } else { - this.field3955 = -1; // L: 250 + this.field3947 = -1; // L: 184 - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 251 - if (super.fileCounts[var1] > 0) { // L: 252 - ArchiveDisk var2 = this.archiveDisk; // L: 253 - ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 256 - var4.type = 1; // L: 257 - var4.key = (long)var1; // L: 258 - var4.archiveDisk = var2; // L: 259 - var4.archive = this; // L: 260 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 261 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 262 - } // L: 263 + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 185 + if (super.fileCounts[var1] > 0) { // L: 186 + ArchiveDisk var2 = this.archiveDisk; // L: 187 + ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 190 + var4.type = 1; // L: 191 + var4.key = (long)var1; // L: 192 + var4.archiveDisk = var2; // L: 193 + var4.archive = this; // L: 194 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 195 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 196 + } // L: 197 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 265 - if (ArchiveDiskActionHandler.field3940 == 0) { // L: 266 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 267 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 268 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 269 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 270 - } - - ArchiveDiskActionHandler.field3940 = 600; // L: 272 - } - - this.field3955 = var1; // L: 276 + TileItem.method2395(); // L: 198 + this.field3947 = var1; // L: 200 } } - if (this.field3955 == -1) { // L: 279 - this.field3953 = true; + if (this.field3947 == -1) { // L: 203 + this.field3952 = true; } } - } // L: 248 280 + } // L: 182 204 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1946405808" + garbageValue = "-1034622346" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 283 + if (super.groups[var1] != null) { // L: 207 + return 100; + } else if (this.validGroups[var1]) { // L: 208 return 100; } else { - return this.validGroups[var1] ? 100 : UserComparator4.method2563(this.index, var1); // L: 284 285 + int var3 = this.index; // L: 210 + long var4 = (long)((var3 << 16) + var1); // L: 212 + int var2; + if (class271.NetCache_currentResponse != null && class271.NetCache_currentResponse.key == var4) { // L: 213 + var2 = class194.NetCache_responseArchiveBuffer.offset * 99 / (class194.NetCache_responseArchiveBuffer.array.length - class271.NetCache_currentResponse.padding) + 1; // L: 217 + } else { + var2 = 0; // L: 214 + } + + return var2; // L: 219 } } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1922129831" + ) + public boolean method5814(int var1) { + return this.validGroups[var1]; // L: 223 + } + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1408615413" + garbageValue = "-1391440725" ) - public boolean method5828(int var1) { - return this.validGroups[var1]; // L: 289 + public boolean method5824(int var1) { + return this.getGroupFileIds(var1) != null; // L: 227 } - @ObfuscatedName("k") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1483419038" - ) - public boolean method5829(int var1) { - return this.getGroupFileIds(var1) != null; // L: 293 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-410498950" + descriptor = "(B)I", + garbageValue = "118" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 297 - int var2 = 0; // L: 298 + int var1 = 0; // L: 231 + int var2 = 0; // L: 232 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 299 - if (super.fileCounts[var3] > 0) { // L: 300 - var1 += 100; // L: 301 - var2 += this.groupLoadPercent(var3); // L: 302 + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 233 + if (super.fileCounts[var3] > 0) { // L: 234 + var1 += 100; // L: 235 + var2 += this.groupLoadPercent(var3); // L: 236 } } - if (var1 == 0) { // L: 305 + if (var1 == 0) { // L: 239 return 100; } else { - var3 = var2 * 100 / var1; // L: 306 - return var3; // L: 307 + var3 = var2 * 100 / var1; // L: 240 + return var3; // L: 241 } } - @ObfuscatedName("hj") + @ObfuscatedName("fa") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "71" + descriptor = "(I)V", + garbageValue = "875632133" ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 5010 - int var4 = var1 >> 7; // L: 5011 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5012 - int var5 = var2; // L: 5013 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5014 - var5 = var2 + 1; + @Export("load") + static void load() { + int var14; + if (Client.titleLoadingStage == 0) { // L: 1477 + ArchiveLoader.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1478 + + for (var14 = 0; var14 < 4; ++var14) { // L: 1479 + Client.collisionMaps[var14] = new CollisionMap(104, 104); } - int var6 = var0 & 127; // L: 5015 - int var7 = var1 & 127; // L: 5016 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 5017 - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; // L: 5018 - return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5019 + HealthBarUpdate.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1480 + Login.Login_loadingText = "Starting game engine..."; // L: 1481 + Login.Login_loadingPercent = 5; // L: 1482 + Client.titleLoadingStage = 20; // L: 1483 + } else if (Client.titleLoadingStage == 20) { // L: 1486 + Login.Login_loadingText = "Prepared visibility map"; // L: 1487 + Login.Login_loadingPercent = 10; // L: 1488 + Client.titleLoadingStage = 30; // L: 1489 + } else if (Client.titleLoadingStage == 30) { // L: 1492 + KeyHandler.archive0 = WorldMapID.newArchive(0, false, true, true); // L: 1493 + UserComparator8.archive1 = WorldMapID.newArchive(1, false, true, true); // L: 1494 + class10.archive2 = WorldMapID.newArchive(2, true, false, true); // L: 1495 + BufferedNetSocket.archive3 = WorldMapID.newArchive(3, false, true, true); // L: 1496 + class182.archive4 = WorldMapID.newArchive(4, false, true, true); // L: 1497 + Players.archive5 = WorldMapID.newArchive(5, true, true, true); // L: 1498 + class16.archive6 = WorldMapID.newArchive(6, true, true, true); // L: 1499 + LoginScreenAnimation.archive7 = WorldMapID.newArchive(7, false, true, true); // L: 1500 + class145.archive8 = WorldMapID.newArchive(8, false, true, true); // L: 1501 + WorldMapDecorationType.archive9 = WorldMapID.newArchive(9, false, true, true); // L: 1502 + JagexCache.archive10 = WorldMapID.newArchive(10, false, true, true); // L: 1503 + Message.archive11 = WorldMapID.newArchive(11, false, true, true); // L: 1504 + class152.archive12 = WorldMapID.newArchive(12, false, true, true); // L: 1505 + class166.archive13 = WorldMapID.newArchive(13, true, false, true); // L: 1506 + class291.archive14 = WorldMapID.newArchive(14, false, true, true); // L: 1507 + class28.archive15 = WorldMapID.newArchive(15, false, true, true); // L: 1508 + class54.archive17 = WorldMapID.newArchive(17, true, true, true); // L: 1509 + WorldMapRectangle.archive18 = WorldMapID.newArchive(18, false, true, true); // L: 1510 + ObjectSound.archive19 = WorldMapID.newArchive(19, false, true, true); // L: 1511 + ApproximateRouteStrategy.archive20 = WorldMapID.newArchive(20, false, true, true); // L: 1512 + Login.Login_loadingText = "Connecting to update server"; // L: 1513 + Login.Login_loadingPercent = 20; // L: 1514 + Client.titleLoadingStage = 40; // L: 1515 + } else if (Client.titleLoadingStage == 40) { // L: 1518 + byte var33 = 0; // L: 1519 + var14 = var33 + KeyHandler.archive0.percentage() * 4 / 100; // L: 1520 + var14 += UserComparator8.archive1.percentage() * 4 / 100; // L: 1521 + var14 += class10.archive2.percentage() * 2 / 100; // L: 1522 + var14 += BufferedNetSocket.archive3.percentage() * 2 / 100; // L: 1523 + var14 += class182.archive4.percentage() * 6 / 100; // L: 1524 + var14 += Players.archive5.percentage() * 4 / 100; // L: 1525 + var14 += class16.archive6.percentage() * 2 / 100; // L: 1526 + var14 += LoginScreenAnimation.archive7.percentage() * 56 / 100; // L: 1527 + var14 += class145.archive8.percentage() * 2 / 100; // L: 1528 + var14 += WorldMapDecorationType.archive9.percentage() * 2 / 100; // L: 1529 + var14 += JagexCache.archive10.percentage() * 2 / 100; // L: 1530 + var14 += Message.archive11.percentage() * 2 / 100; // L: 1531 + var14 += class152.archive12.percentage() * 2 / 100; // L: 1532 + var14 += class166.archive13.percentage() * 2 / 100; // L: 1533 + var14 += class291.archive14.percentage() * 2 / 100; // L: 1534 + var14 += class28.archive15.percentage() * 2 / 100; // L: 1535 + var14 += ObjectSound.archive19.percentage() / 100; // L: 1536 + var14 += WorldMapRectangle.archive18.percentage() / 100; // L: 1537 + var14 += ApproximateRouteStrategy.archive20.percentage() / 100; // L: 1538 + var14 += class54.archive17.method5815() && class54.archive17.isFullyLoaded() ? 1 : 0; // L: 1539 + if (var14 != 100) { // L: 1540 + if (var14 != 0) { // L: 1541 + Login.Login_loadingText = "Checking for updates - " + var14 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1542 + } else { + class1.method8(KeyHandler.archive0, "Animations"); // L: 1545 + class1.method8(UserComparator8.archive1, "Skeletons"); // L: 1546 + class1.method8(class182.archive4, "Sound FX"); // L: 1547 + class1.method8(Players.archive5, "Maps"); // L: 1548 + class1.method8(class16.archive6, "Music Tracks"); // L: 1549 + class1.method8(LoginScreenAnimation.archive7, "Models"); // L: 1550 + class1.method8(class145.archive8, "Sprites"); // L: 1551 + class1.method8(Message.archive11, "Music Jingles"); // L: 1552 + class1.method8(class291.archive14, "Music Samples"); // L: 1553 + class1.method8(class28.archive15, "Music Patches"); // L: 1554 + class1.method8(ObjectSound.archive19, "World Map"); // L: 1555 + class1.method8(WorldMapRectangle.archive18, "World Map Geography"); // L: 1556 + class1.method8(ApproximateRouteStrategy.archive20, "World Map Ground"); // L: 1557 + Language.spriteIds = new GraphicsDefaults(); // L: 1558 + Language.spriteIds.decode(class54.archive17); // L: 1559 + Login.Login_loadingText = "Loaded update list"; // L: 1560 + Login.Login_loadingPercent = 30; // L: 1561 + Client.titleLoadingStage = 45; // L: 1562 + } + } else if (Client.titleLoadingStage == 45) { // L: 1565 + class78.method2082(22050, !Client.isLowDetail, 2); // L: 1566 + MidiPcmStream var24 = new MidiPcmStream(); // L: 1567 + var24.method5248(9, 128); // L: 1568 + KeyHandler.pcmPlayer0 = Varps.method5523(GameEngine.taskHandler, 0, 22050); // L: 1569 + KeyHandler.pcmPlayer0.setStream(var24); // L: 1570 + AbstractWorldMapData.method4342(class28.archive15, class291.archive14, class182.archive4, var24); // L: 1571 + ViewportMouse.pcmPlayer1 = Varps.method5523(GameEngine.taskHandler, 1, 2048); // L: 1572 + StructComposition.pcmStreamMixer = new PcmStreamMixer(); // L: 1573 + ViewportMouse.pcmPlayer1.setStream(StructComposition.pcmStreamMixer); // L: 1574 + WorldMapRectangle.decimator = new Decimator(22050, PcmPlayer.field268); // L: 1575 + Login.Login_loadingText = "Prepared sound engine"; // L: 1576 + Login.Login_loadingPercent = 35; // L: 1577 + Client.titleLoadingStage = 50; // L: 1578 + AbstractWorldMapData.WorldMapElement_fonts = new Fonts(class145.archive8, class166.archive13); // L: 1579 } else { - return 0; + int var15; + if (Client.titleLoadingStage == 50) { // L: 1582 + FontName[] var23 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_verdana13}; // L: 1585 + var15 = var23.length; // L: 1587 + Fonts var25 = AbstractWorldMapData.WorldMapElement_fonts; // L: 1588 + FontName[] var31 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_verdana13}; // L: 1591 + Client.fontsMap = var25.createMap(var31); // L: 1593 + if (Client.fontsMap.size() < var15) { // L: 1594 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var15 + "%"; // L: 1595 + Login.Login_loadingPercent = 40; // L: 1596 + } else { + class113.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1599 + class13.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1600 + RouteStrategy.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1601 + class263.platformInfo = Client.platformInfoProvider.get(); // L: 1602 + Login.Login_loadingText = "Loaded fonts"; // L: 1603 + Login.Login_loadingPercent = 40; // L: 1604 + Client.titleLoadingStage = 60; // L: 1605 + } + } else { + Archive var2; + int var3; + Archive var26; + int var29; + if (Client.titleLoadingStage == 60) { // L: 1608 + var26 = JagexCache.archive10; // L: 1610 + var2 = class145.archive8; // L: 1611 + var3 = 0; // L: 1613 + String[] var32 = Login.field917; // L: 1615 + + int var21; + String var28; + for (var21 = 0; var21 < var32.length; ++var21) { // L: 1616 + var28 = var32[var21]; // L: 1617 + if (var26.tryLoadFileByNames(var28, "")) { // L: 1619 + ++var3; + } + } + + var32 = Login.field918; // L: 1624 + + for (var21 = 0; var21 < var32.length; ++var21) { // L: 1625 + var28 = var32[var21]; // L: 1626 + if (var2.tryLoadFileByNames(var28, "")) { // L: 1628 + ++var3; + } + } + + var29 = Login.field917.length + Login.field918.length; // L: 1637 + if (var3 < var29) { // L: 1640 + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var29 + "%"; // L: 1641 + Login.Login_loadingPercent = 50; // L: 1642 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1645 + Login.Login_loadingPercent = 50; // L: 1646 + Decimator.updateGameState(5); // L: 1647 + Client.titleLoadingStage = 70; // L: 1648 + } + } else if (Client.titleLoadingStage == 70) { // L: 1651 + if (!class10.archive2.isFullyLoaded()) { // L: 1652 + Login.Login_loadingText = "Loading config - " + class10.archive2.loadPercent() + "%"; // L: 1653 + Login.Login_loadingPercent = 60; // L: 1654 + } else { + Archive var22 = class10.archive2; // L: 1657 + FloorOverlayDefinition.FloorOverlayDefinition_archive = var22; // L: 1659 + var26 = class10.archive2; // L: 1661 + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var26; // L: 1663 + var2 = class10.archive2; // L: 1665 + Archive var17 = LoginScreenAnimation.archive7; // L: 1666 + KitDefinition.KitDefinition_archive = var2; // L: 1668 + class147.KitDefinition_modelsArchive = var17; // L: 1669 + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1670 + Archive var18 = class10.archive2; // L: 1672 + Archive var27 = LoginScreenAnimation.archive7; // L: 1673 + boolean var19 = Client.isLowDetail; // L: 1674 + WorldMapData_0.ObjectDefinition_archive = var18; // L: 1676 + ObjectComposition.ObjectDefinition_modelsArchive = var27; // L: 1677 + ObjectComposition.ObjectDefinition_isLowDetail = var19; // L: 1678 + KitDefinition.method3452(class10.archive2, LoginScreenAnimation.archive7); // L: 1680 + Archive var20 = class10.archive2; // L: 1681 + StructComposition.StructDefinition_archive = var20; // L: 1683 + class163.method3318(class10.archive2, LoginScreenAnimation.archive7, Client.isMembersWorld, class113.fontPlain11); // L: 1685 + class125.method2811(class10.archive2, KeyHandler.archive0, UserComparator8.archive1); // L: 1686 + Archive var30 = class10.archive2; // L: 1687 + Archive var9 = LoginScreenAnimation.archive7; // L: 1688 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var30; // L: 1690 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var9; // L: 1691 + Archive var10 = class10.archive2; // L: 1693 + class11.VarbitDefinition_archive = var10; // L: 1695 + Archive var11 = class10.archive2; // L: 1697 + VarpDefinition.VarpDefinition_archive = var11; // L: 1699 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1700 + Renderable.method4917(BufferedNetSocket.archive3, LoginScreenAnimation.archive7, class145.archive8, class166.archive13); // L: 1702 + WorldMapEvent.method4506(class10.archive2); // L: 1703 + Canvas.method357(class10.archive2); // L: 1704 + Archive var12 = class10.archive2; // L: 1705 + class384.VarcInt_archive = var12; // L: 1707 + Bounds.method6969(class10.archive2); // L: 1709 + Archive var13 = class10.archive2; // L: 1710 + ParamComposition.ParamDefinition_archive = var13; // L: 1712 + ReflectionCheck.HitSplatDefinition_cachedSprites = new class426(Messages.field1305, 54, Skills.clientLanguage, class10.archive2); // L: 1714 + DirectByteArrayCopier.HitSplatDefinition_cached = new class426(Messages.field1305, 47, Skills.clientLanguage, class10.archive2); // L: 1715 + class160.varcs = new Varcs(); // L: 1716 + UserComparator7.method2590(class10.archive2, class145.archive8, class166.archive13); // L: 1717 + UserComparator5.method2592(class10.archive2, class145.archive8); // L: 1718 + class152.method3170(class10.archive2, class145.archive8); // L: 1719 + Login.Login_loadingText = "Loaded config"; // L: 1720 + Login.Login_loadingPercent = 60; // L: 1721 + Client.titleLoadingStage = 80; // L: 1722 + } + } else if (Client.titleLoadingStage == 80) { // L: 1725 + var14 = 0; // L: 1726 + if (class14.compass == null) { // L: 1727 + class14.compass = class6.SpriteBuffer_getSprite(class145.archive8, Language.spriteIds.compass, 0); + } else { + ++var14; // L: 1728 + } + + if (Canvas.redHintArrowSprite == null) { // L: 1729 + Canvas.redHintArrowSprite = class6.SpriteBuffer_getSprite(class145.archive8, Language.spriteIds.field4314, 0); + } else { + ++var14; // L: 1730 + } + + IndexedSprite[] var1; + boolean var4; + byte[] var5; + IndexedSprite[] var6; + int var7; + IndexedSprite var8; + if (GraphicsDefaults.mapSceneSprites == null) { // L: 1731 + var2 = class145.archive8; // L: 1733 + var3 = Language.spriteIds.mapScenes; // L: 1734 + var5 = var2.takeFile(var3, 0); // L: 1738 + if (var5 == null) { // L: 1739 + var4 = false; // L: 1740 + } else { + WorldMapArea.SpriteBuffer_decode(var5); // L: 1743 + var4 = true; // L: 1744 + } + + if (!var4) { // L: 1746 + var1 = null; // L: 1747 + } else { + var6 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 1752 + + for (var7 = 0; var7 < class451.SpriteBuffer_spriteCount; ++var7) { // L: 1753 + var8 = var6[var7] = new IndexedSprite(); // L: 1754 + var8.width = class451.SpriteBuffer_spriteWidth; // L: 1755 + var8.height = class451.SpriteBuffer_spriteHeight; // L: 1756 + var8.xOffset = class451.SpriteBuffer_xOffsets[var7]; // L: 1757 + var8.yOffset = class271.SpriteBuffer_yOffsets[var7]; // L: 1758 + var8.subWidth = class451.SpriteBuffer_spriteWidths[var7]; // L: 1759 + var8.subHeight = class451.SpriteBuffer_spriteHeights[var7]; // L: 1760 + var8.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 1761 + var8.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var7]; // L: 1762 + } + + ArchiveDiskActionHandler.method5813(); // L: 1764 + var1 = var6; // L: 1767 + } + + GraphicsDefaults.mapSceneSprites = var1; // L: 1769 + } else { + ++var14; // L: 1771 + } + + if (class150.headIconPkSprites == null) { // L: 1772 + class150.headIconPkSprites = class429.method7568(class145.archive8, Language.spriteIds.headIconsPk, 0); + } else { + ++var14; // L: 1773 + } + + if (WallDecoration.headIconPrayerSprites == null) { // L: 1774 + WallDecoration.headIconPrayerSprites = class429.method7568(class145.archive8, Language.spriteIds.field4322, 0); + } else { + ++var14; // L: 1775 + } + + if (InvDefinition.headIconHintSprites == null) { // L: 1776 + InvDefinition.headIconHintSprites = class429.method7568(class145.archive8, Language.spriteIds.field4318, 0); + } else { + ++var14; // L: 1777 + } + + if (WorldMapLabelSize.mapMarkerSprites == null) { // L: 1778 + WorldMapLabelSize.mapMarkerSprites = class429.method7568(class145.archive8, Language.spriteIds.field4319, 0); + } else { + ++var14; // L: 1779 + } + + if (class11.crossSprites == null) { // L: 1780 + class11.crossSprites = class429.method7568(class145.archive8, Language.spriteIds.field4320, 0); + } else { + ++var14; // L: 1781 + } + + if (class54.mapDotSprites == null) { // L: 1782 + class54.mapDotSprites = class429.method7568(class145.archive8, Language.spriteIds.field4321, 0); + } else { + ++var14; // L: 1783 + } + + if (class29.scrollBarSprites == null) { // L: 1784 + var2 = class145.archive8; // L: 1786 + var3 = Language.spriteIds.field4315; // L: 1787 + var5 = var2.takeFile(var3, 0); // L: 1791 + if (var5 == null) { // L: 1792 + var4 = false; // L: 1793 + } else { + WorldMapArea.SpriteBuffer_decode(var5); // L: 1796 + var4 = true; // L: 1797 + } + + if (!var4) { // L: 1799 + var1 = null; // L: 1800 + } else { + var6 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 1805 + + for (var7 = 0; var7 < class451.SpriteBuffer_spriteCount; ++var7) { // L: 1806 + var8 = var6[var7] = new IndexedSprite(); // L: 1807 + var8.width = class451.SpriteBuffer_spriteWidth; // L: 1808 + var8.height = class451.SpriteBuffer_spriteHeight; // L: 1809 + var8.xOffset = class451.SpriteBuffer_xOffsets[var7]; // L: 1810 + var8.yOffset = class271.SpriteBuffer_yOffsets[var7]; // L: 1811 + var8.subWidth = class451.SpriteBuffer_spriteWidths[var7]; // L: 1812 + var8.subHeight = class451.SpriteBuffer_spriteHeights[var7]; // L: 1813 + var8.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 1814 + var8.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var7]; // L: 1815 + } + + ArchiveDiskActionHandler.method5813(); // L: 1817 + var1 = var6; // L: 1820 + } + + class29.scrollBarSprites = var1; // L: 1822 + } else { + ++var14; // L: 1824 + } + + if (PcmPlayer.modIconSprites == null) { // L: 1825 + var2 = class145.archive8; // L: 1827 + var3 = Language.spriteIds.field4323; // L: 1828 + var5 = var2.takeFile(var3, 0); // L: 1832 + if (var5 == null) { // L: 1833 + var4 = false; // L: 1834 + } else { + WorldMapArea.SpriteBuffer_decode(var5); // L: 1837 + var4 = true; // L: 1838 + } + + if (!var4) { // L: 1840 + var1 = null; // L: 1841 + } else { + var6 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 1846 + + for (var7 = 0; var7 < class451.SpriteBuffer_spriteCount; ++var7) { // L: 1847 + var8 = var6[var7] = new IndexedSprite(); // L: 1848 + var8.width = class451.SpriteBuffer_spriteWidth; // L: 1849 + var8.height = class451.SpriteBuffer_spriteHeight; // L: 1850 + var8.xOffset = class451.SpriteBuffer_xOffsets[var7]; // L: 1851 + var8.yOffset = class271.SpriteBuffer_yOffsets[var7]; // L: 1852 + var8.subWidth = class451.SpriteBuffer_spriteWidths[var7]; // L: 1853 + var8.subHeight = class451.SpriteBuffer_spriteHeights[var7]; // L: 1854 + var8.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 1855 + var8.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var7]; // L: 1856 + } + + ArchiveDiskActionHandler.method5813(); // L: 1858 + var1 = var6; // L: 1861 + } + + PcmPlayer.modIconSprites = var1; // L: 1863 + } else { + ++var14; // L: 1865 + } + + if (var14 < 11) { // L: 1866 + Login.Login_loadingText = "Loading sprites - " + var14 * 100 / 12 + "%"; // L: 1867 + Login.Login_loadingPercent = 70; // L: 1868 + } else { + AbstractFont.AbstractFont_modIconSprites = PcmPlayer.modIconSprites; // L: 1871 + Canvas.redHintArrowSprite.normalize(); // L: 1872 + var15 = (int)(Math.random() * 21.0D) - 10; // L: 1873 + int var16 = (int)(Math.random() * 21.0D) - 10; // L: 1874 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 1875 + var29 = (int)(Math.random() * 41.0D) - 20; // L: 1876 + GraphicsDefaults.mapSceneSprites[0].shiftColors(var15 + var29, var29 + var16, var29 + var3); // L: 1877 + Login.Login_loadingText = "Loaded sprites"; // L: 1878 + Login.Login_loadingPercent = 70; // L: 1879 + Client.titleLoadingStage = 90; // L: 1880 + } + } else if (Client.titleLoadingStage == 90) { // L: 1883 + if (!WorldMapDecorationType.archive9.isFullyLoaded()) { // L: 1884 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1885 + Login.Login_loadingPercent = 90; // L: 1886 + } else { + class138.textureProvider = new TextureProvider(WorldMapDecorationType.archive9, class145.archive8, 20, class131.clientPreferences.method2240(), Client.isLowDetail ? 64 : 128); // L: 1889 + Rasterizer3D.Rasterizer3D_setTextureLoader(class138.textureProvider); // L: 1890 + Rasterizer3D.Rasterizer3D_setBrightness(class131.clientPreferences.method2240()); // L: 1891 + Client.titleLoadingStage = 100; // L: 1892 + } + } else if (Client.titleLoadingStage == 100) { // L: 1895 + var14 = class138.textureProvider.getLoadedPercentage(); // L: 1896 + if (var14 < 100) { // L: 1897 + Login.Login_loadingText = "Loading textures - " + var14 + "%"; // L: 1898 + Login.Login_loadingPercent = 90; // L: 1899 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 1902 + Login.Login_loadingPercent = 90; // L: 1903 + Client.titleLoadingStage = 110; // L: 1904 + } + } else if (Client.titleLoadingStage == 110) { // L: 1907 + class120.mouseRecorder = new MouseRecorder(); // L: 1908 + GameEngine.taskHandler.newThreadTask(class120.mouseRecorder, 10); // L: 1909 + Login.Login_loadingText = "Loaded input handler"; // L: 1910 + Login.Login_loadingPercent = 92; // L: 1911 + Client.titleLoadingStage = 120; // L: 1912 + } else if (Client.titleLoadingStage == 120) { // L: 1915 + if (!JagexCache.archive10.tryLoadFileByNames("huffman", "")) { // L: 1916 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1917 + Login.Login_loadingPercent = 94; // L: 1918 + } else { + Huffman var0 = new Huffman(JagexCache.archive10.takeFileByNames("huffman", "")); // L: 1921 + class282.huffman = var0; // L: 1923 + Login.Login_loadingText = "Loaded wordpack"; // L: 1925 + Login.Login_loadingPercent = 94; // L: 1926 + Client.titleLoadingStage = 130; // L: 1927 + } + } else if (Client.titleLoadingStage == 130) { // L: 1930 + if (!BufferedNetSocket.archive3.isFullyLoaded()) { // L: 1931 + Login.Login_loadingText = "Loading interfaces - " + BufferedNetSocket.archive3.loadPercent() * 4 / 5 + "%"; // L: 1932 + Login.Login_loadingPercent = 96; // L: 1933 + } else if (!class152.archive12.isFullyLoaded()) { // L: 1936 + Login.Login_loadingText = "Loading interfaces - " + (80 + class152.archive12.loadPercent() / 6) + "%"; // L: 1937 + Login.Login_loadingPercent = 96; // L: 1938 + } else if (!class166.archive13.isFullyLoaded()) { // L: 1941 + Login.Login_loadingText = "Loading interfaces - " + (96 + class166.archive13.loadPercent() / 50) + "%"; // L: 1942 + Login.Login_loadingPercent = 96; // L: 1943 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 1946 + Login.Login_loadingPercent = 98; // L: 1947 + Client.titleLoadingStage = 140; // L: 1948 + } + } else if (Client.titleLoadingStage == 140) { // L: 1951 + Login.Login_loadingPercent = 100; // L: 1952 + if (!ObjectSound.archive19.tryLoadGroupByName(WorldMapCacheName.field2413.name)) { // L: 1953 + Login.Login_loadingText = "Loading world map - " + ObjectSound.archive19.groupLoadPercentByName(WorldMapCacheName.field2413.name) / 10 + "%"; // L: 1954 + } else { + if (ScriptFrame.worldMap == null) { // L: 1957 + ScriptFrame.worldMap = new WorldMap(); // L: 1958 + ScriptFrame.worldMap.init(ObjectSound.archive19, WorldMapRectangle.archive18, ApproximateRouteStrategy.archive20, RouteStrategy.fontBold12, Client.fontsMap, GraphicsDefaults.mapSceneSprites); // L: 1959 + } + + Login.Login_loadingText = "Loaded world map"; // L: 1961 + Client.titleLoadingStage = 150; // L: 1962 + } + } else if (Client.titleLoadingStage == 150) { // L: 1965 + Decimator.updateGameState(10); // L: 1966 + } + } } - } + } // L: 1484 1490 1516 1543 1563 1580 1597 1606 1643 1649 1655 1723 1869 1881 1887 1893 1900 1905 1913 1919 1928 1934 1939 1944 1949 1955 1963 1967 1969 } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 4bfd5e3f7c..425c77fdf5 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nn") +@ObfuscatedName("nw") @Implements("ArchiveDisk") public final class ArchiveDisk { + @ObfuscatedName("sl") + @ObfuscatedGetter( + intValue = 696721361 + ) + static int field4309; @ObfuscatedName("v") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpb;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lpz;" - ) - @Export("idxFile") - BufferedFile idxFile; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1123503683 + intValue = 1094257697 ) @Export("archive") int archive; - @ObfuscatedName("l") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + @Export("idxFile") + BufferedFile idxFile; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 709399017 + intValue = 1624557141 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +47,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILpz;Lpz;I)V" + descriptor = "(ILpb;Lpb;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; // L: 8 @@ -50,14 +55,14 @@ public final class ArchiveDisk { this.maxEntrySize = 65000; // L: 11 this.archive = var1; // L: 14 this.datFile = var2; // L: 15 - this.idxFile = var3; // L: 16 + this.idxFile = var3; this.maxEntrySize = var4; // L: 17 } // L: 18 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-665252465" + descriptor = "(IB)[B", + garbageValue = "-3" ) @Export("read") public byte[] read(int var1) { @@ -102,7 +107,7 @@ public final class ArchiveDisk { } var13 = 10; // L: 44 - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 45 + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 45 var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 46 var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 47 var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 48 @@ -151,10 +156,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I[BII)Z", - garbageValue = "348442836" + descriptor = "(I[BIB)Z", + garbageValue = "38" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -172,10 +177,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-607768098" + garbageValue = "-2063908509" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -216,7 +221,7 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { // L: 111 - label172: { + label169: { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 @@ -227,7 +232,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 } catch (EOFException var17) { // L: 122 - break label172; // L: 123 + break label169; // L: 123 } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 @@ -238,7 +243,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 } catch (EOFException var16) { // L: 134 - break label172; // L: 135 + break label169; // L: 135 } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 @@ -247,7 +252,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; // L: 140 } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 + if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142 var10000 = false; return var10000; } @@ -265,7 +270,7 @@ public final class ArchiveDisk { ++var9; } - if (var9 == var6) { // L: 149 + if (var6 == var9) { // L: 149 ++var9; } } @@ -285,7 +290,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160 ArchiveDisk_buffer[8] = (byte)var9; // L: 161 ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162 - this.datFile.seek(520L * (long)var6); // L: 163 + this.datFile.seek((long)var6 * 520L); // L: 163 this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 var10 = var3 - var7; // L: 165 if (var10 > 510) { // L: 166 @@ -336,4 +341,13 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; // L: 198 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lcv;", + garbageValue = "1346835105" + ) + static class82[] method6935() { + return new class82[]{class82.field1057, class82.field1059, class82.field1055, class82.field1056, class82.field1053}; // L: 16 + } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 8e4ebed398..653587583a 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("kz") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1221735041 + intValue = 502285257 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("data") - byte[] data; - @ObfuscatedName("h") + public byte[] data; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Lnw;" ) @Export("archiveDisk") - ArchiveDisk archiveDisk; - @ObfuscatedName("g") + public ArchiveDisk archiveDisk; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llx;" ) @Export("archive") - Archive archive; + public Archive archive; ArchiveDiskAction() { } // L: 12 diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index aba9b7178e..1b603b6e0d 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,43 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lz") +@ObfuscatedName("lg") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("ArchiveDiskActionHandler_requestQueue") - static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("o") + public static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("ArchiveDiskActionHandler_responseQueue") - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("h") + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 538081707 + intValue = 1344367175 ) - public static int field3940; - @ObfuscatedName("g") + public static int field3945; + @ObfuscatedName("f") @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("mf") - @ObfuscatedGetter( - intValue = 1748062659 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lju;" ) - @Export("menuY") - static int menuY; + @Export("musicTrack") + public static MusicTrack musicTrack; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3940 = 0; // L: 11 + field3945 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); } // L: 12 @@ -51,47 +51,226 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 32 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 33 - } // L: 34 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 51 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 52 + } // L: 53 - if (var1 != null) { // L: 35 - if (var1.type == 0) { // L: 36 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 37 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 38 - var1.remove(); // L: 39 - } // L: 40 - } else if (var1.type == 1) { // L: 42 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 43 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 44 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 45 - } // L: 46 + if (var1 != null) { // L: 54 + if (var1.type == 0) { // L: 55 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 56 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 57 + var1.remove(); // L: 58 + } // L: 59 + } else if (var1.type == 1) { // L: 61 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 62 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 64 + } // L: 65 } - synchronized(ArchiveDiskActionHandler_lock) { // L: 48 - if (field3940 <= 1) { // L: 49 - field3940 = 0; // L: 50 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 51 - return; // L: 52 + synchronized(ArchiveDiskActionHandler_lock) { // L: 67 + if (field3945 <= 1) { // L: 68 + field3945 = 0; // L: 69 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 70 + return; // L: 71 } - field3940 = 600; // L: 54 + field3945 = 600; // L: 73 } } else { - GrandExchangeOfferTotalQuantityComparator.method6007(100L); // L: 58 - synchronized(ArchiveDiskActionHandler_lock) { // L: 59 - if (field3940 <= 1) { // L: 60 - field3940 = 0; // L: 61 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 62 - return; // L: 63 + class93.method2384(100L); // L: 77 + synchronized(ArchiveDiskActionHandler_lock) { // L: 78 + if (field3945 <= 1) { // L: 79 + field3945 = 0; // L: 80 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 81 + return; // L: 82 } - --field3940; // L: 65 + --field3945; // L: 84 } } } - } catch (Exception var13) { // L: 70 - class301.RunException_sendStackTrace((String)null, var13); // L: 71 + } catch (Exception var13) { // L: 89 + Widget.RunException_sendStackTrace((String)null, var13); // L: 90 } - } // L: 73 + } // L: 92 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)[B", + garbageValue = "-64972529" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lky;I[B[BB)V", + garbageValue = "1" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3415 == null) { // L: 988 + if (var2 == null) { // L: 989 + return; // L: 995 + } + + var0.field3415 = new byte[11][]; // L: 990 + var0.field3485 = new byte[11][]; // L: 991 + var0.field3417 = new int[11]; // L: 992 + var0.field3418 = new int[11]; // L: 993 + } + + var0.field3415[var1] = var2; // L: 997 + if (var2 != null) { + var0.field3414 = true; // L: 998 + } else { + var0.field3414 = false; // L: 1000 + + for (int var4 = 0; var4 < var0.field3415.length; ++var4) { // L: 1001 + if (var0.field3415[var4] != null) { // L: 1002 + var0.field3414 = true; // L: 1003 + break; // L: 1004 + } + } + } + + var0.field3485[var1] = var3; // L: 1008 + } // L: 1009 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-433593353" + ) + public static void method5813() { + class451.SpriteBuffer_xOffsets = null; // L: 239 + class271.SpriteBuffer_yOffsets = null; // L: 240 + class451.SpriteBuffer_spriteWidths = null; // L: 241 + class451.SpriteBuffer_spriteHeights = null; // L: 242 + NetFileRequest.SpriteBuffer_spritePalette = null; // L: 243 + FriendLoginUpdate.SpriteBuffer_pixels = null; // L: 244 + } // L: 245 + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Lky;IIIB)V", + garbageValue = "-122" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class116.playPcmPlayers(); // L: 12220 + SpriteMask var4 = var0.getSpriteMask(false); // L: 12221 + if (var4 != null) { // L: 12222 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12223 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12224 + int var5 = Client.camAngleY & 2047; // L: 12225 + int var6 = GrandExchangeEvents.localPlayer.x / 32 + 48; // L: 12226 + int var7 = 464 - GrandExchangeEvents.localPlayer.y / 32; // L: 12227 + HealthBarUpdate.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12228 + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12229 + var16 = Client.mapIconXs[var8] * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12230 + var10 = Client.mapIconYs[var8] * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12231 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12232 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 12234 + for (var16 = 0; var16 < 104; ++var16) { // L: 12235 + NodeDeque var14 = Client.groundItems[class18.Client_plane][var8][var16]; // L: 12236 + if (var14 != null) { // L: 12237 + var11 = var8 * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12238 + var12 = var16 * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12239 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var11, var12, class54.mapDotSprites[0], var4); // L: 12240 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12244 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12245 + if (var9 != null && var9.isVisible()) { // L: 12246 + NPCComposition var18 = var9.definition; // L: 12247 + if (var18 != null && var18.transforms != null) { // L: 12248 + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12249 + var11 = var9.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12250 + var12 = var9.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12251 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var11, var12, class54.mapDotSprites[1], var4); // L: 12252 + } + } + } + + var8 = Players.Players_count; // L: 12256 + int[] var17 = Players.Players_indices; // L: 12257 + + for (var10 = 0; var10 < var8; ++var10) { // L: 12258 + Player var15 = Client.players[var17[var10]]; // L: 12259 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != GrandExchangeEvents.localPlayer) { // L: 12260 + var12 = var15.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12261 + int var13 = var15.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12262 + if (var15.isFriend()) { // L: 12263 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[3], var4); + } else if (GrandExchangeEvents.localPlayer.team != 0 && var15.team != 0 && var15.team == GrandExchangeEvents.localPlayer.team) { // L: 12264 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { // L: 12265 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { // L: 12266 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[6], var4); + } else { + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[2], var4); // L: 12267 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12270 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12271 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12272 + if (var19 != null) { // L: 12273 + var11 = var19.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12274 + var12 = var19.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12275 + ReflectionCheck.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12276 + } + } + + if (Client.hintArrowType == 2) { // L: 12279 + var10 = Client.hintArrowX * 4 - GrandExchangeOfferOwnWorldComparator.baseX * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12280 + var11 = Client.hintArrowY * 4 - VarcInt.baseY * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12281 + ReflectionCheck.worldToMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12282 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12284 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12285 + if (var20 != null) { // L: 12286 + var11 = var20.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12287 + var12 = var20.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12288 + ReflectionCheck.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12289 + } + } + } + + if (Client.destinationX != 0) { // L: 12293 + var10 = Client.destinationX * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12294 + var11 = Client.destinationY * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12295 + ReflectionCheck.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[0], var4); // L: 12296 + } + + if (!GrandExchangeEvents.localPlayer.isHidden) { // L: 12298 + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12300 + } + + Client.field716[var3] = true; // L: 12301 + } + } // L: 12302 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 13bb2c95ce..14bdfd98d8 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -1,57 +1,40 @@ +import java.util.Collections; 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("bz") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1959822029 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1499561111 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("ed") + @ObfuscatedName("hg") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lhv;" ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("eg") + @Export("scene") + static Scene scene; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llx;" ) @Export("archive") final Archive archive; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1918110489 + intValue = 711415979 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 276484209 + intValue = -905507323 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Llu;Ljava/lang/String;)V" + descriptor = "(Llx;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -61,277 +44,127 @@ public class ArchiveLoader { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1138782971" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("isLoaded") boolean isLoaded() { - this.loadedCount = 0; + this.loadedCount = 0; // L: 17 for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method5829(var1) || this.archive.method5828(var1)) { - ++this.loadedCount; + if (!this.archive.method5824(var1) || this.archive.method5814(var1)) { + ++this.loadedCount; // L: 19 } } - return this.loadedCount >= this.groupCount; + return this.loadedCount >= this.groupCount; // L: 21 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)[Lkh;", - garbageValue = "77" + descriptor = "([I[II)V", + garbageValue = "-1372726492" ) - public static StudioGame[] method2076() { - return new StudioGame[]{StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.game3, StudioGame.game5}; // L: 17 - } + public static void method2061(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { // L: 43 + FloorOverlayDefinition.ByteArrayPool_alternativeSizes = var0; // L: 50 + class128.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51 + BoundaryObject.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIILge;Lgf;Z[I[II)I", - garbageValue = "34153163" - ) - public static int method2075(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { - int var9; - for (int var8 = 0; var8 < 128; ++var8) { // L: 19 - for (var9 = 0; var9 < 128; ++var9) { // L: 20 - class194.directions[var8][var9] = 0; // L: 21 - class194.distances[var8][var9] = 99999999; // L: 22 - } - } - - int var10; - int var11; - byte var13; - int var14; - int var15; - int var17; - int var19; - int var20; - int var21; - boolean var28; - int var30; - int var31; - int var33; - if (var2 == 1) { // L: 26 - var10 = var0; // L: 29 - var11 = var1; // L: 30 - byte var12 = 64; // L: 31 - var13 = 64; // L: 32 - var14 = var0 - var12; // L: 33 - var15 = var1 - var13; // L: 34 - class194.directions[var12][var13] = 99; // L: 35 - class194.distances[var12][var13] = 0; // L: 36 - byte var16 = 0; // L: 37 - var17 = 0; // L: 38 - class194.bufferX[var16] = var0; // L: 39 - var33 = var16 + 1; - class194.bufferY[var16] = var1; // L: 40 - int[][] var18 = var4.flags; // L: 41 - - boolean var29; - while (true) { - if (var17 == var33) { // L: 44 - VarpDefinition.field1819 = var10; // L: 116 - class194.field2202 = var11; // L: 117 - var29 = false; // L: 118 - break; - } - - var10 = class194.bufferX[var17]; // L: 45 - var11 = class194.bufferY[var17]; // L: 46 - var17 = var17 + 1 & 4095; // L: 47 - var30 = var10 - var14; // L: 48 - var31 = var11 - var15; // L: 49 - var19 = var10 - var4.xInset; // L: 50 - var20 = var11 - var4.yInset; // L: 51 - if (var3.hasArrived(1, var10, var11, var4)) { // L: 52 - VarpDefinition.field1819 = var10; // L: 53 - class194.field2202 = var11; // L: 54 - var29 = true; // L: 55 - break; - } - - var21 = class194.distances[var30][var31] + 1; // L: 58 - if (var30 > 0 && class194.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) { // L: 59 - class194.bufferX[var33] = var10 - 1; // L: 60 - class194.bufferY[var33] = var11; // L: 61 - var33 = var33 + 1 & 4095; // L: 62 - class194.directions[var30 - 1][var31] = 2; // L: 63 - class194.distances[var30 - 1][var31] = var21; // L: 64 - } - - if (var30 < 127 && class194.directions[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { // L: 66 - class194.bufferX[var33] = var10 + 1; // L: 67 - class194.bufferY[var33] = var11; // L: 68 - var33 = var33 + 1 & 4095; // L: 69 - class194.directions[var30 + 1][var31] = 8; // L: 70 - class194.distances[var30 + 1][var31] = var21; // L: 71 - } - - if (var31 > 0 && class194.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 73 - class194.bufferX[var33] = var10; // L: 74 - class194.bufferY[var33] = var11 - 1; // L: 75 - var33 = var33 + 1 & 4095; // L: 76 - class194.directions[var30][var31 - 1] = 1; // L: 77 - class194.distances[var30][var31 - 1] = var21; // L: 78 - } - - if (var31 < 127 && class194.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 80 - class194.bufferX[var33] = var10; // L: 81 - class194.bufferY[var33] = var11 + 1; // L: 82 - var33 = var33 + 1 & 4095; // L: 83 - class194.directions[var30][var31 + 1] = 4; // L: 84 - class194.distances[var30][var31 + 1] = var21; // L: 85 - } - - if (var30 > 0 && var31 > 0 && class194.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 87 - class194.bufferX[var33] = var10 - 1; // L: 88 - class194.bufferY[var33] = var11 - 1; // L: 89 - var33 = var33 + 1 & 4095; // L: 90 - class194.directions[var30 - 1][var31 - 1] = 3; // L: 91 - class194.distances[var30 - 1][var31 - 1] = var21; // L: 92 - } - - if (var30 < 127 && var31 > 0 && class194.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 94 - class194.bufferX[var33] = var10 + 1; // L: 95 - class194.bufferY[var33] = var11 - 1; // L: 96 - var33 = var33 + 1 & 4095; // L: 97 - class194.directions[var30 + 1][var31 - 1] = 9; // L: 98 - class194.distances[var30 + 1][var31 - 1] = var21; // L: 99 - } - - if (var30 > 0 && var31 < 127 && class194.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 101 - class194.bufferX[var33] = var10 - 1; // L: 102 - class194.bufferY[var33] = var11 + 1; // L: 103 - var33 = var33 + 1 & 4095; // L: 104 - class194.directions[var30 - 1][var31 + 1] = 6; // L: 105 - class194.distances[var30 - 1][var31 + 1] = var21; // L: 106 - } - - if (var30 < 127 && var31 < 127 && class194.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 108 - class194.bufferX[var33] = var10 + 1; // L: 109 - class194.bufferY[var33] = var11 + 1; // L: 110 - var33 = var33 + 1 & 4095; // L: 111 - class194.directions[var30 + 1][var31 + 1] = 12; // L: 112 - class194.distances[var30 + 1][var31 + 1] = var21; // L: 113 - } + for (int var2 = 0; var2 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53 + BoundaryObject.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54 + ByteArrayPool.field4167.add(var0[var2]); // L: 55 } - var28 = var29; // L: 120 - } else if (var2 == 2) { // L: 122 - var28 = class146.method3041(var0, var1, var3, var4); + Collections.sort(ByteArrayPool.field4167); // L: 57 } else { - var28 = class290.method5577(var0, var1, var2, var3, var4); // L: 123 + FloorOverlayDefinition.ByteArrayPool_alternativeSizes = null; // L: 44 + class128.ByteArrayPool_altSizeArrayCounts = null; // L: 45 + BoundaryObject.ByteArrayPool_arrays = null; // L: 46 + Login.method1960(); // L: 47 } + } // L: 48 58 - var9 = var0 - 64; // L: 124 - var10 = var1 - 64; // L: 125 - var11 = VarpDefinition.field1819; // L: 126 - var30 = class194.field2202; // L: 127 - if (!var28) { // L: 128 - var31 = Integer.MAX_VALUE; // L: 130 - var14 = Integer.MAX_VALUE; // L: 131 - byte var32 = 10; // L: 132 - var33 = var3.approxDestinationX; // L: 133 - var17 = var3.approxDestinationY; // L: 134 - int var27 = var3.approxDestinationSizeX; // L: 135 - var19 = var3.approxDestinationSizeY; // L: 136 + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(Lcz;ZI)V", + garbageValue = "784160741" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4782 + var0.isUnanimated = false; // L: 4783 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4784 4785 + var0.isUnanimated = true; + } - for (var20 = var33 - var32; var20 <= var33 + var32; ++var20) { // L: 137 - for (var21 = var17 - var32; var21 <= var17 + var32; ++var21) { // L: 138 - int var22 = var20 - var9; // L: 139 - int var23 = var21 - var10; // L: 140 - if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class194.distances[var22][var23] < 100) { // L: 141 142 - int var24 = 0; // L: 143 - if (var20 < var33) { // L: 144 - var24 = var33 - var20; - } else if (var20 > var33 + var27 - 1) { // L: 145 - var24 = var20 - (var33 + var27 - 1); + int var2 = var0.x >> 7; // L: 4787 + int var3 = var0.y >> 7; // L: 4788 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4789 + long var4 = GameObject.calculateTag(0, 0, 0, false, var0.index); // L: 4790 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4791 + var0.isUnanimated = false; // L: 4792 + var0.tileHeight = WorldMapLabel.getTileHeight(var0.x, var0.y, class18.Client_plane); // L: 4793 + var0.playerCycle = Client.cycle; // L: 4794 + scene.addNullableObject(class18.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4795 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4798 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4799 + return; } - int var25 = 0; // L: 146 - if (var21 < var17) { // L: 147 - var25 = var17 - var21; - } else if (var21 > var17 + var19 - 1) { // L: 148 - var25 = var21 - (var19 + var17 - 1); - } - - int var26 = var24 * var24 + var25 * var25; // L: 149 - if (var26 < var31 || var26 == var31 && class194.distances[var22][var23] < var14) { // L: 150 - var31 = var26; // L: 151 - var14 = class194.distances[var22][var23]; // L: 152 - var11 = var20; // L: 153 - var30 = var21; // L: 154 - } + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4800 } - } - } - if (var31 == Integer.MAX_VALUE) { // L: 160 - return -1; + var0.tileHeight = WorldMapLabel.getTileHeight(var0.x, var0.y, class18.Client_plane); // L: 4802 + var0.playerCycle = Client.cycle; // L: 4803 + scene.drawEntity(class18.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4804 + } } } - if (var0 == var11 && var30 == var1) { // L: 164 - var6[0] = var11; // L: 165 - var7[0] = var30; // L: 166 - return 0; // L: 167 - } else { - var13 = 0; // L: 169 - class194.bufferX[var13] = var11; // L: 172 - var31 = var13 + 1; - class194.bufferY[var13] = var30; // L: 173 + } // L: 4808 - for (var14 = var15 = class194.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class194.directions[var11 - var9][var30 - var10]) { // L: 174 175 185 - if (var14 != var15) { // L: 176 - var15 = var14; // L: 177 - class194.bufferX[var31] = var11; // L: 178 - class194.bufferY[var31++] = var30; // L: 179 - } - - if ((var14 & 2) != 0) { // L: 181 - ++var11; - } else if ((var14 & 8) != 0) { // L: 182 - --var11; - } - - if ((var14 & 1) != 0) { // L: 183 - ++var30; - } else if ((var14 & 4) != 0) { // L: 184 - --var30; - } + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1332589491" + ) + static boolean method2062(int var0) { + for (int var1 = 0; var1 < Client.field731; ++var1) { // L: 11711 + if (Client.field733[var1] == var0) { // L: 11712 + return true; } - - var33 = 0; // L: 187 - - while (var31-- > 0) { // L: 188 - var6[var33] = class194.bufferX[var31]; // L: 189 - var7[var33++] = class194.bufferY[var31]; // L: 190 - if (var33 >= var6.length) { // L: 191 - break; - } - } - - return var33; // L: 193 } + + return false; // L: 11714 } - @ObfuscatedName("il") + @ObfuscatedName("ls") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-59" + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "-1401650476" ) - static final boolean method2071(int var0) { - if (var0 < 0) { // L: 8184 - return false; - } else { - int var1 = Client.menuOpcodes[var0]; // L: 8185 - if (var1 >= 2000) { // L: 8186 - var1 -= 2000; - } - - return var1 == 1007; // L: 8187 + static String method2063(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 12488 + if (Client.gameBuild == 1) { // L: 12489 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 12490 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 12491 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 12492 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 12493 + var0 = "local"; } + + String var3 = ""; // L: 12494 + if (class65.field868 != null) { // L: 12495 + var3 = "/p=" + class65.field868; + } + + String var4 = "runescape.com"; // L: 12496 + return var2 + var0 + "." + var4 + "/l=" + Skills.clientLanguage + "/a=" + GrandExchangeOfferOwnWorldComparator.field483 + var3 + "/"; // L: 12497 } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 025bfec42f..db56969e88 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,195 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cn") @Implements("AttackOption") public enum AttackOption implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) - field1273(2), - @ObfuscatedName("g") + field1257(2), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) - field1279(4); + field1263(4); + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2042861585 + ) + static int field1255; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 22827639 + intValue = -887019937 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 11979 - } // L: 11980 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 11984 - } + this.id = var3; // L: 12684 + } // L: 12685 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ldi;FB)F", - garbageValue = "76" + descriptor = "(B)I", + garbageValue = "16" ) - static float method2392(class117 var0, float var1) { - if (var0 != null && var0.method2706() != 0) { // L: 18 - if (var1 < (float)var0.field1430[0].field1384) { // L: 21 - return var0.field1428 == class116.field1420 ? var0.field1430[0].field1385 : class202.method4111(var0, var1, true); // L: 22 23 25 - } else if (var1 > (float)var0.field1430[var0.method2706() - 1].field1384) { // L: 27 - return var0.field1429 == class116.field1420 ? var0.field1430[var0.method2706() - 1].field1385 : class202.method4111(var0, var1, false); // L: 28 29 31 - } else if (var0.field1427) { // L: 33 - return var0.field1430[0].field1385; // L: 34 - } else { - class113 var2 = var0.method2705(var1); // L: 36 - boolean var3 = false; // L: 37 - boolean var4 = false; // L: 38 - if (var2 == null) { // L: 39 - return 0.0F; // L: 157 - } else { - if (0.0D == (double)var2.field1388 && 0.0D == (double)var2.field1389) { // L: 40 - var3 = true; // L: 41 - } else if (Float.MAX_VALUE == var2.field1388 && var2.field1389 == Float.MAX_VALUE) { // L: 43 - var4 = true; // L: 44 - } else if (var2.field1392 != null) { // L: 46 - if (var0.field1442) { // L: 47 - float[] var5 = new float[4]; // L: 48 - float[] var6 = new float[4]; // L: 49 - var5[0] = (float)var2.field1384; // L: 50 - var6[0] = var2.field1385; // L: 51 - var5[1] = var5[0] + var2.field1388 * 0.33333334F; // L: 52 - var6[1] = var2.field1389 * 0.33333334F + var6[0]; // L: 53 - var5[3] = (float)var2.field1392.field1384; // L: 54 - var6[3] = var2.field1392.field1385; // L: 55 - var5[2] = var5[3] - var2.field1392.field1386 * 0.33333334F; // L: 56 - var6[2] = var6[3] - 0.33333334F * var2.field1392.field1390; // L: 57 - float var7; - float var8; - float var9; - float var12; - float var13; - if (var0.field1434) { // L: 58 - if (var0 != null) { // L: 60 - var7 = var5[3] - var5[0]; // L: 63 - if (0.0D != (double)var7) { // L: 64 - var8 = var5[1] - var5[0]; // L: 67 - var9 = var5[2] - var5[0]; // L: 68 - Float var15 = var8 / var7; // L: 69 - Float var16 = var9 / var7; // L: 70 - var0.field1438 = var15 == 0.33333334F && var16 == 0.6666667F; // L: 71 - var12 = var15; // L: 72 - var13 = var16; // L: 73 - if ((double)var15 < 0.0D) { // L: 74 - var15 = 0.0F; - } - - if ((double)var16 > 1.0D) { // L: 75 - var16 = 1.0F; - } - - if ((double)var15 > 1.0D || var16 < -1.0F) { // L: 76 - class11.method116(var15, var16); // L: 77 - } - - if (var15 != var12) { // L: 79 - var5[1] = var5[0] + var15 * var7; // L: 80 - if ((double)var12 != 0.0D) { // L: 81 - var6[1] = var6[0] + (var6[1] - var6[0]) * var15 / var12; // L: 82 - } - } - - if (var16 != var13) { // L: 85 - var5[2] = var5[0] + var16 * var7; // L: 86 - if (1.0D != (double)var13) { // L: 87 - var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var16) / (1.0D - (double)var13)); // L: 88 - } - } - - var0.field1432 = var5[0]; // L: 91 - var0.field1433 = var5[3]; // L: 92 - Frames.method4316(0.0F, var15, var16, 1.0F, var0.field1440); // L: 93 - Frames.method4316(var6[0], var6[1], var6[2], var6[3], var0.field1435); // L: 94 - } - } - } else if (var0 != null) { // L: 99 - var0.field1432 = var5[0]; // L: 102 - var7 = var5[3] - var5[0]; // L: 103 - var8 = var6[3] - var6[0]; // L: 104 - var9 = var5[1] - var5[0]; // L: 105 - float var10 = 0.0F; // L: 106 - float var11 = 0.0F; // L: 107 - if (0.0D != (double)var9) { // L: 108 - var10 = (var6[1] - var6[0]) / var9; // L: 109 - } - - var9 = var5[3] - var5[2]; // L: 111 - if (0.0D != (double)var9) { // L: 112 - var11 = (var6[3] - var6[2]) / var9; // L: 113 - } - - var12 = 1.0F / (var7 * var7); // L: 115 - var13 = var7 * var10; // L: 116 - float var14 = var11 * var7; // L: 117 - var0.field1440[0] = var12 * (var13 + var14 - var8 - var8) / var7; // L: 118 - var0.field1440[1] = var12 * (var8 + var8 + var8 - var13 - var13 - var14); // L: 119 - var0.field1440[2] = var10; // L: 120 - var0.field1440[3] = var6[0]; // L: 121 - } - - var0.field1442 = false; // L: 124 - } - } else { - var3 = true; // L: 128 - } - - if (var3) { // L: 130 - return var2.field1385; // L: 131 - } else if (var4) { // L: 133 - return (float)var2.field1384 != var1 && var2.field1392 != null ? var2.field1392.field1385 : var2.field1385; // L: 134 135 138 - } else if (var0.field1434) { // L: 141 - return VarbitComposition.method3555(var0, var1); // L: 142 - } else { - float var18; - if (var0 == null) { // L: 147 - var18 = 0.0F; // L: 148 - } else { - float var17 = var1 - var0.field1432; // L: 151 - var18 = var0.field1440[3] + (var0.field1440[2] + var17 * (var0.field1440[1] + var0.field1440[0] * var17)) * var17; // L: 152 - } - - return var18; // L: 154 - } - } - } - } else { - return 0.0F; // L: 19 - } + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 12688 } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index a403e38a63..01d670daca 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("bz") +@ObfuscatedName("aa") @Implements("AudioFilter") public class AudioFilter { @ObfuscatedName("n") - static float[][] field415; - @ObfuscatedName("d") + static float[][] field407; + @ObfuscatedName("s") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("f") - static float field412; - @ObfuscatedName("u") + @ObfuscatedName("l") + static float field409; + @ObfuscatedName("q") @Export("forwardMultiplier") static int forwardMultiplier; @ObfuscatedName("v") @Export("pairs") int[] pairs; - @ObfuscatedName("h") - int[][][] field411; - @ObfuscatedName("g") - int[][][] field410; - @ObfuscatedName("l") - int[] field414; + @ObfuscatedName("i") + int[][][] field412; + @ObfuscatedName("f") + int[][][] field402; + @ObfuscatedName("b") + int[] field413; static { - field415 = new float[2][8]; // L: 13 + field407 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { this.pairs = new int[2]; // L: 8 - this.field411 = new int[2][2][4]; // L: 10 - this.field410 = new int[2][2][4]; // L: 11 - this.field414 = new int[2]; // L: 12 + this.field412 = new int[2][2][4]; // L: 10 + this.field402 = new int[2][2][4]; // L: 11 + this.field413 = new int[2]; // L: 12 } // L: 21 @ObfuscatedName("v") - float method1056(int var1, int var2, float var3) { - float var4 = (float)this.field410[var1][0][var2] + var3 * (float)(this.field410[var1][1][var2] - this.field410[var1][0][var2]); // L: 24 + float method1040(int var1, int var2, float var3) { + float var4 = (float)this.field402[var1][0][var2] + var3 * (float)(this.field402[var1][1][var2] - this.field402[var1][0][var2]); // L: 24 var4 *= 0.0015258789F; // L: 25 return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26 } - @ObfuscatedName("h") - float method1055(int var1, int var2, float var3) { - float var4 = (float)this.field411[var1][0][var2] + var3 * (float)(this.field411[var1][1][var2] - this.field411[var1][0][var2]); // L: 35 + @ObfuscatedName("i") + float method1056(int var1, int var2, float var3) { + float var4 = (float)this.field412[var1][0][var2] + var3 * (float)(this.field412[var1][1][var2] - this.field412[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 - var3 = (float)this.field414[0] + (float)(this.field414[1] - this.field414[0]) * var2; // L: 42 + var3 = (float)this.field413[0] + (float)(this.field413[1] - this.field413[0]) * var2; // L: 42 var3 *= 0.0030517578F; // L: 43 - field412 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 - forwardMultiplier = (int)(field412 * 65536.0F); // L: 45 + field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field409 * 65536.0F); // L: 45 } if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method1056(var1, 0, var2); // L: 48 - field415[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, 0, var2)); // L: 49 - field415[var1][1] = var3 * var3; // L: 50 + var3 = this.method1040(var1, 0, var2); // L: 48 + field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1056(var1, 0, var2)); // L: 49 + field407[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1056(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, var4, var2)); // L: 53 + var3 = this.method1040(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1056(var1, var4, var2)); // L: 53 float var6 = var3 * var3; // L: 54 - field415[var1][var4 * 2 + 1] = field415[var1][var4 * 2 - 1] * var6; // L: 55 - field415[var1][var4 * 2] = field415[var1][var4 * 2 - 1] * var5 + field415[var1][var4 * 2 - 2] * var6; // L: 56 + field407[var1][var4 * 2 + 1] = field407[var1][var4 * 2 - 1] * var6; // L: 55 + field407[var1][var4 * 2] = field407[var1][var4 * 2 - 1] * var5 + field407[var1][var4 * 2 - 2] * var6; // L: 56 for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field415[var1]; - var10000[var7] += field415[var1][var7 - 1] * var5 + field415[var1][var7 - 2] * var6; + var10000 = field407[var1]; + var10000[var7] += field407[var1][var7 - 1] * var5 + field407[var1][var7 - 2] * var6; } - var10000 = field415[var1]; // L: 58 - var10000[1] += field415[var1][0] * var5 + var6; - var10000 = field415[var1]; // L: 59 + var10000 = field407[var1]; // L: 58 + var10000[1] += field407[var1][0] * var5 + var6; + var10000 = field407[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field415[0]; - var10000[var4] *= field412; + var10000 = field407[0]; + var10000[var4] *= field409; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field415[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field407[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lpd;Lav;)V" + descriptor = "(Lpi;Lag;)V" ) - final void method1065(Buffer var1, SoundEnvelope var2) { + final void method1044(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); // L: 67 this.pairs[0] = var3 >> 4; // L: 68 this.pairs[1] = var3 & 15; // L: 69 if (var3 != 0) { // L: 70 - this.field414[0] = var1.readUnsignedShort(); // L: 71 - this.field414[1] = var1.readUnsignedShort(); // L: 72 + this.field413[0] = var1.readUnsignedShort(); // L: 71 + this.field413[1] = var1.readUnsignedShort(); // L: 72 int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { // L: 74 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field411[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field410[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + this.field412[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field402[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } for (var5 = 0; var5 < 2; ++var5) { // L: 80 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81 if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82 - this.field411[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field410[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + this.field412[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field402[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field411[var5][1][var6] = this.field411[var5][0][var6]; // L: 87 - this.field410[var5][1][var6] = this.field410[var5][0][var6]; // L: 88 + this.field412[var5][1][var6] = this.field412[var5][0][var6]; // L: 87 + this.field402[var5][1][var6] = this.field402[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field414[1] != this.field414[0]) { // L: 92 + if (var7 != 0 || this.field413[1] != this.field413[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field414; // L: 95 - this.field414[1] = 0; // L: 96 + int[] var4 = this.field413; // L: 95 + this.field413[1] = 0; // L: 96 var4[0] = 0; // L: 97 } } // L: 99 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 56898f97cf..74607fc8c0 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -6,9 +6,9 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("pm") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpw;" + descriptor = "Lpr;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -29,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; // L: 26 BZip2Decompressor_state.bsBuff = 0; // L: 27 BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field4635 = 0; // L: 29 + BZip2Decompressor_state.field4636 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpw;)V" + descriptor = "(Lpr;)V" ) - static void method7986(BZip2State var0) { + static void method7902(BZip2State var0) { byte var2 = var0.out_char; // L: 40 int var3 = var0.su_rNToGo; // L: 41 int var4 = var0.nblocks_used; // L: 42 int var5 = var0.su_ch2; // L: 43 - int[] var6 = Widget.BZip2Decompressor_block; // L: 44 - int var7 = var0.field4638; // L: 45 + int[] var6 = GrandExchangeOffer.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4643; // L: 45 byte[] var8 = var0.outputArray; // L: 46 int var9 = var0.next_out; // L: 47 int var10 = var0.outputLength; // L: 48 - int var12 = var0.field4657 + 1; // L: 50 + int var12 = var0.field4661 + 1; // L: 50 label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field4635; // L: 133 - var0.field4635 += var10 - var10; // L: 134 - if (var0.field4635 < var13) { // L: 135 + int var13 = var0.field4636; // L: 133 + var0.field4636 += var10 - var10; // L: 134 + if (var0.field4636 < var13) { // L: 135 } var0.out_char = var2; // L: 136 var0.su_rNToGo = var3; // L: 137 var0.nblocks_used = var4; // L: 138 var0.su_ch2 = var5; // L: 139 - Widget.BZip2Decompressor_block = var6; // L: 140 - var0.field4638 = var7; // L: 141 + GrandExchangeOffer.BZip2Decompressor_block = var6; // L: 140 + var0.field4643 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpw;)V" + descriptor = "(Lpr;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; // L: 170 int[] var24 = null; // L: 171 int[] var25 = null; // L: 172 - var0.blockSize100k = 1792002039; // L: 173 - if (Widget.BZip2Decompressor_block == null) { // L: 174 - Widget.BZip2Decompressor_block = new int[var0.blockSize100k * -912308640]; + var0.blockSize100k = -1776360451; // L: 173 + if (GrandExchangeOffer.BZip2Decompressor_block == null) { // L: 174 + GrandExchangeOffer.BZip2Decompressor_block = new int[var0.blockSize100k * -2059250912]; } boolean var26 = true; // L: 175 @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - Widget.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + GrandExchangeOffer.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - Widget.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + GrandExchangeOffer.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(Widget.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = Widget.BZip2Decompressor_block; // L: 428 + var1 = (byte)(GrandExchangeOffer.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = GrandExchangeOffer.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field4638 = Widget.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field4643 = GrandExchangeOffer.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 var0.nblocks_used = 0; // L: 432 - var0.field4638 = Widget.BZip2Decompressor_block[var0.field4638]; // L: 433 - var0.su_ch2 = (byte)(var0.field4638 & 255); // L: 434 - var0.field4638 >>= 8; // L: 436 + var0.field4643 = GrandExchangeOffer.BZip2Decompressor_block[var0.field4643]; // L: 433 + var0.su_ch2 = (byte)(var0.field4643 & 255); // L: 434 + var0.field4643 >>= 8; // L: 436 ++var0.nblocks_used; // L: 437 - var0.field4657 = var47; // L: 438 - method7986(var0); // L: 439 - if (var0.field4657 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4661 = var47; // L: 438 + method7902(var0); // L: 439 + if (var0.field4661 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -538,18 +538,18 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpw;)B" + descriptor = "(Lpr;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lpw;)B" + descriptor = "(Lpr;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { @@ -558,7 +558,7 @@ public final class BZip2Decompressor { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILpw;)I" + descriptor = "(ILpr;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpw;)V" + descriptor = "(Lpr;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index d573268549..472b949c14 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -3,164 +3,169 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pw") +@ObfuscatedName("pr") @Implements("BZip2State") public final class BZip2State { + @ObfuscatedName("sg") + @ObfuscatedGetter( + intValue = -1129469843 + ) + static int field4662; @ObfuscatedName("v") - final int field4642; - @ObfuscatedName("o") - final int field4621; - @ObfuscatedName("h") - final int field4631; - @ObfuscatedName("g") - final int field4623; - @ObfuscatedName("l") - final int field4622; + final int field4655; + @ObfuscatedName("c") + final int field4627; + @ObfuscatedName("i") + final int field4626; + @ObfuscatedName("f") + final int field4633; + @ObfuscatedName("b") + final int field4628; @ObfuscatedName("n") - final int field4625; - @ObfuscatedName("d") + final int field4634; + @ObfuscatedName("s") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 181099261 + intValue = 1322812601 ) @Export("nextByte") int nextByte; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1759162365 + intValue = -430087741 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -522842353 + intValue = -175215317 ) @Export("next_out") int next_out; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1864321797 + intValue = 1039446447 ) @Export("outputLength") int outputLength; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -30429837 + intValue = -1120084063 ) - int field4635; - @ObfuscatedName("j") + int field4636; + @ObfuscatedName("k") @Export("out_char") byte out_char; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 471836973 + intValue = 18493607 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1476637683 + intValue = -837008917 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -786091243 + intValue = -694773855 ) @Export("bsLive") int bsLive; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 991263757 + intValue = 482261833 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -346783491 + intValue = -1004484133 ) - int field4638; - @ObfuscatedName("q") + int field4643; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1526094507 + intValue = 1457960971 ) @Export("su_ch2") int su_ch2; @ObfuscatedName("y") @Export("unzftab") int[] unzftab; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 433729093 + intValue = 2064048971 ) @Export("nblocks_used") int nblocks_used; @ObfuscatedName("e") @Export("cftab") int[] cftab; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2017567191 + intValue = 180562183 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("ll8") byte[] ll8; - @ObfuscatedName("at") + @ObfuscatedName("ak") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("selector") byte[] selector; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("ab") + @ObfuscatedName("av") @Export("limit") int[][] limit; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("base") int[][] base; - @ObfuscatedName("ad") + @ObfuscatedName("an") @Export("perm") int[][] perm; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("minLens") int[] minLens; - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1816704057 + intValue = -1169026527 ) - int field4657; + int field4661; BZip2State() { - this.field4642 = 4096; // L: 4 - this.field4621 = 16; // L: 5 - this.field4631 = 258; // L: 6 - this.field4623 = 6; // L: 7 - this.field4622 = 50; // L: 8 - this.field4625 = 18002; // L: 9 + this.field4655 = 4096; // L: 4 + this.field4627 = 16; // L: 5 + this.field4626 = 258; // L: 6 + this.field4633 = 6; // L: 7 + this.field4628 = 50; // L: 8 + this.field4634 = 18002; // L: 9 this.nextByte = 0; // L: 11 this.next_out = 0; // L: 14 this.unzftab = new int[256]; // L: 25 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index dfa61b1274..4825f7ab32 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,66 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("ij") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("Widget_modelsArchive") - public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("g") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1881565209 + intValue = -1523942229 ) @Export("z") int z; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 473048845 + intValue = -361735633 ) @Export("x") int x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1697452955 + intValue = 436509427 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1621738645 + intValue = -1245875017 ) @Export("orientationA") int orientationA; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1622377931 + intValue = 1804141061 ) @Export("orientationB") int orientationB; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -6534703373500493307L + longValue = -3781054410051402755L ) @Export("tag") public long tag; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1893718069 + intValue = 2053587143 ) @Export("flags") int flags; diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 2b40b960d4..9233b0598f 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -7,33 +7,27 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("nm") @Implements("Bounds") public class Bounds { - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "[Lql;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1629370451 + intValue = -1496433009 ) @Export("lowX") public int lowX; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1059092457 + intValue = 1348899275 ) @Export("lowY") public int lowY; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1428810555 + intValue = 2132855023 ) @Export("highX") public int highX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1673451589 + intValue = 1258662357 ) @Export("highY") public int highY; @@ -41,7 +35,7 @@ public class Bounds { public Bounds(int var1, int var2, int var3, int var4) { this.setLow(var1, var2); // L: 14 this.setHigh(var3, var4); // L: 15 - } // L: 16 + } public Bounds(int var1, int var2) { this(0, 0, var1, var2); // L: 10 @@ -50,7 +44,7 @@ public class Bounds { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1528835828" + garbageValue = "691768070" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -58,10 +52,10 @@ public class Bounds { this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1509312094" + garbageValue = "1684494436" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -69,40 +63,40 @@ public class Bounds { this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "21" + descriptor = "(III)Z", + garbageValue = "2065555787" ) - public boolean method6983(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.lowY + this.highY; // L: 29 + public boolean method6944(int var1, int var2) { + return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnm;Lnm;B)V", - garbageValue = "-1" + descriptor = "(Lnm;Lnm;I)V", + garbageValue = "1872281468" ) - public void method6985(Bounds var1, Bounds var2) { - this.method6986(var1, var2); // L: 37 - this.method7001(var1, var2); // L: 38 + public void method6945(Bounds var1, Bounds var2) { + this.method6946(var1, var2); // L: 37 + this.method6947(var1, var2); // L: 38 } // L: 39 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lnm;Lnm;B)V", - garbageValue = "127" + descriptor = "(Lnm;Lnm;S)V", + garbageValue = "3154" ) - void method6986(Bounds var1, Bounds var2) { + void method6946(Bounds var1, Bounds var2) { var2.lowX = this.lowX; // L: 42 var2.highX = this.highX; // L: 43 if (this.lowX < var1.lowX) { // L: 44 - var2.highX = (var2.highX * -23049715 - (var1.lowX * -23049715 - this.lowX * -23049715)) * -1428810555; // L: 45 + var2.highX = (var2.highX * 1363895823 - (var1.lowX * 1363895823 - this.lowX * 1363895823)) * 2132855023; // L: 45 var2.lowX = var1.lowX; // L: 46 } - if (var2.method6988() > var1.method6988()) { // L: 48 - var2.highX -= var2.method6988() - var1.method6988(); // L: 49 + if (var2.method6965() > var1.method6965()) { // L: 48 + var2.highX -= var2.method6965() - var1.method6965(); // L: 49 } if (var2.highX < 0) { // L: 51 @@ -113,19 +107,19 @@ public class Bounds { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnm;Lnm;I)V", - garbageValue = "1907619314" + descriptor = "(Lnm;Lnm;B)V", + garbageValue = "0" ) - void method7001(Bounds var1, Bounds var2) { + void method6947(Bounds var1, Bounds var2) { var2.lowY = this.lowY; // L: 55 var2.highY = this.highY; // L: 56 if (this.lowY < var1.lowY) { // L: 57 - var2.highY = (var2.highY * 206931315 - (var1.lowY * 206931315 - this.lowY * 206931315)) * -1673451589; // L: 58 + var2.highY = (var2.highY * 446318461 - (var1.lowY * 446318461 - this.lowY * 446318461)) * 1258662357; // L: 58 var2.lowY = var1.lowY; // L: 59 } - if (var2.method6989() > var1.method6989()) { // L: 61 - var2.highY -= var2.method6989() - var1.method6989(); // L: 62 + if (var2.method6949() > var1.method6949()) { // L: 61 + var2.highY -= var2.method6949() - var1.method6949(); // L: 62 } if (var2.highY < 0) { // L: 64 @@ -134,25 +128,33 @@ public class Bounds { } // L: 65 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1510318175" + descriptor = "(B)I", + garbageValue = "44" ) - int method6988() { - return this.lowX + this.highX; // L: 68 + int method6965() { + return this.highX + this.lowX; // L: 68 } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2121391140" + garbageValue = "-1934877561" ) - int method6989() { + int method6949() { return this.highY + this.lowY; // L: 72 } public String toString() { return null; // L: 33 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lln;I)V", + garbageValue = "1725122550" + ) + public static void method6969(AbstractArchive var0) { + } // L: 16 } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 59f803a9f0..d3ee3ab041 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("nl") +@ObfuscatedName("nf") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -329261875 + intValue = 1194347475 ) @Export("world") public int world; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 942443689 + intValue = -1261040891 ) @Export("int2") public int int2; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1490614651 + intValue = 1639181057 ) @Export("rank") public int rank; @@ -30,10 +30,10 @@ public class Buddy extends User { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "33" + garbageValue = "-7" ) @Export("set") void set(int var1, int var2) { @@ -41,20 +41,20 @@ public class Buddy extends User { this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("ao") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-204003720" + descriptor = "(B)I", + garbageValue = "49" ) @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("av") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1184612078" + garbageValue = "-2071809224" ) @Export("hasWorld") public boolean hasWorld() { diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index c92fae7215..3fdbf0e3f0 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,35 +1,11 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dx") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Laz;" - ) - @Export("pcmPlayerProvider") - static class47 pcmPlayerProvider; - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Lcr;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("fo") - @ObfuscatedGetter( - intValue = -490207969 - ) - @Export("js5Port") - static int js5Port; - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - static AbstractSocket field1378; @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -40,8 +16,8 @@ public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;I)I", - garbageValue = "-554483430" + descriptor = "(Lnf;Lnf;I)I", + garbageValue = "-2004445607" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -53,320 +29,25 @@ public class BuddyRankComparator extends AbstractUserComparator { } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("gj") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lco;II)V", - garbageValue = "-1008327534" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "606932016" ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var3; - int var4; - int var11; - if (var0.field1179 >= Client.cycle) { // L: 3573 - ModeWhere.method6145(var0); - } else if (var0.field1180 >= Client.cycle) { // L: 3574 - class16.method215(var0); + public static byte[] method2633(Object var0, boolean var1) { + if (var0 == null) { // L: 21 + return null; + } else if (var0 instanceof byte[]) { // L: 22 + byte[] var3 = (byte[])((byte[])var0); // L: 23 + return var1 ? SoundSystem.method764(var3) : var3; // L: 24 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 + return var2.get(); // L: 29 } else { - var0.movementSequence = var0.idleSequence; // L: 3576 - if (var0.pathLength == 0) { // L: 3577 - var0.field1197 = 0; // L: 3578 - } else { - label409: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3581 - SequenceDefinition var2 = ItemContainer.SequenceDefinition_get(var0.sequence); // L: 3582 - if (var0.field1134 > 0 && var2.field2162 == 0) { // L: 3583 - ++var0.field1197; // L: 3584 - break label409; // L: 3585 - } - - if (var0.field1134 <= 0 && var2.field2171 == 0) { // L: 3587 - ++var0.field1197; // L: 3588 - break label409; // L: 3589 - } - } - - var11 = var0.x; // L: 3592 - var3 = var0.y; // L: 3593 - var4 = var0.field1145 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3594 - int var5 = var0.field1145 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3595 - if (var11 < var4) { // L: 3596 - if (var3 < var5) { // L: 3597 - var0.orientation = 1280; - } else if (var3 > var5) { // L: 3598 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 3599 - } - } else if (var11 > var4) { // L: 3601 - if (var3 < var5) { // L: 3602 - var0.orientation = 768; - } else if (var3 > var5) { // L: 3603 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 3604 - } - } else if (var3 < var5) { // L: 3606 - var0.orientation = 1024; - } else if (var3 > var5) { // L: 3607 - var0.orientation = 0; - } - - class193 var6 = var0.pathTraversed[var0.pathLength - 1]; // L: 3608 - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3609 - int var7 = var0.orientation - var0.rotation & 2047; // L: 3616 - if (var7 > 1024) { // L: 3617 - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; // L: 3618 - if (var7 >= -256 && var7 <= 256) { // L: 3619 - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { // L: 3620 - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { // L: 3621 - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { // L: 3622 - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; // L: 3623 - int var9 = 4; // L: 3624 - boolean var10 = true; // L: 3625 - if (var0 instanceof NPC) { // L: 3626 - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { // L: 3627 - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1192 != 0) { // L: 3628 - var9 = 2; - } - - if (var0.pathLength > 2) { // L: 3629 - var9 = 6; - } - - if (var0.pathLength > 3) { // L: 3630 - var9 = 8; - } - - if (var0.field1197 > 0 && var0.pathLength > 1) { // L: 3631 - var9 = 8; // L: 3632 - --var0.field1197; // L: 3633 - } - } else { - if (var0.pathLength > 1) { // L: 3637 - var9 = 6; - } - - if (var0.pathLength > 2) { // L: 3638 - var9 = 8; - } - - if (var0.field1197 > 0 && var0.pathLength > 1) { // L: 3639 - var9 = 8; // L: 3640 - --var0.field1197; // L: 3641 - } - } - - if (var6 == class193.field2191) { // L: 3644 - var9 <<= 1; - } else if (var6 == class193.field2195) { // L: 3645 - var9 >>= 1; - } - - if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 3646 - var0.movementSequence = var0.runSequence; - } - - if (var4 != var11 || var5 != var3) { // L: 3647 - if (var11 < var4) { // L: 3648 - var0.x += var9; // L: 3649 - if (var0.x > var4) { // L: 3650 - var0.x = var4; - } - } else if (var11 > var4) { // L: 3652 - var0.x -= var9; // L: 3653 - if (var0.x < var4) { // L: 3654 - var0.x = var4; - } - } - - if (var3 < var5) { // L: 3656 - var0.y += var9; // L: 3657 - if (var0.y > var5) { // L: 3658 - var0.y = var5; - } - } else if (var3 > var5) { // L: 3660 - var0.y -= var9; // L: 3661 - if (var0.y < var5) { // L: 3662 - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { // L: 3665 - --var0.pathLength; // L: 3666 - if (var0.field1134 > 0) { // L: 3667 - --var0.field1134; - } - } - } else { - var0.x = var4; // L: 3610 - var0.y = var5; // L: 3611 - --var0.pathLength; // L: 3612 - if (var0.field1134 > 0) { // L: 3613 - --var0.field1134; - } - } - } - } + throw new IllegalArgumentException(); // L: 31 } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3670 - var0.sequence = -1; // L: 3671 - var0.spotAnimation = -1; // L: 3672 - var0.field1179 = 0; // L: 3673 - var0.field1180 = 0; // L: 3674 - var0.x = var0.pathX[0] * 128 + var0.field1145 * 64; // L: 3675 - var0.y = var0.field1145 * 64 + var0.pathY[0] * 128; // L: 3676 - var0.method2205(); // L: 3677 - } - - if (class19.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3679 3680 - var0.sequence = -1; // L: 3681 - var0.spotAnimation = -1; // L: 3682 - var0.field1179 = 0; // L: 3683 - var0.field1180 = 0; // L: 3684 - var0.x = var0.pathX[0] * 128 + var0.field1145 * 64; // L: 3685 - var0.y = var0.pathY[0] * 128 + var0.field1145 * 64; // L: 3686 - var0.method2205(); // L: 3687 - } - - if (var0.field1192 != 0) { // L: 3691 - if (var0.targetIndex != -1) { // L: 3692 - Object var13 = null; // L: 3693 - if (var0.targetIndex < 32768) { // L: 3694 - var13 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 3695 - var13 = Client.players[var0.targetIndex - 32768]; - } - - if (var13 != null) { // L: 3696 - var3 = var0.x - ((Actor)var13).x; // L: 3697 - var4 = var0.y - ((Actor)var13).y; // L: 3698 - if (var3 != 0 || var4 != 0) { // L: 3699 - var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 3701 - var0.targetIndex = -1; // L: 3702 - var0.false0 = false; // L: 3703 - } - } - - if (var0.field1160 != -1 && (var0.pathLength == 0 || var0.field1197 > 0)) { // L: 3706 - var0.orientation = var0.field1160; // L: 3707 - var0.field1160 = -1; // L: 3708 - } - - var11 = var0.orientation - var0.rotation & 2047; // L: 3710 - if (var11 == 0 && var0.false0) { // L: 3711 - var0.targetIndex = -1; // L: 3712 - var0.false0 = false; // L: 3713 - } - - if (var11 != 0) { // L: 3715 - ++var0.field1131; // L: 3716 - boolean var14; - if (var11 > 1024) { // L: 3717 - var0.rotation -= var0.field1183 ? var11 : var0.field1192 * 763690023 * -1413434473; // L: 3718 - var14 = true; // L: 3719 - if (var11 < var0.field1192 || var11 > 2048 - var0.field1192) { // L: 3720 - var0.rotation = var0.orientation; // L: 3721 - var14 = false; // L: 3722 - } - - if (!var0.field1183 && var0.movementSequence == var0.idleSequence && (var0.field1131 > 25 || var14)) { // L: 3724 - if (var0.turnLeftSequence != -1) { // L: 3725 - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3726 - } - } - } else { - var0.rotation += var0.field1183 ? var11 : var0.field1192 * 763690023 * -1413434473; // L: 3730 - var14 = true; // L: 3731 - if (var11 < var0.field1192 || var11 > 2048 - var0.field1192) { // L: 3732 - var0.rotation = var0.orientation; // L: 3733 - var14 = false; // L: 3734 - } - - if (!var0.field1183 && var0.idleSequence == var0.movementSequence && (var0.field1131 > 25 || var14)) { // L: 3736 - if (var0.turnRightSequence != -1) { // L: 3737 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3738 - } - } - } - - var0.rotation &= 2047; // L: 3742 - var0.field1183 = false; // L: 3743 - } else { - var0.field1131 = 0; // L: 3745 - } - } - - WorldMapSectionType.method4950(var0); // L: 3747 - } // L: 3748 - - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(Lkn;IIIIIIB)V", - garbageValue = "32" - ) - static final void method2624(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field556) { // L: 10220 - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; // L: 10221 - } - - Client.field556 = false; // L: 10222 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10223 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10224 - var0.scrollY -= 4; // L: 10225 - class290.invalidateWidget(var0); // L: 10226 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10228 - var0.scrollY += 4; // L: 10229 - class290.invalidateWidget(var0); // L: 10230 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10232 - var7 = var3 * (var3 - 32) / var4; // L: 10233 - if (var7 < 8) { // L: 10234 - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; // L: 10235 - int var9 = var3 - 32 - var7; // L: 10236 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 10237 - class290.invalidateWidget(var0); // L: 10238 - Client.field556 = true; // L: 10239 - } - } - - if (Client.mouseWheelRotation != 0) { // L: 10242 - var7 = var0.width; // L: 10243 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10244 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 10245 - class290.invalidateWidget(var0); // L: 10246 - } - } - - } // L: 10249 + } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 40ef634032..23068f4902 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,24 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pd") +@ObfuscatedName("pi") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("q") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("array") public byte[] array; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1151186625 + intValue = -546512181 ) @Export("offset") public int offset; @@ -64,7 +61,7 @@ public class Buffer extends Node { } // L: 44 public Buffer(int var1) { - this.array = class355.ByteArrayPool_getArray(var1); // L: 56 + this.array = ArchiveDiskActionHandler.ByteArrayPool_getArray(var1); // L: 56 this.offset = 0; // L: 57 } // L: 58 @@ -73,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; // L: 62 } // L: 63 - @ObfuscatedName("al") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "21" + garbageValue = "0" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { // L: 66 - ServerPacket.ByteArrayPool_release(this.array); + UserComparator10.ByteArrayPool_release(this.array); } this.array = null; // L: 67 } // L: 68 - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "367101248" + garbageValue = "-1544678095" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; // L: 71 } // L: 72 - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2088026667" + garbageValue = "1590048829" ) @Export("writeShort") public void writeShort(int var1) { @@ -108,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 76 } // L: 77 - @ObfuscatedName("ag") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1525771312" + garbageValue = "1263357679" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -120,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 82 } // L: 83 - @ObfuscatedName("af") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-45" + garbageValue = "88" ) @Export("writeInt") public void writeInt(int var1) { @@ -133,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 89 } // L: 90 - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 93 @@ -144,7 +141,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 98 } // L: 99 - @ObfuscatedName("ai") + @ObfuscatedName("ad") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 102 @@ -157,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 109 } // L: 110 - @ObfuscatedName("bk") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-217562349" + garbageValue = "-903291935" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); // L: 113 } // L: 114 - @ObfuscatedName("bl") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "768" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-90" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -178,15 +175,15 @@ public class Buffer extends Node { if (var2 >= 0) { // L: 122 throw new IllegalArgumentException(""); } else { - this.offset += NetSocket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 + this.offset += class101.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 this.array[++this.offset - 1] = 0; // L: 124 } } // L: 125 - @ObfuscatedName("be") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-382951646" + garbageValue = "1893718137" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -195,27 +192,26 @@ public class Buffer extends Node { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; // L: 130 - this.offset += NetSocket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 131 + this.offset += class101.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 131 this.array[++this.offset - 1] = 0; // L: 132 } } // L: 133 - @ObfuscatedName("bt") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "1514369282" + garbageValue = "-1267419989" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { int var3 = var1.length(); // L: 138 int var4 = 0; // L: 139 - int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 140 - char var12 = var1.charAt(var5); // L: 141 - if (var12 <= 127) { // L: 142 + for (int var5 = 0; var5 < var3; ++var5) { // L: 140 + char var6 = var1.charAt(var5); // L: 141 + if (var6 <= 127) { // L: 142 ++var4; - } else if (var12 <= 2047) { // L: 143 + } else if (var6 <= 2047) { // L: 143 var4 += 2; } else { var4 += 3; // L: 144 @@ -224,890 +220,881 @@ public class Buffer extends Node { this.array[++this.offset - 1] = 0; // L: 149 this.writeVarInt(var4); // L: 150 - var4 = this.offset * 969660737; // L: 151 - byte[] var6 = this.array; // L: 153 - int var7 = this.offset; // L: 154 - int var8 = var1.length(); // L: 156 - int var9 = var7; // L: 157 + this.offset += class163.method3321(this.array, this.offset, var1); // L: 151 + } // L: 152 - for (int var10 = 0; var10 < var8; ++var10) { // L: 158 - char var11 = var1.charAt(var10); // L: 159 - if (var11 <= 127) { // L: 160 - var6[var9++] = (byte)var11; // L: 161 - } else if (var11 <= 2047) { // L: 163 - var6[var9++] = (byte)(192 | var11 >> 6); // L: 164 - var6[var9++] = (byte)(128 | var11 & '?'); // L: 165 - } else { - var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 168 - var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 169 - var6[var9++] = (byte)(128 | var11 & '?'); // L: 170 - } - } - - var5 = var9 - var7; // L: 173 - this.offset = (var4 + var5 * 969660737) * 1151186625; // L: 175 - } // L: 176 - - @ObfuscatedName("ba") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "969660737" + descriptor = "([BIIB)V", + garbageValue = "-80" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 179 + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 155 this.array[++this.offset - 1] = var1[var4]; } - } // L: 180 + } // L: 156 - @ObfuscatedName("bg") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-195792372" + descriptor = "(Lpi;I)V", + garbageValue = "-2134475265" ) - public void method7818(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 183 - } // L: 184 + public void method7668(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 159 + } // L: 160 - @ObfuscatedName("bq") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "41" + descriptor = "(II)V", + garbageValue = "62076396" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 187 - throw new IllegalArgumentException(); // L: 188 + if (var1 < 0) { // L: 163 + throw new IllegalArgumentException(); // L: 164 } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 190 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 191 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 192 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 193 + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 166 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 167 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 168 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 169 } - } // L: 194 + } // L: 170 - @ObfuscatedName("by") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "417023489" + descriptor = "(IB)V", + garbageValue = "100" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 197 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 200 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 201 + if (var1 >= 0 && var1 <= 65535) { // L: 173 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 176 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 177 } else { - throw new IllegalArgumentException(); // L: 198 + throw new IllegalArgumentException(); // L: 174 } - } // L: 202 + } // L: 178 - @ObfuscatedName("bu") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1390922400" + garbageValue = "853951489" ) - public void method7756(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 205 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 208 + public void method7774(int var1) { + if (var1 >= 0 && var1 <= 255) { // L: 181 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 184 } else { - throw new IllegalArgumentException(); // L: 206 + throw new IllegalArgumentException(); // L: 182 } - } // L: 209 + } // L: 185 - @ObfuscatedName("bp") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2016380670" + garbageValue = "343524965" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 212 - this.writeByte(var1); // L: 213 - } else if (var1 >= 0 && var1 < 32768) { // L: 216 - this.writeShort(var1 + 32768); // L: 217 + if (var1 >= 0 && var1 < 128) { // L: 188 + this.writeByte(var1); // L: 189 + } else if (var1 >= 0 && var1 < 32768) { // L: 192 + this.writeShort(var1 + 32768); // L: 193 } else { - throw new IllegalArgumentException(); // L: 220 + throw new IllegalArgumentException(); // L: 196 } - } // L: 214 218 + } // L: 190 194 - @ObfuscatedName("bb") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1383153261" + descriptor = "(IB)V", + garbageValue = "1" ) @Export("writeVarInt") public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 224 - if ((var1 & -16384) != 0) { // L: 225 - if ((var1 & -2097152) != 0) { // L: 226 - if ((var1 & -268435456) != 0) { // L: 227 + if ((var1 & -128) != 0) { // L: 200 + if ((var1 & -16384) != 0) { // L: 201 + if ((var1 & -2097152) != 0) { // L: 202 + if ((var1 & -268435456) != 0) { // L: 203 this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); // L: 228 + this.writeByte(var1 >>> 21 | 128); // L: 204 } - this.writeByte(var1 >>> 14 | 128); // L: 230 + this.writeByte(var1 >>> 14 | 128); // L: 206 } - this.writeByte(var1 >>> 7 | 128); // L: 232 + this.writeByte(var1 >>> 7 | 128); // L: 208 } - this.writeByte(var1 & 127); // L: 234 - } // L: 235 + this.writeByte(var1 & 127); // L: 210 + } // L: 211 - @ObfuscatedName("bv") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1033498878" + garbageValue = "-1994981915" ) @Export("readUnsignedByte") public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 238 + return this.array[++this.offset - 1] & 255; // L: 214 } - @ObfuscatedName("bs") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "-1324632769" + garbageValue = "-1736471016" ) @Export("readByte") public byte readByte() { - return this.array[++this.offset - 1]; // L: 242 + return this.array[++this.offset - 1]; // L: 218 + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "7" + ) + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 222 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 223 } @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1409564993" - ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; // L: 246 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 247 - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "657531519" + garbageValue = "-1776803608" ) @Export("readShort") public int readShort() { - this.offset += 2; // L: 251 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 252 - if (var1 > 32767) { // L: 253 + this.offset += 2; // L: 227 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 228 + if (var1 > 32767) { // L: 229 var1 -= 65536; } - return var1; // L: 254 + return var1; // L: 230 } - @ObfuscatedName("bi") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-107" + descriptor = "(I)I", + garbageValue = "-858402285" ) @Export("readMedium") public int readMedium() { - this.offset += 3; // L: 258 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 259 - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-109" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; // L: 263 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 264 - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "789375778" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 268 - long var3 = (long)this.readInt() & 4294967295L; // L: 269 - return (var1 << 32) + var3; // L: 270 + this.offset += 3; // L: 234 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 235 } @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-1692337724" + descriptor = "(I)I", + garbageValue = "464100313" ) - public float method7965() { - return Float.intBitsToFloat(this.readInt()); // L: 274 + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 239 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 240 } - @ObfuscatedName("bw") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-82477001" + descriptor = "(B)J", + garbageValue = "-124" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 244 + long var3 = (long)this.readInt() & 4294967295L; // L: 245 + return var3 + (var1 << 32); // L: 246 + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "116" + ) + public float method7681() { + return Float.intBitsToFloat(this.readInt()); // L: 250 + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "-14486" ) @Export("readBoolean") public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 278 + return (this.readUnsignedByte() & 1) == 1; // L: 254 } - @ObfuscatedName("bh") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-58" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "758249077" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 282 - ++this.offset; // L: 283 - return null; // L: 284 + if (this.array[this.offset] == 0) { // L: 258 + ++this.offset; // L: 259 + return null; // L: 260 } else { - return this.readStringCp1252NullTerminated(); // L: 286 + return this.readStringCp1252NullTerminated(); // L: 262 } } - @ObfuscatedName("cd") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-75" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "355305426" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 290 + int var1 = this.offset; // L: 266 - while (this.array[++this.offset - 1] != 0) { // L: 291 + while (this.array[++this.offset - 1] != 0) { // L: 267 } - int var2 = this.offset - var1 - 1; // L: 292 - return var2 == 0 ? "" : class113.decodeStringCp1252(this.array, var1, var2); // L: 293 294 + int var2 = this.offset - var1 - 1; // L: 268 + return var2 == 0 ? "" : class118.decodeStringCp1252(this.array, var1, var2); // L: 269 270 } - @ObfuscatedName("cy") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-74" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1425609826" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 298 - if (var1 != 0) { // L: 299 + byte var1 = this.array[++this.offset - 1]; // L: 274 + if (var1 != 0) { // L: 275 throw new IllegalStateException(""); } else { - int var2 = this.offset; // L: 300 + int var2 = this.offset; // L: 276 - while (this.array[++this.offset - 1] != 0) { // L: 301 + while (this.array[++this.offset - 1] != 0) { // L: 277 } - int var3 = this.offset - var2 - 1; // L: 302 - return var3 == 0 ? "" : class113.decodeStringCp1252(this.array, var2, var3); // L: 303 304 + int var3 = this.offset - var2 - 1; // L: 278 + return var3 == 0 ? "" : class118.decodeStringCp1252(this.array, var2, var3); // L: 279 280 } } - @ObfuscatedName("ca") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "37" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-365286290" ) @Export("readCESU8") public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 308 - if (var1 != 0) { // L: 309 + byte var1 = this.array[++this.offset - 1]; // L: 284 + if (var1 != 0) { // L: 285 throw new IllegalStateException(""); } else { - int var2 = this.readVarInt(); // L: 310 - byte[] var4 = this.array; // L: 313 - int var5 = this.offset; // L: 314 - char[] var6 = new char[var2]; // L: 316 - int var7 = 0; // L: 317 - int var8 = var5; // L: 318 + int var2 = this.readVarInt(); // L: 286 + if (var2 + this.offset > this.array.length) { // L: 287 + throw new IllegalStateException(""); + } else { + byte[] var4 = this.array; // L: 289 + int var5 = this.offset; // L: 290 + char[] var6 = new char[var2]; // L: 292 + int var7 = 0; // L: 293 + int var8 = var5; // L: 294 - int var11; - for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 319 320 351 - int var10 = var4[var8++] & 255; // L: 321 - if (var10 < 128) { // L: 323 - if (var10 == 0) { // L: 324 - var11 = 65533; - } else { - var11 = var10; // L: 325 - } - } else if (var10 < 192) { // L: 327 - var11 = 65533; - } else if (var10 < 224) { // L: 328 - if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 329 - var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 330 - if (var11 < 128) { // L: 331 + int var11; + for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 295 296 327 + int var10 = var4[var8++] & 255; // L: 297 + if (var10 < 128) { // L: 299 + if (var10 == 0) { // L: 300 var11 = 65533; - } - } else { - var11 = 65533; // L: 333 - } - } else if (var10 < 240) { // L: 335 - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 336 - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 337 - if (var11 < 2048) { // L: 338 - var11 = 65533; - } - } else { - var11 = 65533; // L: 340 - } - } else if (var10 < 248) { // L: 342 - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 343 - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 344 - if (var11 >= 65536 && var11 <= 1114111) { // L: 345 - var11 = 65533; // L: 346 } else { - var11 = 65533; + var11 = var10; // L: 301 + } + } else if (var10 < 192) { // L: 303 + var11 = 65533; + } else if (var10 < 224) { // L: 304 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 305 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 306 + if (var11 < 128) { // L: 307 + var11 = 65533; + } + } else { + var11 = 65533; // L: 309 + } + } else if (var10 < 240) { // L: 311 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 312 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 313 + if (var11 < 2048) { // L: 314 + var11 = 65533; + } + } else { + var11 = 65533; // L: 316 + } + } else if (var10 < 248) { // L: 318 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 319 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 320 + if (var11 >= 65536 && var11 <= 1114111) { // L: 321 + var11 = 65533; // L: 322 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 324 } } else { - var11 = 65533; // L: 348 + var11 = 65533; // L: 326 } - } else { - var11 = 65533; // L: 350 } - } - String var3 = new String(var6, 0, var7); // L: 353 - this.offset += var2; // L: 356 - return var3; // L: 357 + String var3 = new String(var6, 0, var7); // L: 329 + this.offset += var2; // L: 332 + return var3; // L: 333 + } } } - @ObfuscatedName("cr") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1458631272" + garbageValue = "686872158" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = this.array[++this.offset - 1]; // L: 361 + var1[var4] = this.array[++this.offset - 1]; // L: 337 } - } // L: 362 + } // L: 338 - @ObfuscatedName("cn") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2097208875" + descriptor = "(B)I", + garbageValue = "1" ) @Export("readShortSmart") public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 365 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 366 367 + int var1 = this.array[this.offset] & 255; // L: 341 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 342 343 } - @ObfuscatedName("cp") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2140648366" + garbageValue = "-2128397658" ) @Export("readUShortSmart") public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 371 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 372 373 + int var1 = this.array[this.offset] & 255; // L: 347 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 348 349 } - @ObfuscatedName("cw") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "257872718" + descriptor = "(B)I", + garbageValue = "16" ) - public int method7775() { - int var1 = 0; // L: 377 + public int method7743() { + int var1 = 0; // L: 353 int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 378 379 381 - var1 += 32767; // L: 380 + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 354 355 357 + var1 += 32767; // L: 356 } - var1 += var2; // L: 383 - return var1; // L: 384 + var1 += var2; // L: 359 + return var1; // L: 360 } - @ObfuscatedName("ck") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1236920051" + garbageValue = "-701209540" ) - public int method7776() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 388 389 + public int method7758() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 364 365 } - @ObfuscatedName("co") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-465686583" + garbageValue = "-2072600495" ) - public int method7742() { - if (this.array[this.offset] < 0) { // L: 393 + public int method7692() { + if (this.array[this.offset] < 0) { // L: 369 return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.readUnsignedShort(); // L: 394 - return var1 == 32767 ? -1 : var1; // L: 395 + int var1 = this.readUnsignedShort(); // L: 370 + return var1 == 32767 ? -1 : var1; // L: 371 } } - @ObfuscatedName("cu") + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "12345678" + garbageValue = "511637186" ) @Export("readVarInt") public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 400 + byte var1 = this.array[++this.offset - 1]; // L: 376 int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 401 402 404 - var2 = (var2 | var1 & 127) << 7; // L: 403 + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 377 378 380 + var2 = (var2 | var1 & 127) << 7; // L: 379 } - return var2 | var1; // L: 406 + return var2 | var1; // L: 382 } - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "111077489" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 410 - this.offset = 0; // L: 411 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 412 - int var4 = this.readInt(); // L: 413 - int var5 = this.readInt(); // L: 414 - int var6 = 0; // L: 415 - int var7 = -1640531527; // L: 416 - - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 417 418 421 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 419 - var6 += var7; // L: 420 - } - - this.offset -= 8; // L: 423 - this.writeInt(var4); // L: 424 - this.writeInt(var5); // L: 425 - } - - } // L: 427 - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "1617746307" - ) - @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 430 - this.offset = 0; // L: 431 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 432 - int var4 = this.readInt(); // L: 433 - int var5 = this.readInt(); // L: 434 - int var6 = -957401312; // L: 435 - int var7 = -1640531527; // L: 436 - - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 437 438 441 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 439 - var6 -= var7; // L: 440 - } - - this.offset -= 8; // L: 443 - this.writeInt(var4); // L: 444 - this.writeInt(var5); // L: 445 - } - - } // L: 447 - @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "([IB)V", + garbageValue = "90" + ) + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 386 + this.offset = 0; // L: 387 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 388 + int var4 = this.readInt(); // L: 389 + int var5 = this.readInt(); // L: 390 + int var6 = 0; // L: 391 + int var7 = -1640531527; // L: 392 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 393 394 397 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 395 + var6 += var7; // L: 396 + } + + this.offset -= 8; // L: 399 + this.writeInt(var4); // L: 400 + this.writeInt(var5); // L: 401 + } + + } // L: 403 + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "-693426643" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 406 + this.offset = 0; // L: 407 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 408 + int var4 = this.readInt(); // L: 409 + int var5 = this.readInt(); // L: 410 + int var6 = -957401312; // L: 411 + int var7 = -1640531527; // L: 412 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 413 414 417 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 415 + var6 -= var7; // L: 416 + } + + this.offset -= 8; // L: 419 + this.writeInt(var4); // L: 420 + this.writeInt(var5); // L: 421 + } + + } // L: 423 + + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "([IIII)V", - garbageValue = "-115673654" + garbageValue = "1422040268" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 450 - this.offset = var2; // L: 451 - int var5 = (var3 - var2) / 8; // L: 452 + int var4 = this.offset; // L: 426 + this.offset = var2; // L: 427 + int var5 = (var3 - var2) / 8; // L: 428 - for (int var6 = 0; var6 < var5; ++var6) { // L: 453 - int var7 = this.readInt(); // L: 454 - int var8 = this.readInt(); // L: 455 - int var9 = 0; // L: 456 - int var10 = -1640531527; // L: 457 + for (int var6 = 0; var6 < var5; ++var6) { // L: 429 + int var7 = this.readInt(); // L: 430 + int var8 = this.readInt(); // L: 431 + int var9 = 0; // L: 432 + int var10 = -1640531527; // L: 433 - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 458 459 462 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 460 - var9 += var10; // L: 461 + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 434 435 438 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 436 + var9 += var10; // L: 437 } - this.offset -= 8; // L: 464 - this.writeInt(var7); // L: 465 - this.writeInt(var8); // L: 466 + this.offset -= 8; // L: 440 + this.writeInt(var7); // L: 441 + this.writeInt(var8); // L: 442 } - this.offset = var4; // L: 468 - } // L: 469 + this.offset = var4; // L: 444 + } // L: 445 - @ObfuscatedName("cx") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "([IIIS)V", - garbageValue = "-3424" + descriptor = "([IIII)V", + garbageValue = "1959682043" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 472 - this.offset = var2; // L: 473 - int var5 = (var3 - var2) / 8; // L: 474 + int var4 = this.offset; // L: 448 + this.offset = var2; // L: 449 + int var5 = (var3 - var2) / 8; // L: 450 - for (int var6 = 0; var6 < var5; ++var6) { // L: 475 - int var7 = this.readInt(); // L: 476 - int var8 = this.readInt(); // L: 477 - int var9 = -957401312; // L: 478 - int var10 = -1640531527; // L: 479 + for (int var6 = 0; var6 < var5; ++var6) { // L: 451 + int var7 = this.readInt(); // L: 452 + int var8 = this.readInt(); // L: 453 + int var9 = -957401312; // L: 454 + int var10 = -1640531527; // L: 455 - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 480 481 484 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 482 - var9 -= var10; // L: 483 + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 456 457 460 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 458 + var9 -= var10; // L: 459 } - this.offset -= 8; // L: 486 - this.writeInt(var7); // L: 487 - this.writeInt(var8); // L: 488 + this.offset -= 8; // L: 462 + this.writeInt(var7); // L: 463 + this.writeInt(var8); // L: 464 } - this.offset = var4; // L: 490 - } // L: 491 + this.offset = var4; // L: 466 + } // L: 467 - @ObfuscatedName("cg") + @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-589616199" + garbageValue = "-1970274775" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 494 - this.offset = 0; // L: 495 - byte[] var4 = new byte[var3]; // L: 496 - this.readBytes(var4, 0, var3); // L: 497 - BigInteger var5 = new BigInteger(var4); // L: 498 - BigInteger var6 = var5.modPow(var1, var2); // L: 499 - byte[] var7 = var6.toByteArray(); // L: 500 - this.offset = 0; // L: 501 - this.writeShort(var7.length); // L: 502 - this.writeBytes(var7, 0, var7.length); // L: 503 - } // L: 504 + int var3 = this.offset; // L: 470 + this.offset = 0; // L: 471 + byte[] var4 = new byte[var3]; // L: 472 + this.readBytes(var4, 0, var3); // L: 473 + BigInteger var5 = new BigInteger(var4); // L: 474 + BigInteger var6 = var5.modPow(var1, var2); // L: 475 + byte[] var7 = var6.toByteArray(); // L: 476 + this.offset = 0; // L: 477 + this.writeShort(var7.length); // L: 478 + this.writeBytes(var7, 0, var7.length); // L: 479 + } // L: 480 @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "81" + garbageValue = "87" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = class300.method5768(this.array, var1, this.offset); // L: 507 - this.writeInt(var2); // L: 508 - return var2; // L: 509 - } + byte[] var3 = this.array; // L: 484 + int var4 = this.offset; // L: 485 + int var5 = -1; // L: 487 - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "518058436" - ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; // L: 513 - int var1 = class300.method5768(this.array, 0, this.offset); // L: 514 - int var2 = this.readInt(); // L: 515 - return var2 == var1; // L: 516 - } + for (int var6 = var1; var6 < var4; ++var6) { // L: 488 + var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 489 + } - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "482067645" - ) - public void method7786(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 521 - } // L: 522 - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1634404689" - ) - public void method7787(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 525 - } // L: 526 - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "113" - ) - public void method7788(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 529 - } // L: 530 - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1554649771" - ) - public int method7789() { - return this.array[++this.offset - 1] - 128 & 255; // L: 533 - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-243060031" - ) - public int method7790() { - return 0 - this.array[++this.offset - 1] & 255; // L: 537 - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1303302003" - ) - public int method7927() { - return 128 - this.array[++this.offset - 1] & 255; // L: 541 - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "7" - ) - public byte method7792() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 545 + var5 = ~var5; // L: 491 + this.writeInt(var5); // L: 495 + return var5; // L: 496 } @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "378770832" ) - public byte method7955() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 549 + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 500 + int var1 = class144.method3082(this.array, 0, this.offset); // L: 501 + int var2 = this.readInt(); // L: 502 + return var1 == var2; // L: 503 } + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2049661918" + ) + public void method7701(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 508 + } // L: 509 + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-126" + ) + public void method7804(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 512 + } // L: 513 + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1969740861" + ) + public void method7703(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 516 + } // L: 517 + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-498861947" + ) + public int method7875() { + return this.array[++this.offset - 1] - 128 & 255; // L: 520 + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-2" + ) + public int method7773() { + return 0 - this.array[++this.offset - 1] & 255; // L: 524 + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "924383522" + ) + public int method7742() { + return 128 - this.array[++this.offset - 1] & 255; // L: 528 + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-224847897" + ) + public byte method7707() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 532 + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-92497393" + ) + public byte method7708() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 536 + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "2" + ) + public byte method7885() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 540 + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-108" + ) + public void method7710(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 544 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 545 + } // L: 546 + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1271844587" + ) + public void method7711(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 549 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 550 + } // L: 551 + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-38" + ) + public void method7712(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 554 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 555 + } // L: 556 + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "121" + descriptor = "(I)I", + garbageValue = "1842864203" ) - public byte method7925() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 553 + public int method7713() { + this.offset += 2; // L: 559 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 560 + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2017846356" + ) + public int method7714() { + this.offset += 2; // L: 564 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 565 + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-8127" + ) + public int method7715() { + this.offset += 2; // L: 569 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 570 + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "24" + ) + public int method7716() { + this.offset += 2; // L: 574 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 575 + if (var1 > 32767) { // L: 576 + var1 -= 65536; + } + + return var1; // L: 577 + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-14" + ) + public int method7717() { + this.offset += 2; // L: 581 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 582 + if (var1 > 32767) { // L: 583 + var1 -= 65536; + } + + return var1; // L: 584 + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1014855244" + ) + public void method7680(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 588 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 589 + this.array[++this.offset - 1] = (byte)var1; // L: 590 + } // L: 591 + + @ObfuscatedName("dr") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "71565534" + ) + public int method7752() { + this.offset += 3; // L: 594 + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 595 + } + + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-210330381" + ) + public int method7793() { + this.offset += 3; // L: 599 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 600 } @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "578446044" + garbageValue = "-1393724585" ) - public void method7795(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 557 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 558 - } // L: 559 - - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1274838633" - ) - public void method7796(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 562 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 563 - } // L: 564 - - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-10" - ) - public void method7791(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 567 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 568 - } // L: 569 + public void method7721(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 604 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 605 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 606 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 607 + } // L: 608 @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-89" + descriptor = "(II)V", + garbageValue = "52552279" ) - public int method7798() { - this.offset += 2; // L: 572 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 573 - } + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 611 + this.array[++this.offset - 1] = (byte)var1; // L: 612 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 613 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 614 + } // L: 615 - @ObfuscatedName("dj") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-4458" + descriptor = "(IB)V", + garbageValue = "31" ) - public int method7935() { - this.offset += 2; // L: 577 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 578 - } + public void method7723(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 618 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 619 + this.array[++this.offset - 1] = (byte)var1; // L: 620 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 621 + } // L: 622 - @ObfuscatedName("dk") + @ObfuscatedName("dp") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1088098149" + garbageValue = "-664437798" ) - public int method7971() { - this.offset += 2; // L: 582 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 583 + public int method7705() { + this.offset += 4; // L: 625 + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 626 } - @ObfuscatedName("dw") + @ObfuscatedName("dx") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-769215047" + garbageValue = "859716194" ) - public int method7769() { - this.offset += 2; // L: 587 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 588 - if (var1 > 32767) { // L: 589 - var1 -= 65536; - } - - return var1; // L: 590 + public int method7827() { + this.offset += 4; // L: 630 + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 631 } @ObfuscatedName("ds") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1347269170" + garbageValue = "1883588599" ) - public int method7802() { - this.offset += 2; // L: 594 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 595 - if (var1 > 32767) { // L: 596 - var1 -= 65536; - } - - return var1; // L: 597 + public int method7837() { + this.offset += 4; // L: 635 + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 636 } @ObfuscatedName("dc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-788053700" - ) - public void method7803(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 601 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 602 - this.array[++this.offset - 1] = (byte)var1; // L: 603 - } // L: 604 - - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "690490648" - ) - public int method7877() { - this.offset += 3; // L: 607 - return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 608 - } - - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-474982434" - ) - public int method7805() { - this.offset += 3; // L: 612 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 613 - } - - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1204851511" - ) - public void method7806(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 617 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 618 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 619 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 620 - } // L: 621 - - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-646414330" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 624 - this.array[++this.offset - 1] = (byte)var1; // L: 625 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 626 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 627 - } // L: 628 - - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-6" - ) - public void method7746(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 631 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 632 - this.array[++this.offset - 1] = (byte)var1; // L: 633 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 634 - } // L: 635 - - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "11" - ) - public int method7889() { - this.offset += 4; // L: 638 - return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 639 - } - - @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-7883" - ) - public int method7810() { - this.offset += 4; // L: 643 - return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 644 - } - - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1708646906" - ) - public int method7797() { - this.offset += 4; // L: 648 - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 649 - } - - @ObfuscatedName("dx") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "464396885" + garbageValue = "1655401346" ) - public void method7812(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 653 + public void method7814(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 640 var1[var4] = this.array[++this.offset - 1]; } - } // L: 654 + } // L: 641 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index f85634e002..7531536607 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("pz") +@ObfuscatedName("pb") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpr;" + descriptor = "Lph;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -5225665844654198299L + longValue = -8920442284336145207L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2137604271 + intValue = 959546987 ) @Export("readBufferLength") int readBufferLength; @ObfuscatedName("n") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -4541434785534963L + longValue = -5995632714871070967L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1877380551 + intValue = -694187419 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -796283726861942643L + longValue = -7698547287886108579L ) @Export("offset") long offset; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 8209701102495998653L + longValue = -6174188026311387211L ) @Export("fileLength") long fileLength; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -5139704882362271567L + longValue = 2714224379906109785L ) @Export("length") long length; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -29223109042721993L + longValue = -8095417685979246741L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lpr;II)V" + descriptor = "(Lph;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -86,8 +86,8 @@ public class BufferedFile { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1681250175" + descriptor = "(B)V", + garbageValue = "78" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 @@ -105,30 +105,30 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-2004441305" + garbageValue = "-776750742" ) @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1543415552" + garbageValue = "1551073346" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "16" + garbageValue = "0" ) @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 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 48 System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 this.offset += (long)var3; // L: 50 return; // L: 51 @@ -146,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; // L: 53 int var7 = var3; // L: 55 int var8; - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56 + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 if (var8 > var3) { // L: 58 var8 = var3; @@ -184,7 +184,7 @@ public class BufferedFile { this.offset += (long)var8; // L: 83 } - if (this.writeBufferOffset != -1L) { // L: 85 + if (-1L != this.writeBufferOffset) { // L: 85 if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86 var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87 if (var8 > var3 + var2) { // L: 88 @@ -200,15 +200,15 @@ public class BufferedFile { long var13 = -1L; // L: 95 long var10 = -1L; // L: 96 - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97 + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 var13 = this.writeBufferOffset; // L: 98 - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 + } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 100 var13 = var4; // L: 101 } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { // L: 103 + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { // L: 103 var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104 - } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 var10 = var4 + (long)var7; // L: 107 } @@ -233,8 +233,8 @@ public class BufferedFile { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "783523213" + descriptor = "(B)V", + garbageValue = "4" ) @Export("load") void load() throws IOException { @@ -261,10 +261,10 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-900915447" + garbageValue = "-1226704883" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -273,11 +273,11 @@ public class BufferedFile { this.length = (long)var3 + this.offset; } - if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 this.flush(); // L: 148 } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150 int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 this.offset += (long)var4; // L: 153 @@ -314,19 +314,19 @@ public class BufferedFile { long var9 = -1L; // L: 167 long var6 = -1L; // L: 168 - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169 var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 var9 = this.readBufferOffset; // L: 173 } - if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 + if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 var6 = (long)var3 + this.offset; // L: 176 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { // L: 178 - var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178 + var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 } - if (var9 > -1L && var6 > var9) { + if (var9 > -1L && var6 > var9) { // L: 181 int var8 = (int)(var6 - var9); // L: 182 System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183 } @@ -339,21 +339,21 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" + descriptor = "(I)V", + garbageValue = "352436768" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { // L: 203 + if (this.writeBufferOffset != -1L) { // L: 203 if (this.writeBufferOffset != this.fileOffset) { // L: 204 this.accessFile.seek(this.writeBufferOffset); // L: 205 this.fileOffset = this.writeBufferOffset; // L: 206 } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * 3511588097550712833L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * 1276428477523820545L; // L: 209 if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } @@ -362,13 +362,13 @@ public class BufferedFile { long var3 = -1L; // L: 212 if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213 var1 = this.writeBufferOffset; // L: 214 - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216 + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216 var1 = this.readBufferOffset; // L: 217 } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222 var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 } @@ -382,13 +382,4 @@ public class BufferedFile { } } // L: 232 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1547448852" - ) - static int method7626() { - return Login.field914.length + Login.field881.length; // L: 181 - } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index db99986aaa..18af7b219f 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -2,30 +2,33 @@ import java.io.IOException; import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("no") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1563809265 + @ObfuscatedName("o") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("ei") + @ObfuscatedSignature( + descriptor = "Llx;" ) - static int field4286; + @Export("archive3") + static Archive archive3; @ObfuscatedName("v") @Export("socket") Socket socket; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnx;" ) @Export("source") BufferedSource source; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnh;" + descriptor = "Lnd;" ) @Export("sink") BufferedSink sink; @@ -42,72 +45,72 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "105" + descriptor = "(S)V", + garbageValue = "-13138" ) @Export("close") public void close() { - this.sink.close(); // L: 48 + this.sink.close(); // L: 42 try { - this.socket.close(); // L: 50 - } catch (IOException var2) { // L: 52 + this.socket.close(); // L: 44 + } catch (IOException var2) { // L: 46 } - this.source.close(); // L: 53 - } // L: 54 + this.source.close(); // L: 47 + } // L: 48 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1669312252" + garbageValue = "-891040314" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.source.readUnsignedByte(); // L: 33 + return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1264669351" + descriptor = "(B)I", + garbageValue = "46" ) @Export("available") public int available() throws IOException { - return this.source.available(); // L: 28 + return this.source.available(); // L: 26 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "396806768" + descriptor = "(IB)Z", + garbageValue = "27" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); // L: 23 + return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "52142940" + descriptor = "([BIIB)I", + garbageValue = "-118" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); // L: 38 + return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-57" + descriptor = "([BIII)V", + garbageValue = "-1359342670" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); // L: 43 - } // L: 44 + this.sink.write(var1, var2, var3); // L: 38 + } // L: 39 protected void finalize() { - this.close(); // L: 58 - } // L: 59 + this.close(); // L: 51 + } // L: 52 } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 2c48e4b6cb..9a1129a4c5 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -5,196 +5,219 @@ 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("nh") +@ObfuscatedName("nd") @Implements("BufferedSink") public class BufferedSink implements Runnable { @ObfuscatedName("v") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 561615081 + intValue = 661494899 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("buffer") byte[] buffer; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 431862587 + intValue = 1189133375 ) @Export("position") int position; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2015629473 + intValue = 542048211 ) @Export("limit") int limit; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("exception") IOException exception; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { - this.position = 0; // L: 193 - this.limit = 0; // L: 194 - this.outputStream = var1; // L: 199 - this.capacity = var2 + 1; // L: 200 - this.buffer = new byte[this.capacity]; // L: 201 - this.thread = new Thread(this); // L: 202 - this.thread.setDaemon(true); // L: 203 - this.thread.start(); // L: 204 - } // L: 205 + this.position = 0; // L: 186 + this.limit = 0; // L: 187 + this.outputStream = var1; // L: 192 + this.capacity = var2 + 1; // L: 193 + this.buffer = new byte[this.capacity]; // L: 194 + this.thread = new Thread(this); // L: 195 + this.thread.setDaemon(true); // L: 196 + this.thread.start(); // L: 197 + } // L: 198 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-74" + descriptor = "(I)Z", + garbageValue = "-268247836" ) @Export("isClosed") boolean isClosed() { - if (this.closed) { // L: 208 + if (this.closed) { // L: 201 try { - this.outputStream.close(); // L: 210 + this.outputStream.close(); // L: 203 if (this.exception == null) { - this.exception = new IOException(""); // L: 211 + this.exception = new IOException(""); // L: 204 } - } catch (IOException var2) { // L: 213 - if (this.exception == null) { - this.exception = new IOException(var2); // L: 214 + } catch (IOException var2) { // L: 206 + if (this.exception == null) { // L: 207 + this.exception = new IOException(var2); } } - return true; // L: 216 + return true; // L: 209 } else { - return false; // L: 218 + return false; // L: 211 } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "102061231" + garbageValue = "1071414878" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 268 - synchronized(this) { // L: 269 - if (this.exception != null) { // L: 270 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261 + synchronized(this) { // L: 262 + if (this.exception != null) { // L: 263 throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { // L: 272 + if (this.position <= this.limit) { // L: 265 var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; // L: 273 + var5 = this.position - this.limit - 1; // L: 266 } - if (var5 < var3) { // L: 274 + if (var5 < var3) { // L: 267 throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { // L: 275 - System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276 + if (var3 + this.limit <= this.capacity) { // L: 268 + System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269 } else { - int var6 = this.capacity - this.limit; // L: 279 - System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 280 - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 281 + int var6 = this.capacity - this.limit; // L: 272 + System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273 + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274 } - this.limit = (var3 + this.limit) % this.capacity; // L: 283 - this.notifyAll(); // L: 284 + this.limit = (var3 + this.limit) % this.capacity; // L: 276 + this.notifyAll(); // L: 277 } } } } else { throw new IOException(); } - } // L: 286 + } // L: 279 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-7" + descriptor = "(I)V", + garbageValue = "1649898800" ) @Export("close") void close() { - synchronized(this) { // L: 289 - this.closed = true; // L: 290 - this.notifyAll(); // L: 291 - } // L: 292 + synchronized(this) { // L: 282 + this.closed = true; // L: 283 + this.notifyAll(); // L: 284 + } // L: 285 try { - this.thread.join(); // L: 294 - } catch (InterruptedException var3) { // L: 296 + this.thread.join(); // L: 287 + } catch (InterruptedException var3) { // L: 289 } - } // L: 297 + } // L: 290 public void run() { do { int var1; - synchronized(this) { // L: 224 + synchronized(this) { // L: 217 while (true) { - if (this.exception != null) { // L: 226 + if (this.exception != null) { // L: 219 return; } - if (this.position <= this.limit) { // L: 227 + if (this.position <= this.limit) { // L: 220 var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; // L: 228 + var1 = this.capacity - this.position + this.limit; // L: 221 } - if (var1 > 0) { // L: 229 + if (var1 > 0) { // L: 222 break; } try { - this.outputStream.flush(); // L: 231 - } catch (IOException var11) { // L: 233 - this.exception = var11; // L: 234 - return; // L: 235 + this.outputStream.flush(); // L: 224 + } catch (IOException var11) { // L: 226 + this.exception = var11; // L: 227 + return; // L: 228 } - if (this.isClosed()) { // L: 237 + if (this.isClosed()) { // L: 230 return; } try { - this.wait(); // L: 239 - } catch (InterruptedException var12) { // L: 241 + this.wait(); // L: 232 + } catch (InterruptedException var12) { // L: 234 } } } try { - if (var1 + this.position <= this.capacity) { // L: 245 - this.outputStream.write(this.buffer, this.position, var1); // L: 246 + if (var1 + this.position <= this.capacity) { // L: 238 + this.outputStream.write(this.buffer, this.position, var1); // L: 239 } else { - int var7 = this.capacity - this.position; // L: 249 - this.outputStream.write(this.buffer, this.position, var7); // L: 250 - this.outputStream.write(this.buffer, 0, var1 - var7); // L: 251 + int var7 = this.capacity - this.position; // L: 242 + this.outputStream.write(this.buffer, this.position, var7); // L: 243 + this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244 } - } catch (IOException var10) { // L: 254 + } catch (IOException var10) { // L: 247 IOException var2 = var10; - synchronized(this) { // L: 255 - this.exception = var2; // L: 256 - return; // L: 257 + synchronized(this) { // L: 248 + this.exception = var2; // L: 249 + return; // L: 250 } } - synchronized(this) { // L: 260 - this.position = (var1 + this.position) % this.capacity; // L: 261 - } // L: 262 - } while(!this.isClosed()); // L: 263 + synchronized(this) { // L: 253 + this.position = (var1 + this.position) % this.capacity; // L: 254 + } // L: 255 + } while(!this.isClosed()); // L: 256 } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "402033310" + ) + static int method6911(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821 + Client.logoutTimer = 250; // L: 3822 + return 1; // L: 3823 + } else if (var0 != 5631 && var0 != 5633) { // L: 3825 + if (var0 == 5632) { // L: 3829 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; // L: 3830 + return 1; // L: 3831 + } else { + return 2; // L: 3833 + } + } else { + class122.Interpreter_stringStackSize -= 2; // L: 3826 + return 1; // L: 3827 + } + } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 83b76b839e..de2780829c 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,78 +7,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") +@ObfuscatedName("nx") @Implements("BufferedSource") public class BufferedSource implements Runnable { @ObfuscatedName("v") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -719985799 + intValue = 1631784043 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("buffer") byte[] buffer; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1008859085 + intValue = 1349825787 ) @Export("position") int position; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1469334159 + intValue = 1219370145 ) @Export("limit") int limit; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { - this.position = 0; // L: 66 - this.limit = 0; // L: 67 - this.inputStream = var1; // L: 71 - this.capacity = var2 + 1; // L: 72 - this.buffer = new byte[this.capacity]; // L: 73 - this.thread = new Thread(this); // L: 74 - this.thread.setDaemon(true); // L: 75 - this.thread.start(); // L: 76 - } // L: 77 + this.position = 0; + this.limit = 0; + this.inputStream = var1; + this.capacity = var2 + 1; + this.buffer = new byte[this.capacity]; // L: 66 + this.thread = new Thread(this); + this.thread.setDaemon(true); + this.thread.start(); + } // L: 70 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "1" + garbageValue = "0" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { // L: 113 + if (var1 == 0) { return true; - } else if (var1 > 0 && var1 < this.capacity) { // L: 114 - synchronized(this) { // L: 115 + } else if (var1 > 0 && var1 < this.capacity) { // L: 107 + synchronized(this) { int var3; - if (this.position <= this.limit) { // L: 117 + if (this.position <= this.limit) { var3 = this.limit - this.position; } else { - var3 = this.capacity - this.position + this.limit; // L: 118 + var3 = this.capacity - this.position + this.limit; // L: 111 } - if (var3 < var1) { // L: 119 - if (this.exception != null) { // L: 120 + if (var3 < var1) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { - this.notifyAll(); // L: 121 - return false; // L: 122 + this.notifyAll(); + return false; // L: 115 } } else { - return true; // L: 124 + return true; } } } else { @@ -86,87 +86,87 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1799600134" + garbageValue = "412570779" ) @Export("available") int available() throws IOException { - synchronized(this) { // L: 129 + synchronized(this) { int var2; - if (this.position <= this.limit) { // L: 131 + if (this.position <= this.limit) { var2 = this.limit - this.position; } else { - var2 = this.capacity - this.position + this.limit; // L: 132 + var2 = this.capacity - this.position + this.limit; } - if (var2 <= 0 && this.exception != null) { // L: 133 - throw new IOException(this.exception.toString()); // L: 134 + if (var2 <= 0 && this.exception != null) { // L: 126 + throw new IOException(this.exception.toString()); } else { - this.notifyAll(); // L: 136 - return var2; // L: 137 + this.notifyAll(); + return var2; // L: 130 } } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1790819283" + garbageValue = "-1010089751" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { // L: 142 - if (this.limit == this.position) { // L: 143 - if (this.exception != null) { // L: 144 + synchronized(this) { + if (this.position == this.limit) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { - return -1; // L: 145 + return -1; // L: 138 } } else { - int var2 = this.buffer[this.position] & 255; // L: 147 - this.position = (this.position + 1) % this.capacity; // L: 148 - this.notifyAll(); // L: 149 - return var2; // L: 150 + int var2 = this.buffer[this.position] & 255; + this.position = (this.position + 1) % this.capacity; + this.notifyAll(); // L: 142 + return var2; } } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1757699402" + garbageValue = "-2005340605" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 155 - synchronized(this) { // L: 156 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + synchronized(this) { int var5; - if (this.position <= this.limit) { // L: 158 + if (this.position <= this.limit) { // L: 151 var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; // L: 159 + var5 = this.capacity - this.position + this.limit; } - if (var3 > var5) { // L: 160 + if (var3 > var5) { var3 = var5; } - if (var3 == 0 && this.exception != null) { // L: 161 + if (var3 == 0 && this.exception != null) { throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { // L: 162 - System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 163 + if (var3 + this.position <= this.capacity) { // L: 155 + System.arraycopy(this.buffer, this.position, var1, var2, var3); } else { - int var6 = this.capacity - this.position; // L: 166 - System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 167 - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 168 + int var6 = this.capacity - this.position; // L: 159 + System.arraycopy(this.buffer, this.position, var1, var2, var6); + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); } - this.position = (var3 + this.position) % this.capacity; // L: 170 - this.notifyAll(); // L: 171 - return var3; // L: 172 + this.position = (var3 + this.position) % this.capacity; // L: 163 + this.notifyAll(); // L: 164 + return var3; } } } else { @@ -174,73 +174,380 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1187438487" + garbageValue = "202162946" ) @Export("close") void close() { - synchronized(this) { // L: 177 + synchronized(this) { // L: 170 if (this.exception == null) { - this.exception = new IOException(""); // L: 178 + this.exception = new IOException(""); } - this.notifyAll(); // L: 179 + this.notifyAll(); } try { - this.thread.join(); // L: 182 - } catch (InterruptedException var3) { // L: 184 + this.thread.join(); // L: 175 + } catch (InterruptedException var3) { // L: 177 } - } // L: 185 + } // L: 178 public void run() { while (true) { int var1; - synchronized(this) { // L: 82 + synchronized(this) { // L: 75 while (true) { - if (this.exception != null) { // L: 84 + if (this.exception != null) { return; } - if (this.position == 0) { // L: 85 + if (this.position == 0) { var1 = this.capacity - this.limit - 1; - } else if (this.position <= this.limit) { // L: 86 + } else if (this.position <= this.limit) { // L: 79 var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; // L: 87 + var1 = this.position - this.limit - 1; } - if (var1 > 0) { // L: 88 + if (var1 > 0) { break; } try { - this.wait(); // L: 90 - } catch (InterruptedException var10) { // L: 92 + this.wait(); // L: 83 + } catch (InterruptedException var10) { } } } int var7; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 97 + var7 = this.inputStream.read(this.buffer, this.limit, var1); if (var7 == -1) { - throw new EOFException(); // L: 98 + throw new EOFException(); // L: 91 } - } catch (IOException var11) { // L: 100 + } catch (IOException var11) { IOException var3 = var11; - synchronized(this) { // L: 101 - this.exception = var3; // L: 102 - return; // L: 103 + synchronized(this) { + this.exception = var3; // L: 95 + return; } } - synchronized(this) { // L: 106 - this.limit = (var7 + this.limit) % this.capacity; // L: 107 - } // L: 108 + synchronized(this) { // L: 99 + this.limit = (var7 + this.limit) % this.capacity; + } } } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Llo;II)Ljd;", + garbageValue = "1218587295" + ) + public static PacketBufferNode method6908(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2918, Client.packetWriter.isaacCipher); // L: 17 + var4.packetBuffer.writeByte(0); // L: 18 + int var5 = var4.packetBuffer.offset; // L: 19 + var4.packetBuffer.writeByte(var0); // L: 20 + String var6 = var1.toLowerCase(); // L: 21 + byte var7 = 0; // L: 22 + if (var6.startsWith("yellow:")) { // L: 23 + var7 = 0; // L: 24 + var1 = var1.substring("yellow:".length()); // L: 25 + } else if (var6.startsWith("red:")) { // L: 27 + var7 = 1; // L: 28 + var1 = var1.substring("red:".length()); // L: 29 + } else if (var6.startsWith("green:")) { // L: 31 + var7 = 2; // L: 32 + var1 = var1.substring("green:".length()); // L: 33 + } else if (var6.startsWith("cyan:")) { // L: 35 + var7 = 3; // L: 36 + var1 = var1.substring("cyan:".length()); // L: 37 + } else if (var6.startsWith("purple:")) { // L: 39 + var7 = 4; // L: 40 + var1 = var1.substring("purple:".length()); // L: 41 + } else if (var6.startsWith("white:")) { // L: 43 + var7 = 5; // L: 44 + var1 = var1.substring("white:".length()); // L: 45 + } else if (var6.startsWith("flash1:")) { // L: 47 + var7 = 6; // L: 48 + var1 = var1.substring("flash1:".length()); // L: 49 + } else if (var6.startsWith("flash2:")) { // L: 51 + var7 = 7; // L: 52 + var1 = var1.substring("flash2:".length()); // L: 53 + } else if (var6.startsWith("flash3:")) { // L: 55 + var7 = 8; // L: 56 + var1 = var1.substring("flash3:".length()); // L: 57 + } else if (var6.startsWith("glow1:")) { // L: 59 + var7 = 9; // L: 60 + var1 = var1.substring("glow1:".length()); // L: 61 + } else if (var6.startsWith("glow2:")) { // L: 63 + var7 = 10; // L: 64 + var1 = var1.substring("glow2:".length()); // L: 65 + } else if (var6.startsWith("glow3:")) { // L: 67 + var7 = 11; // L: 68 + var1 = var1.substring("glow3:".length()); // L: 69 + } else if (var2 != Language.Language_EN) { // L: 71 + if (var6.startsWith("yellow:")) { // L: 72 + var7 = 0; // L: 73 + var1 = var1.substring("yellow:".length()); // L: 74 + } else if (var6.startsWith("red:")) { // L: 76 + var7 = 1; // L: 77 + var1 = var1.substring("red:".length()); // L: 78 + } else if (var6.startsWith("green:")) { // L: 80 + var7 = 2; // L: 81 + var1 = var1.substring("green:".length()); // L: 82 + } else if (var6.startsWith("cyan:")) { // L: 84 + var7 = 3; // L: 85 + var1 = var1.substring("cyan:".length()); // L: 86 + } else if (var6.startsWith("purple:")) { // L: 88 + var7 = 4; // L: 89 + var1 = var1.substring("purple:".length()); // L: 90 + } else if (var6.startsWith("white:")) { // L: 92 + var7 = 5; // L: 93 + var1 = var1.substring("white:".length()); // L: 94 + } else if (var6.startsWith("flash1:")) { // L: 96 + var7 = 6; // L: 97 + var1 = var1.substring("flash1:".length()); // L: 98 + } else if (var6.startsWith("flash2:")) { // L: 100 + var7 = 7; // L: 101 + var1 = var1.substring("flash2:".length()); // L: 102 + } else if (var6.startsWith("flash3:")) { // L: 104 + var7 = 8; // L: 105 + var1 = var1.substring("flash3:".length()); // L: 106 + } else if (var6.startsWith("glow1:")) { // L: 108 + var7 = 9; // L: 109 + var1 = var1.substring("glow1:".length()); // L: 110 + } else if (var6.startsWith("glow2:")) { // L: 112 + var7 = 10; // L: 113 + var1 = var1.substring("glow2:".length()); // L: 114 + } else if (var6.startsWith("glow3:")) { // L: 116 + var7 = 11; // L: 117 + var1 = var1.substring("glow3:".length()); // L: 118 + } + } + + var6 = var1.toLowerCase(); // L: 121 + byte var8 = 0; // L: 122 + if (var6.startsWith("wave:")) { // L: 123 + var8 = 1; // L: 124 + var1 = var1.substring("wave:".length()); // L: 125 + } else if (var6.startsWith("wave2:")) { // L: 127 + var8 = 2; // L: 128 + var1 = var1.substring("wave2:".length()); // L: 129 + } else if (var6.startsWith("shake:")) { // L: 131 + var8 = 3; // L: 132 + var1 = var1.substring("shake:".length()); // L: 133 + } else if (var6.startsWith("scroll:")) { // L: 135 + var8 = 4; // L: 136 + var1 = var1.substring("scroll:".length()); // L: 137 + } else if (var6.startsWith("slide:")) { // L: 139 + var8 = 5; // L: 140 + var1 = var1.substring("slide:".length()); // L: 141 + } else if (var2 != Language.Language_EN) { // L: 143 + if (var6.startsWith("wave:")) { // L: 144 + var8 = 1; // L: 145 + var1 = var1.substring("wave:".length()); // L: 146 + } else if (var6.startsWith("wave2:")) { // L: 148 + var8 = 2; // L: 149 + var1 = var1.substring("wave2:".length()); // L: 150 + } else if (var6.startsWith("shake:")) { // L: 152 + var8 = 3; // L: 153 + var1 = var1.substring("shake:".length()); // L: 154 + } else if (var6.startsWith("scroll:")) { // L: 156 + var8 = 4; // L: 157 + var1 = var1.substring("scroll:".length()); // L: 158 + } else if (var6.startsWith("slide:")) { // L: 160 + var8 = 5; // L: 161 + var1 = var1.substring("slide:".length()); // L: 162 + } + } + + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + class282.method5489(var4.packetBuffer, var1); // L: 167 + if (var0 == class296.field3492.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.method7774(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Lky;II)I", + garbageValue = "-965040804" + ) + static final int method6907(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10924 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10926 + int var3 = 0; // L: 10927 + int var4 = 0; // L: 10928 + byte var5 = 0; // L: 10929 + + while (true) { + int var6 = var2[var4++]; // L: 10931 + int var7 = 0; // L: 10932 + byte var8 = 0; // L: 10933 + if (var6 == 0) { // L: 10934 + return var3; + } + + if (var6 == 1) { // L: 10935 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10936 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10937 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10938 + var9 = var2[var4++] << 16; // L: 10939 + var9 += var2[var4++]; // L: 10940 + var10 = class127.getWidget(var9); // L: 10941 + var11 = var2[var4++]; // L: 10942 + if (var11 != -1 && (!class19.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10943 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10944 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10945 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 10949 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10950 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10951 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10952 + var7 = GrandExchangeEvents.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10953 + for (var9 = 0; var9 < 25; ++var9) { // L: 10954 + if (Skills.Skills_enabled[var9]) { // L: 10955 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 10958 + var9 = var2[var4++] << 16; // L: 10959 + var9 += var2[var4++]; // L: 10960 + var10 = class127.getWidget(var9); // L: 10961 + var11 = var2[var4++]; // L: 10962 + if (var11 != -1 && (!class19.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10963 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10964 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10965 + var7 = 999999999; // L: 10966 + break; // L: 10967 + } + } + } + } + + if (var6 == 11) { // L: 10972 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10973 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10974 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10975 + int var13 = var2[var4++]; // L: 10976 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10977 + } + + if (var6 == 14) { // L: 10979 + var9 = var2[var4++]; // L: 10980 + var7 = SecureRandomCallable.getVarbit(var9); // L: 10981 + } + + if (var6 == 15) { // L: 10983 + var8 = 1; + } + + if (var6 == 16) { // L: 10984 + var8 = 2; + } + + if (var6 == 17) { // L: 10985 + var8 = 3; + } + + if (var6 == 18) { // L: 10986 + var7 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; + } + + if (var6 == 19) { // L: 10987 + var7 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; + } + + if (var6 == 20) { // L: 10988 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10989 + if (var5 == 0) { // L: 10990 + var3 += var7; + } + + if (var5 == 1) { // L: 10991 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10992 + var3 /= var7; + } + + if (var5 == 3) { // L: 10993 + var3 *= var7; + } + + var5 = 0; // L: 10994 + } else { + var5 = var8; // L: 10996 + } + } + } catch (Exception var14) { // L: 10999 + return -1; // L: 11000 + } + } else { + return -2; + } + } + + @ObfuscatedName("mn") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1931509382" + ) + static boolean method6889() { + return class131.clientPreferences.method2249() >= Client.field617; // L: 12661 + } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 9439dcac07..525aa19ec9 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oq") +@ObfuscatedName("ol") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { @ObfuscatedName("v") diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index e1a4e2c3fa..22145e2fa6 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -6,148 +6,163 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("my") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2135689981 + intValue = 2043697785 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 742427787 + intValue = 1060831441 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 557846703 + intValue = -1175962597 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 257291791 + intValue = 1771611339 ) - static int field4169; - @ObfuscatedName("u") + static int field4163; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1915977333 + intValue = -321282309 ) - static int field4178; + static int field4159; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -178630953 + ) + static int field4160; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -971009911 + intValue = -308081175 ) - static int field4165; - @ObfuscatedName("k") + static int field4161; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 507582471 + intValue = 889627885 ) - static int field4172; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1120130659 - ) - static int field4177; - @ObfuscatedName("c") + static int field4152; + @ObfuscatedName("w") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("s") - static byte[][] field4166; - @ObfuscatedName("b") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; @ObfuscatedName("m") - public static ArrayList field4173; + static byte[][] field4162; + @ObfuscatedName("x") + static ArrayList field4167; + @ObfuscatedName("mh") + @ObfuscatedGetter( + intValue = 1658529089 + ) + @Export("menuHeight") + static int menuHeight; static { ByteArrayPool_smallCount = 0; // L: 13 ByteArrayPool_mediumCount = 0; // L: 14 ByteArrayPool_largeCount = 0; // L: 15 - field4169 = 0; // L: 16 - field4178 = 1000; // L: 17 - field4165 = 250; // L: 18 - field4172 = 100; // L: 19 - field4177 = 50; // L: 20 + field4163 = 0; // L: 16 + field4159 = 1000; // L: 17 + field4160 = 250; // L: 18 + field4161 = 100; // L: 19 + field4152 = 50; // L: 20 ByteArrayPool_small = new byte[1000][]; // L: 21 ByteArrayPool_medium = new byte[250][]; // L: 22 ByteArrayPool_large = new byte[100][]; // L: 23 - field4166 = new byte[50][]; // L: 24 - field4173 = new ArrayList(); // L: 28 - field4173.clear(); // L: 32 - field4173.add(100); // L: 33 - field4173.add(5000); // L: 34 - field4173.add(10000); // L: 35 - field4173.add(30000); // L: 36 + field4162 = new byte[50][]; // L: 24 + field4167 = new ArrayList(); // L: 28 + Login.method1960(); // L: 31 new HashMap(); - } // L: 42 + } // L: 36 - @ObfuscatedName("v") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IZB)[B", - garbageValue = "68" + garbageValue = "-82" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; - if (var0 != 100) { // L: 50 + if (var0 != 100) { // L: 70 if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 51 - ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 52 - return var4; // L: 53 + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 71 + ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 72 + return var4; // L: 73 } - if (var0 != 5000) { // L: 55 + if (var0 != 5000) { // L: 75 if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 56 - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 57 - return var4; // L: 58 + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 76 + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 77 + return var4; // L: 78 } - if (var0 != 10000) { // L: 60 + if (var0 != 10000) { // L: 80 if (var0 < 10000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 61 - ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 62 - return var4; // L: 63 + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 81 + ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 82 + return var4; // L: 83 } - if (var0 != 30000) { // L: 65 + if (var0 != 30000) { // L: 85 if (var0 < 30000) { } - } else if (field4169 > 0) { - var4 = field4166[--field4169]; // L: 66 - field4166[field4169] = null; // L: 67 - return var4; // L: 68 + } else if (field4163 > 0) { + var4 = field4162[--field4163]; // L: 86 + field4162[field4163] = null; // L: 87 + return var4; // L: 88 } - if (ScriptEvent.ByteArrayPool_arrays != null) { // L: 70 - for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 71 - if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 72 - if (var0 < ByteArrayPool_alternativeSizes[var2]) { + if (BoundaryObject.ByteArrayPool_arrays != null) { // L: 90 + for (int var2 = 0; var2 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91 + if (FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92 + if (var0 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var2]) { } - } else if (GameObject.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = ScriptEvent.ByteArrayPool_arrays[var2][--GameObject.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 73 - ScriptEvent.ByteArrayPool_arrays[var2][GameObject.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 74 - return var3; // L: 75 + } else if (class128.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = BoundaryObject.ByteArrayPool_arrays[var2][--class128.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93 + BoundaryObject.ByteArrayPool_arrays[var2][class128.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94 + return var3; // L: 95 } } } - return new byte[var0]; // L: 88 + return new byte[var0]; // L: 108 } + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1492106780" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Client.menuOptionsCount = 0; // L: 8607 + Client.isMenuOpen = false; // L: 8608 + Client.menuActions[0] = "Cancel"; // L: 8610 + Client.menuTargets[0] = ""; // L: 8611 + Client.menuOpcodes[0] = 1006; // L: 8612 + Client.menuShiftClick[0] = false; // L: 8613 + Client.menuOptionsCount = 1; // L: 8614 + } // L: 8615 } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 8e55cc7fc8..41fa7ccd10 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -2,19 +2,25 @@ 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("jw") +@ObfuscatedName("ja") @Implements("Calendar") public class Calendar { @ObfuscatedName("v") @Export("MONTH_NAMES_ENGLISH_GERMAN") - static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("o") + public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("c") @Export("DAYS_OF_THE_WEEK") - static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("h") + public static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("i") @Export("Calendar_calendar") - static java.util.Calendar Calendar_calendar; + public static java.util.Calendar Calendar_calendar; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lex;" + ) + static ClanSettings field3269; static { MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 8 @@ -22,4 +28,111 @@ public class Calendar { java.util.Calendar.getInstance(); // L: 22 Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23 } // L: 24 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IILgt;Lgv;I)Z", + garbageValue = "-692039603" + ) + public static final boolean method5507(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 111 + int var5 = var1; // L: 112 + byte var6 = 64; // L: 113 + byte var7 = 64; // L: 114 + int var8 = var0 - var6; // L: 115 + int var9 = var1 - var7; // L: 116 + class194.directions[var6][var7] = 99; // L: 117 + class194.distances[var6][var7] = 0; // L: 118 + byte var10 = 0; // L: 119 + int var11 = 0; // L: 120 + class194.bufferX[var10] = var0; // L: 121 + byte var10001 = var10; + int var18 = var10 + 1; + class194.bufferY[var10001] = var1; // L: 122 + int[][] var12 = var3.flags; // L: 123 + + while (var18 != var11) { // L: 124 + var4 = class194.bufferX[var11]; // L: 125 + var5 = class194.bufferY[var11]; // L: 126 + var11 = var11 + 1 & 4095; // L: 127 + int var16 = var4 - var8; // L: 128 + int var17 = var5 - var9; // L: 129 + int var13 = var4 - var3.xInset; // L: 130 + int var14 = var5 - var3.yInset; // L: 131 + if (var2.hasArrived(2, var4, var5, var3)) { // L: 132 + HealthBarUpdate.field1189 = var4; // L: 133 + StructComposition.field1988 = var5; // L: 134 + return true; // L: 135 + } + + int var15 = class194.distances[var16][var17] + 1; // L: 137 + if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 138 139 140 141 + class194.bufferX[var18] = var4 - 1; // L: 142 + class194.bufferY[var18] = var5; // L: 143 + var18 = var18 + 1 & 4095; // L: 144 + class194.directions[var16 - 1][var17] = 2; // L: 145 + class194.distances[var16 - 1][var17] = var15; // L: 146 + } + + if (var16 < 126 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 148 149 150 151 + class194.bufferX[var18] = var4 + 1; // L: 152 + class194.bufferY[var18] = var5; // L: 153 + var18 = var18 + 1 & 4095; // L: 154 + class194.directions[var16 + 1][var17] = 8; // L: 155 + class194.distances[var16 + 1][var17] = var15; // L: 156 + } + + if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 158 159 160 161 + class194.bufferX[var18] = var4; // L: 162 + class194.bufferY[var18] = var5 - 1; // L: 163 + var18 = var18 + 1 & 4095; // L: 164 + class194.directions[var16][var17 - 1] = 1; // L: 165 + class194.distances[var16][var17 - 1] = var15; // L: 166 + } + + if (var17 < 126 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 168 169 170 171 + class194.bufferX[var18] = var4; // L: 172 + class194.bufferY[var18] = var5 + 1; // L: 173 + var18 = var18 + 1 & 4095; // L: 174 + class194.directions[var16][var17 + 1] = 4; // L: 175 + class194.distances[var16][var17 + 1] = var15; // L: 176 + } + + if (var16 > 0 && var17 > 0 && class194.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 178 179 180 181 182 + class194.bufferX[var18] = var4 - 1; // L: 183 + class194.bufferY[var18] = var5 - 1; // L: 184 + var18 = var18 + 1 & 4095; // L: 185 + class194.directions[var16 - 1][var17 - 1] = 3; // L: 186 + class194.distances[var16 - 1][var17 - 1] = var15; // L: 187 + } + + if (var16 < 126 && var17 > 0 && class194.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 189 190 191 192 193 + class194.bufferX[var18] = var4 + 1; // L: 194 + class194.bufferY[var18] = var5 - 1; // L: 195 + var18 = var18 + 1 & 4095; // L: 196 + class194.directions[var16 + 1][var17 - 1] = 9; // L: 197 + class194.distances[var16 + 1][var17 - 1] = var15; // L: 198 + } + + if (var16 > 0 && var17 < 126 && class194.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 200 201 202 203 204 + class194.bufferX[var18] = var4 - 1; // L: 205 + class194.bufferY[var18] = var5 + 1; // L: 206 + var18 = var18 + 1 & 4095; // L: 207 + class194.directions[var16 - 1][var17 + 1] = 6; // L: 208 + class194.distances[var16 - 1][var17 + 1] = var15; // L: 209 + } + + if (var16 < 126 && var17 < 126 && class194.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 211 212 213 214 215 + class194.bufferX[var18] = var4 + 1; // L: 216 + class194.bufferY[var18] = var5 + 1; // L: 217 + var18 = var18 + 1 & 4095; // L: 218 + class194.directions[var16 + 1][var17 + 1] = 12; // L: 219 + class194.distances[var16 + 1][var17 + 1] = var15; // L: 220 + } + } + + HealthBarUpdate.field1189 = var4; // L: 223 + StructComposition.field1988 = var5; // L: 224 + return false; // L: 225 + } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index c86bde696a..b4f6e840f1 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -5,15 +5,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("h") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "Lqi;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; @ObfuscatedName("v") @Export("component") Component component; Canvas(Component var1) { - this.component = var1; + this.component = var1; // L: 11 } // L: 12 public final void update(Graphics var1) { @@ -22,93 +28,23 @@ public final class Canvas extends java.awt.Canvas { public final void paint(Graphics var1) { this.component.paint(var1); // L: 19 - } + } // L: 20 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-64" + descriptor = "(Lln;I)V", + garbageValue = "-1197200273" ) - public static void method391() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 20 - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } + public static void method357(AbstractArchive var0) { + EnumComposition.EnumDefinition_archive = var0; // L: 25 + } // L: 26 - if (var0 == null) { - return; // L: 23 - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 24 - } - } - - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lqv;", - garbageValue = "929937877" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "209833748" ) - static PrivateChatMode[] method389() { - return new PrivateChatMode[]{PrivateChatMode.field4738, PrivateChatMode.field4739, PrivateChatMode.field4740}; // L: 11 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;B)V", - garbageValue = "8" - ) - public static void method390(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; // L: 21 - } // L: 22 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "([BIILgs;[Lgf;I)V", - garbageValue = "-1948278943" - ) - static final void method388(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); // L: 289 - int var6 = -1; // L: 290 - - while (true) { - int var7 = var5.method7775(); // L: 292 - if (var7 == 0) { // L: 293 - return; // L: 317 - } - - var6 += var7; // L: 294 - int var8 = 0; // L: 295 - - while (true) { - int var9 = var5.readUShortSmart(); // L: 297 - if (var9 == 0) { // L: 298 - break; - } - - var8 += var9 - 1; // L: 299 - int var10 = var8 & 63; // L: 300 - int var11 = var8 >> 6 & 63; // L: 301 - int var12 = var8 >> 12; // L: 302 - int var13 = var5.readUnsignedByte(); // L: 303 - int var14 = var13 >> 2; // L: 304 - int var15 = var13 & 3; // L: 305 - int var16 = var11 + var1; // L: 306 - int var17 = var10 + var2; // L: 307 - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 308 - int var18 = var12; // L: 309 - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 310 - var18 = var12 - 1; - } - - CollisionMap var19 = null; // L: 311 - if (var18 >= 0) { // L: 312 - var19 = var4[var18]; - } - - WorldMapIcon_1.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); // L: 313 - } - } - } - } + static final void method359(String var0) { + class149.method3138("Please remove " + var0 + " from your ignore list first"); // L: 106 + } // L: 107 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 28326fa393..5108c6980b 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,143 +4,110 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("bp") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("v") - @Export("javaVendor") - public static String javaVendor; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1341087359 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lba;" + descriptor = "[Lbe;" ) @Export("messages") Message[] messages; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -631005359 + intValue = 417639835 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 90 - } + this.messages = new Message[100]; // L: 95 + } // L: 98 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lba;", - garbageValue = "9760210" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbe;", + garbageValue = "1370316995" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; + Message var5 = this.messages[99]; // L: 101 - for (int var6 = this.count; var6 > 0; --var6) { // L: 97 - if (var6 != 100) { // L: 98 - this.messages[var6] = this.messages[var6 - 1]; // L: 99 + for (int var6 = this.count; var6 > 0; --var6) { // L: 102 + if (var6 != 100) { // L: 103 + this.messages[var6] = this.messages[var6 - 1]; // L: 104 } } - if (var5 == null) { + if (var5 == null) { // L: 106 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); - var5.removeDual(); - var5.set(var1, var2, var4, var3); // L: 105 + var5.remove(); // L: 108 + var5.removeDual(); // L: 109 + var5.set(var1, var2, var4, var3); // L: 110 } - this.messages[0] = var5; // L: 107 - if (this.count < 100) { + this.messages[0] = var5; // L: 112 + if (this.count < 100) { // L: 113 ++this.count; } - return var5; // L: 109 + return var5; // L: 114 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lba;", - garbageValue = "-1854040749" + descriptor = "(IB)Lbe;", + garbageValue = "-53" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 113 114 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 118 119 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "1536" + descriptor = "(B)I", + garbageValue = "5" ) @Export("size") int size() { - return this.count; // L: 118 + return this.count; // L: 123 } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Lls;II)Lls;", - garbageValue = "2081962789" + descriptor = "(IIIII)V", + garbageValue = "1242212689" ) - @Export("findEnumerated") - public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { - MouseWheel[] var2 = var0; // L: 17 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - MouseWheel var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 - } + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 + if (var4 == null) { // L: 40 + var4 = new ItemContainer(); // L: 41 + ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 } - return null; // L: 25 - } + if (var4.ids.length <= var1) { // L: 44 + int[] var5 = new int[var1 + 1]; // L: 45 + int[] var6 = new int[var1 + 1]; // L: 46 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "28" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "([BIIII[Lgf;B)V", - garbageValue = "16" - ) - static final void method1991(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { // L: 93 - for (var7 = 0; var7 < 64; ++var7) { // L: 94 - for (var8 = 0; var8 < 64; ++var8) { // L: 95 - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; - } - } + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 + var5[var7] = var4.ids[var7]; // L: 48 + var6[var7] = var4.quantities[var7]; // L: 49 } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 + var5[var7] = -1; // L: 52 + var6[var7] = 0; // L: 53 + } + + var4.ids = var5; // L: 55 + var4.quantities = var6; // L: 56 } - Buffer var10 = new Buffer(var0); // L: 100 - - for (var7 = 0; var7 < 4; ++var7) { // L: 101 - for (var8 = 0; var8 < 64; ++var8) { // L: 102 - for (int var9 = 0; var9 < 64; ++var9) { // L: 103 - class127.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 - } - } - } - - } // L: 108 + var4.ids[var1] = var2; // L: 58 + var4.quantities[var1] = var3; // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index a3063092fd..3cc3c28718 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -1,6 +1,3 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import java.util.ArrayList; import java.util.BitSet; import java.util.List; @@ -9,86 +6,72 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ey") +@ObfuscatedName("ea") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = 227189983 - ) - static int field1660; - @ObfuscatedName("um") - @ObfuscatedSignature( - descriptor = "Lon;" - ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("c") - static boolean field1673; @ObfuscatedName("v") - boolean field1665; - @ObfuscatedName("o") - boolean field1662; - @ObfuscatedName("h") + boolean field1653; + @ObfuscatedName("c") + boolean field1658; + @ObfuscatedName("i") @Export("members") public List members; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -3432068679445221973L + longValue = -6213414464527549047L ) - long field1664; + long field1656; @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("d") - public byte field1666; - @ObfuscatedName("f") - public byte field1669; + @ObfuscatedName("s") + public byte field1654; + @ObfuscatedName("l") + public byte field1659; static { new BitSet(65536); // L: 22 } // L: 23 @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) public ClanChannel(Buffer var1) { - this.field1662 = true; // L: 13 + this.field1658 = true; // L: 13 this.name = null; // L: 17 - this.method3058(var1); // L: 26 - } // L: 27 + this.method3117(var1); + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-400020002" + descriptor = "(B)[I", + garbageValue = "-75" ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { // L: 30 + if (this.sortedMembers == null) { String[] var1 = new String[this.members.size()]; // L: 31 - this.sortedMembers = new int[this.members.size()]; // L: 32 + this.sortedMembers = new int[this.members.size()]; - for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35 - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8362(); // L: 34 + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 35 + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8243(); } int[] var3 = this.sortedMembers; // L: 37 - WorldMapData_0.method4518(var1, var3, 0, var1.length - 1); // L: 39 + class433.method7605(var1, var3, 0, var1.length - 1); // L: 39 } return this.sortedMembers; // L: 42 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leu;I)V", - garbageValue = "1497910385" + descriptor = "(Lec;B)V", + garbageValue = "6" ) @Export("addMember") void addMember(ClanChannelMember var1) { @@ -96,10 +79,10 @@ public class ClanChannel extends Node { this.sortedMembers = null; // L: 47 } // L: 48 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-92" + descriptor = "(II)V", + garbageValue = "-911825702" ) @Export("removeMember") void removeMember(int var1) { @@ -107,22 +90,22 @@ public class ClanChannel extends Node { this.sortedMembers = null; // L: 52 } // L: 53 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-15392" + descriptor = "(I)I", + garbageValue = "-251884744" ) - public int method3056() { + public int method3119() { return this.members.size(); // L: 56 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-327623603" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "75" ) - public int method3057(String var1) { - if (!this.field1662) { // L: 60 + public int method3116(String var1) { + if (!this.field1658) { // L: 60 throw new RuntimeException("Displaynames not available"); } else { for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61 @@ -137,17 +120,17 @@ public class ClanChannel extends Node { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1254848749" + descriptor = "(Lpi;S)V", + garbageValue = "-10005" ) - void method3058(Buffer var1) { + void method3117(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 68 if ((var2 & 1) != 0) { // L: 69 - this.field1665 = true; + this.field1653 = true; } if ((var2 & 2) != 0) { // L: 70 - this.field1662 = true; + this.field1658 = true; } int var3 = 2; // L: 71 @@ -156,22 +139,22 @@ public class ClanChannel extends Node { } super.key = var1.readLong(); // L: 73 - this.field1664 = var1.readLong(); // L: 74 + this.field1656 = var1.readLong(); // L: 74 this.name = var1.readStringCp1252NullTerminated(); // L: 75 var1.readBoolean(); // L: 76 - this.field1669 = var1.readByte(); // L: 77 - this.field1666 = var1.readByte(); // L: 78 + this.field1659 = var1.readByte(); // L: 77 + this.field1654 = var1.readByte(); // L: 78 int var4 = var1.readUnsignedShort(); // L: 79 if (var4 > 0) { // L: 80 this.members = new ArrayList(var4); // L: 81 for (int var5 = 0; var5 < var4; ++var5) { // L: 82 ClanChannelMember var6 = new ClanChannelMember(); // L: 83 - if (this.field1665) { // L: 84 + if (this.field1653) { // L: 84 var1.readLong(); // L: 85 } - if (this.field1662) { // L: 87 + if (this.field1658) { // L: 87 var6.username = new Username(var1.readStringCp1252NullTerminated()); } @@ -187,93 +170,341 @@ public class ClanChannel extends Node { } // L: 97 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2058786387" + descriptor = "(IB)Lbd;", + garbageValue = "-23" ) - public static void method3068() { - try { - File var0 = new File(class230.userHomeDirectory, "random.dat"); // L: 193 - int var2; - if (var0.exists()) { // L: 194 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 195 + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; + } else { + byte[] var2 = class152.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 } else { - label37: - for (int var1 = 0; var1 < WorldMapSection1.cacheSubPaths.length; ++var1) { // L: 198 - for (var2 = 0; var2 < PendingSpawn.cacheParentPaths.length; ++var2) { // L: 199 - File var3 = new File(PendingSpawn.cacheParentPaths[var2] + WorldMapSection1.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 200 - if (var3.exists()) { // L: 201 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 202 - break label37; // L: 203 - } + var1 = PcmPlayer.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-1683816578" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7800 + if (Client.isLowDetail && var0 != class18.Client_plane) { // L: 7801 + return; + } + + long var7 = 0L; // L: 7802 + boolean var9 = true; // L: 7803 + boolean var10 = false; // L: 7804 + boolean var11 = false; // L: 7805 + if (var1 == 0) { // L: 7806 + var7 = ArchiveLoader.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7807 + var7 = ArchiveLoader.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7808 + var7 = ArchiveLoader.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7809 + var7 = ArchiveLoader.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { // L: 7810 + var12 = ArchiveLoader.scene.getObjectFlags(var0, var2, var3, var7); // L: 7811 + int var38 = FileSystem.Entity_unpackID(var7); // L: 7812 + int var39 = var12 & 31; // L: 7813 + int var40 = var12 >> 6 & 3; // L: 7814 + ObjectComposition var13; + if (var1 == 0) { // L: 7815 + ArchiveLoader.scene.removeBoundaryObject(var0, var2, var3); // L: 7816 + var13 = class146.getObjectDefinition(var38); // L: 7817 + if (var13.interactType != 0) { // L: 7818 + Client.collisionMaps[var0].method3853(var2, var3, var39, var40, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7820 + ArchiveLoader.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7821 + ArchiveLoader.scene.removeGameObject(var0, var2, var3); // L: 7822 + var13 = class146.getObjectDefinition(var38); // L: 7823 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7824 + return; + } + + if (var13.interactType != 0) { // L: 7825 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7827 + ArchiveLoader.scene.removeFloorDecoration(var0, var2, var3); // L: 7828 + var13 = class146.getObjectDefinition(var38); // L: 7829 + if (var13.interactType == 1) { // L: 7830 + Client.collisionMaps[var0].method3847(var2, var3); } } } - if (JagexCache.JagexCache_randomDat == null) { // L: 208 - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 209 - var2 = var4.read(); // L: 210 - var4.seek(0L); // L: 211 - var4.write(var2); // L: 212 - var4.seek(0L); // L: 213 - var4.close(); // L: 214 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 215 - } - } catch (IOException var5) { // L: 218 - } - - } // L: 219 - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1846400390" - ) - static int method3078(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3744 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ReflectionCheck.getWindowedMode(); // L: 3745 - return 1; // L: 3746 - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3748 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3749 - if (var3 == 1 || var3 == 2) { // L: 3750 - UserComparator6.setWindowedMode(var3); + if (var4 >= 0) { // L: 7833 + var12 = var0; // L: 7834 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7835 + var12 = var0 + 1; } - return 1; // L: 3751 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3753 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2317(); // L: 3754 - return 1; // L: 3755 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3757 - if (var0 == 5310) { // L: 3764 - --class295.Interpreter_intStackSize; // L: 3765 - return 1; // L: 3766 - } else if (var0 == 5311) { // L: 3768 - class295.Interpreter_intStackSize -= 2; // L: 3769 - return 1; // L: 3770 - } else if (var0 == 5312) { // L: 3772 - --class295.Interpreter_intStackSize; // L: 3773 - return 1; // L: 3774 - } else if (var0 == 5350) { // L: 3776 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3777 - --class295.Interpreter_intStackSize; // L: 3778 - return 1; // L: 3779 - } else if (var0 == 5351) { // L: 3781 - --ChatChannel.Interpreter_stringStackSize; // L: 3782 - return 1; // L: 3783 + Scene var41 = ArchiveLoader.scene; // L: 7836 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 7837 + ObjectComposition var15 = class146.getObjectDefinition(var4); // L: 7839 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 7842 + var16 = var15.sizeX; // L: 7847 + var17 = var15.sizeY; // L: 7848 } else { - return 2; // L: 3785 - } - } else { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3758 - if (var3 == 1 || var3 == 2) { // L: 3759 - Interpreter.clientPreferences.method2276(var3); // L: 3760 + var16 = var15.sizeY; // L: 7843 + var17 = var15.sizeX; // L: 7844 } - return 1; // L: 3762 + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 7854 + var18 = (var16 >> 1) + var2; // L: 7855 + var19 = var2 + (var16 + 1 >> 1); // L: 7856 + } else { + var18 = var2; // L: 7859 + var19 = var2 + 1; // L: 7860 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 7862 + var20 = var3 + (var17 >> 1); // L: 7863 + var21 = var3 + (var17 + 1 >> 1); // L: 7864 + } else { + var20 = var3; // L: 7867 + var21 = var3 + 1; // L: 7868 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7870 + int var23 = var22[var19][var20] + var22[var18][var20] + var22[var18][var21] + var22[var19][var21] >> 2; // L: 7871 + int var24 = (var2 << 7) + (var16 << 6); // L: 7872 + int var25 = (var3 << 7) + (var17 << 6); // L: 7873 + long var26 = GameObject.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7874 + int var28 = (var5 << 6) + var6; // L: 7875 + if (var15.int3 == 1) { // L: 7876 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 7877 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7879 + var36 = var15.getModel(22, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7880 + } + + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7881 + if (var15.interactType == 1) { // L: 7882 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 7885 + if (var6 >= 12) { // L: 7893 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7895 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7896 + } + + var41.method4882(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7897 + if (var15.interactType != 0) { // L: 7898 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 7901 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7903 + var36 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7904 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field990[var5], 0, var26, var28); // L: 7905 + if (var15.interactType != 0) { // L: 7906 + var14.method3872(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7909 + if (var15.animationId == -1 && var15.transforms == null) { + var36 = var15.getModel(1, var5, var22, var24, var23, var25); // L: 7911 + } else { + var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7912 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7913 + if (var15.interactType != 0) { // L: 7914 + var14.method3872(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var29; + if (var6 == 2) { // L: 7917 + var29 = var5 + 1 & 3; // L: 7918 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7921 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7922 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7923 + } else { + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7926 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7927 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field990[var5], Tiles.field990[var29], var26, var28); // L: 7929 + if (var15.interactType != 0) { // L: 7930 + var14.method3872(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7933 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7935 + var36 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7936 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7937 + if (var15.interactType != 0) { // L: 7938 + var14.method3872(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7941 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7943 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7944 + } + + var41.method4882(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7945 + if (var15.interactType != 0) { // L: 7946 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7949 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7951 + var36 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7952 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field990[var5], 0, 0, 0, var26, var28); // L: 7953 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7956 + var29 = 16; // L: 7957 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7958 + if (0L != var30) { // L: 7959 + var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7961 + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7962 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field990[var5], 0, var29 * Tiles.field992[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7963 + } else if (var6 == 6) { // L: 7966 + var29 = 8; // L: 7967 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7968 + if (0L != var30) { // L: 7969 + var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7971 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7972 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field997[var5], var29 * Tiles.field995[var5], var26, var28); // L: 7973 + } else if (var6 == 7) { // L: 7976 + int var35 = var5 + 2 & 3; // L: 7978 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7979 + var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7980 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7981 + } else if (var6 == 8) { // L: 7984 + var29 = 8; // L: 7985 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7986 + if (var30 != 0L) { // L: 7987 + var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7990 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7991 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7992 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7993 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7996 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7997 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field997[var5], var29 * Tiles.field995[var5], var26, var28); // L: 7999 + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 7887 + var36 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7888 + } + + if (var36 != null) { // L: 7889 + var41.method4882(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 7890 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } } } - } + + } // L: 8004 + + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "61" + ) + static final void method3137(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { // L: 12436 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3119()) { // L: 12437 + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12438 + PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 12439 + var4.packetBuffer.writeByte(4 + class425.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12440 + var4.packetBuffer.writeByte(var0); // L: 12441 + var4.packetBuffer.writeShort(var1); // L: 12442 + var4.packetBuffer.writeBoolean(var2); // L: 12443 + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12444 + Client.packetWriter.addNode(var4); // L: 12445 + } + } + } // L: 12446 } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index b2b3aa5ffd..1fd7026f01 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("ec") @Implements("ClanChannelMember") public class ClanChannelMember { @ObfuscatedName("v") @Export("rank") public byte rank; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1591925387 + intValue = -113610011 ) @Export("world") public int world; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqb;" ) @Export("username") public Username username; @@ -26,64 +26,53 @@ public class ClanChannelMember { ClanChannelMember() { } // L: 10 - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "1411070013" + descriptor = "(IB)Lfv;", + garbageValue = "111" ) - static boolean method2850(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 39 - boolean var3 = false; // L: 40 - boolean var4 = false; // L: 41 - int var5 = 0; // L: 42 - int var6 = var0.length(); // L: 43 - - for (int var7 = 0; var7 < var6; ++var7) { // L: 44 - char var8 = var0.charAt(var7); // L: 45 - if (var7 == 0) { // L: 46 - if (var8 == '-') { // L: 47 - var3 = true; // L: 48 - continue; - } - - if (var8 == '+') { // L: 51 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 53 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 54 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 55 - return false; // L: 56 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 57 - return false; - } - - if (var3) { // L: 58 - var10 = -var10; - } - - int var9 = var5 * var1 + var10; // L: 59 - if (var9 / var1 != var5) { // L: 60 - return false; - } - - var5 = var9; // L: 61 - var4 = true; // L: 62 + public static HealthBarDefinition method2870(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 37 + if (var1 != null) { // L: 38 + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 39 + var1 = new HealthBarDefinition(); // L: 40 + if (var2 != null) { // L: 41 + var1.decode(new Buffer(var2)); } - return var4; // L: 64 - } else { - throw new IllegalArgumentException("" + var1); + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 42 + return var1; // L: 43 } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-704026744" + ) + public static int method2869(int var0) { + if (var0 > 0) { // L: 182 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 183 184 + } + } + + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + static final void method2868() { + if (Client.logoutTimer > 0) { // L: 2967 + ItemLayer.logOut(); // L: 2968 + } else { + Client.timer.method6562(); // L: 2971 + Decimator.updateGameState(40); // L: 2972 + ModeWhere.field4073 = Client.packetWriter.getSocket(); // L: 2973 + Client.packetWriter.removeSocket(); // L: 2974 + } + } // L: 2969 2975 } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 74e2795d1b..c5e2fc7045 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") +@ObfuscatedName("ne") @Implements("ClanMate") public class ClanMate extends Buddy { @ObfuscatedName("v") @@ -12,7 +12,7 @@ public class ClanMate extends Buddy { ) @Export("friend") TriBool friend; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lni;" ) @@ -26,18 +26,18 @@ public class ClanMate extends Buddy { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "87" + descriptor = "(I)V", + garbageValue = "131518086" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1690991920" + garbageValue = "-1955315992" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-15358" + descriptor = "(I)V", + garbageValue = "1874980316" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = class155.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = Decimator.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 - @ObfuscatedName("r") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-990460013" + descriptor = "(S)V", + garbageValue = "-23167" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "3800" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +82,527 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "22" + descriptor = "(I)V", + garbageValue = "374210417" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = class155.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = Decimator.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(Ljp;I)V", + garbageValue = "1119895393" + ) + static final void method6700(class263 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7425 + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (class263.field3012 == var0) { // L: 7426 + var2 = var1.method7742(); // L: 7427 + var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7428 + var4 = (var2 & 7) + class29.field181; // L: 7429 + var5 = var1.readUnsignedByte(); // L: 7430 + var6 = var5 >> 2; // L: 7431 + var7 = var5 & 3; // L: 7432 + var8 = Client.field748[var6]; // L: 7433 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7434 + GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7435 + } + + } else { + int var9; + int var10; + if (class263.field3006 == var0) { // L: 7439 + var2 = var1.method7742(); // L: 7440 + var3 = var1.method7875(); // L: 7441 + var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7442 + var5 = (var3 & 7) + class29.field181; // L: 7443 + var6 = var1.method7742(); // L: 7444 + var7 = var6 >> 4 & 15; // L: 7445 + var8 = var6 & 7; // L: 7446 + var9 = var1.method7713(); // L: 7447 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7448 + var10 = var7 + 1; // L: 7449 + if (GrandExchangeEvents.localPlayer.pathX[0] >= var4 - var10 && GrandExchangeEvents.localPlayer.pathX[0] <= var10 + var4 && GrandExchangeEvents.localPlayer.pathY[0] >= var5 - var10 && GrandExchangeEvents.localPlayer.pathY[0] <= var10 + var5 && class131.clientPreferences.method2270() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7450 7451 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7452 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7453 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7454 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7455 + Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7456 + ++Client.soundEffectCount; // L: 7457 + } + } + } + + TileItem var31; + if (class263.field3009 == var0) { // L: 7462 + var2 = var1.method7875(); // L: 7463 + var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7464 + var4 = (var2 & 7) + class29.field181; // L: 7465 + var5 = var1.method7714(); // L: 7466 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7467 + NodeDeque var36 = Client.groundItems[class18.Client_plane][var3][var4]; // L: 7468 + if (var36 != null) { // L: 7469 + for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { // L: 7470 7471 7476 + if ((var5 & 32767) == var31.id) { // L: 7472 + var31.remove(); // L: 7473 + break; + } + } + + if (var36.last() == null) { // L: 7478 + Client.groundItems[class18.Client_plane][var3][var4] = null; + } + + UserComparator3.updateItemPile(var3, var4); // L: 7479 + } + } + + } else { + int var11; + int var12; + int var13; + int var14; + if (class263.field3004 == var0) { // L: 7484 + byte var37 = var1.readByte(); // L: 7485 + var3 = var1.readUnsignedShort(); // L: 7486 + byte var38 = var1.method7707(); // L: 7487 + byte var39 = var1.readByte(); // L: 7488 + var6 = var1.method7715(); // L: 7489 + byte var40 = var1.method7707(); // L: 7490 + var8 = var1.method7714(); // L: 7491 + var9 = var1.method7773(); // L: 7492 + var10 = var9 >> 2; // L: 7493 + var11 = var9 & 3; // L: 7494 + var12 = Client.field748[var10]; // L: 7495 + var13 = var1.method7773(); // L: 7496 + var14 = (var13 >> 4 & 7) + PlayerComposition.field3307; // L: 7497 + int var15 = (var13 & 7) + class29.field181; // L: 7498 + int var16 = var1.method7714(); // L: 7499 + Player var17; + if (var3 == Client.localPlayerIndex) { // L: 7501 + var17 = GrandExchangeEvents.localPlayer; + } else { + var17 = Client.players[var3]; // L: 7502 + } + + if (var17 != null) { // L: 7503 + ObjectComposition var18 = class146.getObjectDefinition(var8); // L: 7504 + int var19; + int var20; + if (var11 != 1 && var11 != 3) { // L: 7507 + var19 = var18.sizeX; // L: 7512 + var20 = var18.sizeY; // L: 7513 + } else { + var19 = var18.sizeY; // L: 7508 + var20 = var18.sizeX; // L: 7509 + } + + int var21 = var14 + (var19 >> 1); // L: 7515 + int var22 = var14 + (var19 + 1 >> 1); // L: 7516 + int var23 = var15 + (var20 >> 1); // L: 7517 + int var24 = var15 + (var20 + 1 >> 1); // L: 7518 + int[][] var25 = Tiles.Tiles_heights[class18.Client_plane]; // L: 7519 + int var26 = var25[var21][var24] + var25[var22][var23] + var25[var21][var23] + var25[var22][var24] >> 2; // L: 7520 + int var27 = (var14 << 7) + (var19 << 6); // L: 7521 + int var28 = (var15 << 7) + (var20 << 6); // L: 7522 + Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7523 + if (var29 != null) { // L: 7524 + GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var14, var15, var12, -1, 0, 0, var16 + 1, var6 + 1); // L: 7525 + var17.animationCycleStart = var16 + Client.cycle; // L: 7526 + var17.animationCycleEnd = var6 + Client.cycle; // L: 7527 + var17.model0 = var29; // L: 7528 + var17.field1080 = var19 * 64 + var14 * 128; // L: 7529 + var17.field1082 = var20 * 64 + var15 * 128; // L: 7530 + var17.tileHeight2 = var26; // L: 7531 + byte var30; + if (var38 > var40) { // L: 7532 + var30 = var38; // L: 7533 + var38 = var40; // L: 7534 + var40 = var30; // L: 7535 + } + + if (var39 > var37) { // L: 7537 + var30 = var39; // L: 7538 + var39 = var37; // L: 7539 + var37 = var30; // L: 7540 + } + + var17.minX = var38 + var14; // L: 7542 + var17.maxX = var14 + var40; // L: 7543 + var17.minY = var15 + var39; // L: 7544 + var17.maxY = var37 + var15; // L: 7545 + } + } + } + + if (class263.field3007 == var0) { // L: 7549 + var2 = var1.readUnsignedShort(); // L: 7550 + var3 = var1.readUnsignedByte(); // L: 7551 + var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7552 + var5 = (var3 & 7) + class29.field181; // L: 7553 + var6 = var1.method7713(); // L: 7554 + var7 = var1.method7713(); // L: 7555 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7556 + NodeDeque var46 = Client.groundItems[class18.Client_plane][var4][var5]; // L: 7557 + if (var46 != null) { // L: 7558 + for (TileItem var35 = (TileItem)var46.last(); var35 != null; var35 = (TileItem)var46.previous()) { // L: 7559 7560 7565 + if ((var2 & 32767) == var35.id && var6 == var35.quantity) { // L: 7561 + var35.quantity = var7; // L: 7562 + break; + } + } + + UserComparator3.updateItemPile(var4, var5); // L: 7567 + } + } + + } else if (class263.field3015 == var0) { // L: 7572 + var2 = var1.method7773(); // L: 7573 + var3 = var1.readUnsignedShort(); // L: 7574 + var4 = var1.method7715(); // L: 7575 + var5 = var1.method7875(); // L: 7576 + var6 = (var5 >> 4 & 7) + PlayerComposition.field3307; // L: 7577 + var7 = (var5 & 7) + class29.field181; // L: 7578 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7579 + var6 = var6 * 128 + 64; // L: 7580 + var7 = var7 * 128 + 64; // L: 7581 + GraphicsObject var34 = new GraphicsObject(var3, class18.Client_plane, var6, var7, WorldMapLabel.getTileHeight(var6, var7, class18.Client_plane) - var2, var4, Client.cycle); // L: 7582 + Client.graphicsObjects.addFirst(var34); // L: 7583 + } + + } else if (class263.field3013 == var0) { // L: 7587 + var2 = var1.method7742(); // L: 7588 + var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7589 + var4 = (var2 & 7) + class29.field181; // L: 7590 + var5 = var1.method7742(); // L: 7591 + var6 = var5 >> 2; // L: 7592 + var7 = var5 & 3; // L: 7593 + var8 = Client.field748[var6]; // L: 7594 + var9 = var1.method7714(); // L: 7595 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7596 + GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7597 + } + + } else if (class263.field3011 == var0) { // L: 7601 + var2 = var1.method7875() * 4; // L: 7602 + var3 = var1.method7714(); // L: 7603 + var4 = var1.method7717(); // L: 7604 + var5 = var1.method7773(); // L: 7605 + var6 = (var5 >> 4 & 7) + PlayerComposition.field3307; // L: 7606 + var7 = (var5 & 7) + class29.field181; // L: 7607 + var8 = var1.method7714(); // L: 7608 + byte var41 = var1.method7708(); // L: 7609 + var10 = var1.method7742(); // L: 7610 + byte var42 = var1.method7885(); // L: 7611 + var12 = var1.readUnsignedByte() * 4; // L: 7612 + var13 = var1.method7773(); // L: 7613 + var14 = var1.method7714(); // L: 7614 + var9 = var41 + var6; // L: 7615 + var11 = var42 + var7; // L: 7616 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var9 >= 0 && var11 >= 0 && var9 < 104 && var11 < 104 && var14 != 65535) { // L: 7617 + var6 = var6 * 128 + 64; // L: 7618 + var7 = var7 * 128 + 64; // L: 7619 + var9 = var9 * 128 + 64; // L: 7620 + var11 = var11 * 128 + 64; // L: 7621 + Projectile var33 = new Projectile(var14, class18.Client_plane, var6, var7, WorldMapLabel.getTileHeight(var6, var7, class18.Client_plane) - var2, var3 + Client.cycle, var8 + Client.cycle, var10, var13, var4, var12); // L: 7622 + var33.setDestination(var9, var11, WorldMapLabel.getTileHeight(var9, var11, class18.Client_plane) - var12, var3 + Client.cycle); // L: 7623 + Client.projectiles.addFirst(var33); // L: 7624 + } + + } else if (class263.field3005 != var0) { // L: 7628 + if (class263.field3008 == var0) { // L: 7674 + var2 = var1.method7714(); // L: 7675 + var3 = var1.readUnsignedByte(); // L: 7676 + var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7677 + var5 = (var3 & 7) + class29.field181; // L: 7678 + var6 = var1.method7714(); // L: 7679 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7680 + var31 = new TileItem(); // L: 7681 + var31.id = var2; // L: 7682 + var31.quantity = var6; // L: 7683 + if (Client.groundItems[class18.Client_plane][var4][var5] == null) { // L: 7684 + Client.groundItems[class18.Client_plane][var4][var5] = new NodeDeque(); + } + + Client.groundItems[class18.Client_plane][var4][var5].addFirst(var31); // L: 7685 + UserComparator3.updateItemPile(var4, var5); // L: 7686 + } + + } + } else { + var2 = var1.method7714(); // L: 7629 + var3 = var1.method7773(); // L: 7630 + var4 = var3 >> 2; // L: 7631 + var5 = var3 & 3; // L: 7632 + var6 = Client.field748[var4]; // L: 7633 + var7 = var1.method7875(); // L: 7634 + var8 = (var7 >> 4 & 7) + PlayerComposition.field3307; // L: 7635 + var9 = (var7 & 7) + class29.field181; // L: 7636 + if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7637 + if (var6 == 0) { // L: 7638 + BoundaryObject var32 = ArchiveLoader.scene.method4754(class18.Client_plane, var8, var9); // L: 7639 + if (var32 != null) { // L: 7640 + var11 = FileSystem.Entity_unpackID(var32.tag); // L: 7641 + if (var4 == 2) { // L: 7642 + var32.renderable1 = new DynamicObject(var11, 2, var5 + 4, class18.Client_plane, var8, var9, var2, false, var32.renderable1); // L: 7643 + var32.renderable2 = new DynamicObject(var11, 2, var5 + 1 & 3, class18.Client_plane, var8, var9, var2, false, var32.renderable2); // L: 7644 + } else { + var32.renderable1 = new DynamicObject(var11, var4, var5, class18.Client_plane, var8, var9, var2, false, var32.renderable1); // L: 7646 + } + } + } + + if (var6 == 1) { // L: 7649 + WallDecoration var43 = ArchiveLoader.scene.method4860(class18.Client_plane, var8, var9); // L: 7650 + if (var43 != null) { // L: 7651 + var11 = FileSystem.Entity_unpackID(var43.tag); // L: 7652 + if (var4 != 4 && var4 != 5) { // L: 7653 + if (var4 == 6) { // L: 7654 + var43.renderable1 = new DynamicObject(var11, 4, var5 + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); + } else if (var4 == 7) { // L: 7655 + var43.renderable1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); + } else if (var4 == 8) { // L: 7656 + var43.renderable1 = new DynamicObject(var11, 4, var5 + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); // L: 7657 + var43.renderable2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable2); // L: 7658 + } + } else { + var43.renderable1 = new DynamicObject(var11, 4, var5, class18.Client_plane, var8, var9, var2, false, var43.renderable1); + } + } + } + + if (var6 == 2) { // L: 7662 + GameObject var44 = ArchiveLoader.scene.getGameObject(class18.Client_plane, var8, var9); // L: 7663 + if (var4 == 11) { // L: 7664 + var4 = 10; + } + + if (var44 != null) { // L: 7665 + var44.renderable = new DynamicObject(FileSystem.Entity_unpackID(var44.tag), var4, var5, class18.Client_plane, var8, var9, var2, false, var44.renderable); + } + } + + if (var6 == 3) { // L: 7667 + FloorDecoration var45 = ArchiveLoader.scene.getFloorDecoration(class18.Client_plane, var8, var9); // L: 7668 + if (var45 != null) { // L: 7669 + var45.renderable = new DynamicObject(FileSystem.Entity_unpackID(var45.tag), 22, var5, class18.Client_plane, var8, var9, var2, false, var45.renderable); + } + } + } + + } + } + } + } // L: 7437 7482 7570 7585 7599 7626 7672 7688 7690 + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "83" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9854 + class21.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9855 + } + + long var4 = -1L; // L: 9858 + long var6 = -1L; // L: 9859 + + int var8; + for (var8 = 0; var8 < StructComposition.method3618(); ++var8) { // L: 9860 + long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9863 + if (var25 != var6) { // L: 9866 + var6 = var25; // L: 9867 + int var13 = World.method1673(var8); // L: 9868 + long var16 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9872 + int var15 = (int)(var16 >>> 7 & 127L); // L: 9874 + var15 = var15; // L: 9878 + int var29 = FloorDecoration.method4592(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9881 + int var18 = Frames.method4934(var8); // L: 9884 + if (var29 == 2 && ArchiveLoader.scene.getObjectFlags(class18.Client_plane, var13, var15, var25) >= 0) { // L: 9885 9886 + ObjectComposition var19 = class146.getObjectDefinition(var18); // L: 9887 + if (var19.transforms != null) { // L: 9888 + var19 = var19.transform(); + } + + if (var19 == null) { // L: 9889 + continue; + } + + if (Client.isItemSelected == 1) { // L: 9890 + class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(65535) + var19.name, 1, var18, var13, var15); // L: 9891 + } else if (Client.isSpellSelected) { // L: 9894 + if ((class17.selectedSpellFlags & 4) == 4) { // L: 9895 + class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(65535) + var19.name, 2, var18, var13, var15); // L: 9896 + } + } else { + String[] var20 = var19.actions; // L: 9901 + if (var20 != null) { // L: 9902 + for (int var21 = 4; var21 >= 0; --var21) { // L: 9903 + if (var20[var21] != null) { // L: 9904 + short var22 = 0; // L: 9905 + if (var21 == 0) { // L: 9906 + var22 = 3; + } + + if (var21 == 1) { // L: 9907 + var22 = 4; + } + + if (var21 == 2) { // L: 9908 + var22 = 5; + } + + if (var21 == 3) { // L: 9909 + var22 = 6; + } + + if (var21 == 4) { // L: 9910 + var22 = 1001; + } + + class21.insertMenuItemNoShift(var20[var21], UserComparator9.colorStartTag(65535) + var19.name, var22, var18, var13, var15); // L: 9911 + } + } + } + + class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var15); // L: 9916 + } + } + + Player var23; + int var30; + NPC var31; + int var38; + int[] var39; + if (var29 == 1) { // L: 9921 + NPC var34 = Client.npcs[var18]; // L: 9922 + if (var34 == null) { // L: 9923 + continue; + } + + if (var34.definition.size == 1 && (var34.x & 127) == 64 && (var34.y & 127) == 64) { // L: 9924 + for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9925 + var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9926 + if (var31 != null && var31 != var34 && var31.definition.size == 1 && var31.x == var34.x && var31.y == var34.y) { // L: 9927 + class12.addNpcToMenu(var31, Client.npcIndices[var30], var13, var15); + } + } + + var30 = Players.Players_count; // L: 9929 + var39 = Players.Players_indices; // L: 9930 + + for (var38 = 0; var38 < var30; ++var38) { // L: 9931 + var23 = Client.players[var39[var38]]; // L: 9932 + if (var23 != null && var23.x == var34.x && var34.y == var23.y) { // L: 9933 + class20.addPlayerToMenu(var23, var39[var38], var13, var15); + } + } + } + + class12.addNpcToMenu(var34, var18, var13, var15); // L: 9936 + } + + if (var29 == 0) { // L: 9938 + Player var35 = Client.players[var18]; // L: 9939 + if (var35 == null) { // L: 9940 + continue; + } + + if ((var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9941 + for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9942 + var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9943 + if (var31 != null && var31.definition.size == 1 && var31.x == var35.x && var35.y == var31.y) { // L: 9944 + class12.addNpcToMenu(var31, Client.npcIndices[var30], var13, var15); + } + } + + var30 = Players.Players_count; // L: 9946 + var39 = Players.Players_indices; // L: 9947 + + for (var38 = 0; var38 < var30; ++var38) { // L: 9948 + var23 = Client.players[var39[var38]]; // L: 9949 + if (var23 != null && var35 != var23 && var23.x == var35.x && var35.y == var23.y) { // L: 9950 + class20.addPlayerToMenu(var23, var39[var38], var13, var15); + } + } + } + + if (var18 != Client.combatTargetPlayerIndex) { // L: 9953 + class20.addPlayerToMenu(var35, var18, var13, var15); + } else { + var4 = var25; // L: 9954 + } + } + + if (var29 == 3) { // L: 9956 + NodeDeque var37 = Client.groundItems[class18.Client_plane][var13][var15]; // L: 9957 + if (var37 != null) { // L: 9958 + for (TileItem var36 = (TileItem)var37.first(); var36 != null; var36 = (TileItem)var37.next()) { // L: 9959 9960 9993 + ItemComposition var40 = class19.ItemDefinition_get(var36.id); // L: 9961 + if (Client.isItemSelected == 1) { // L: 9962 + class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var40.name, 16, var36.id, var13, var15); // L: 9963 + } else if (Client.isSpellSelected) { // L: 9966 + if ((class17.selectedSpellFlags & 1) == 1) { // L: 9967 + class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var40.name, 17, var36.id, var13, var15); // L: 9968 + } + } else { + String[] var32 = var40.groundActions; // L: 9973 + + for (int var33 = 4; var33 >= 0; --var33) { // L: 9974 + if (var32 != null && var32[var33] != null) { // L: 9975 + byte var24 = 0; // L: 9976 + if (var33 == 0) { // L: 9977 + var24 = 18; + } + + if (var33 == 1) { // L: 9978 + var24 = 19; + } + + if (var33 == 2) { // L: 9979 + var24 = 20; + } + + if (var33 == 3) { // L: 9980 + var24 = 21; + } + + if (var33 == 4) { // L: 9981 + var24 = 22; + } + + class21.insertMenuItemNoShift(var32[var33], UserComparator9.colorStartTag(16748608) + var40.name, var24, var36.id, var13, var15); // L: 9982 + } else if (var33 == 2) { // L: 9985 + class21.insertMenuItemNoShift("Take", UserComparator9.colorStartTag(16748608) + var40.name, 20, var36.id, var13, var15); // L: 9986 + } + } + + class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16748608) + var40.name, 1004, var36.id, var13, var15); // L: 9990 + } + } + } + } + } + } + + if (-1L != var4) { // L: 9998 + var8 = (int)(var4 >>> 0 & 127L); // L: 10001 + int var10 = (int)(var4 >>> 7 & 127L); // L: 10006 + Player var12 = Client.players[Client.combatTargetPlayerIndex]; // L: 10009 + class20.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); // L: 10010 + } + + } // L: 10012 } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index e68b3c695d..6276fad4d1 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -4,126 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ex") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("sp") - @ObfuscatedGetter( - intValue = 1198231863 - ) - static int field1608; - @ObfuscatedName("ov") - @ObfuscatedSignature( - descriptor = "[Lkn;" - ) - static Widget[] field1622; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("useHashes") boolean useHashes; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("useNames") boolean useNames; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 3945145856419995181L + longValue = -3394018459000773741L ) - long field1607; - @ObfuscatedName("l") + long field1586; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 618465929 + intValue = -401549063 ) - int field1598; + int field1583; @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1783912821 + intValue = 801648797 ) - int field1594; - @ObfuscatedName("f") + int field1589; + @ObfuscatedName("l") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("u") - public byte field1602; + @ObfuscatedName("q") + public byte field1591; + @ObfuscatedName("o") + public byte field1592; @ObfuscatedName("r") - public byte field1603; - @ObfuscatedName("k") - public byte field1604; - @ObfuscatedName("x") - public byte field1613; - @ObfuscatedName("c") + public byte field1593; + @ObfuscatedName("p") + public byte field1606; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1908103089 + intValue = -547296945 ) @Export("memberCount") public int memberCount; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("b") - int[] field1610; - @ObfuscatedName("w") - public int[] field1611; - @ObfuscatedName("a") - public boolean[] field1600; - @ObfuscatedName("m") + @ObfuscatedName("u") + int[] field1599; + @ObfuscatedName("t") + public int[] field1600; + @ObfuscatedName("g") + public boolean[] field1601; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1818610271 + intValue = 1213693909 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1447317987 + intValue = 1803569685 ) - public int field1614; + public int field1604; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1779654551 + intValue = 94812735 ) @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("bannedMemberHashes") long[] bannedMemberHashes; @ObfuscatedName("e") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) public ClanSettings(Buffer var1) { - this.field1598 = 0; // L: 14 + this.field1583 = 0; // L: 14 this.name = null; // L: 15 - this.field1594 = 0; // L: 16 + this.field1589 = 0; // L: 16 this.currentOwner = -1; // L: 29 - this.field1614 = -1; // L: 30 - this.method2931(var1); // L: 43 + this.field1604 = -1; // L: 30 + this.method2961(var1); // L: 43 } // L: 44 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-123" + garbageValue = "-82" ) - void method2913(int var1) { + void method2953(int var1) { if (this.useHashes) { // L: 47 if (this.memberHashes != null) { // L: 48 System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); @@ -146,43 +136,43 @@ public class ClanSettings { this.memberRanks = new byte[var1]; // L: 56 } - if (this.field1610 != null) { // L: 57 - System.arraycopy(this.field1610, 0, this.field1610 = new int[var1], 0, this.memberCount); + if (this.field1599 != null) { // L: 57 + System.arraycopy(this.field1599, 0, this.field1599 = new int[var1], 0, this.memberCount); } else { - this.field1610 = new int[var1]; // L: 58 + this.field1599 = new int[var1]; // L: 58 } - if (this.field1611 != null) { // L: 59 - System.arraycopy(this.field1611, 0, this.field1611 = new int[var1], 0, this.memberCount); + if (this.field1600 != null) { // L: 59 + System.arraycopy(this.field1600, 0, this.field1600 = new int[var1], 0, this.memberCount); } else { - this.field1611 = new int[var1]; // L: 60 + this.field1600 = new int[var1]; // L: 60 } - if (this.field1600 != null) { - System.arraycopy(this.field1600, 0, this.field1600 = new boolean[var1], 0, this.memberCount); // L: 61 + if (this.field1601 != null) { // L: 61 + System.arraycopy(this.field1601, 0, this.field1601 = new boolean[var1], 0, this.memberCount); } else { - this.field1600 = new boolean[var1]; // L: 62 + this.field1601 = new boolean[var1]; // L: 62 } } // L: 63 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "9" + garbageValue = "28" ) - void method2973(int var1) { + void method2954(int var1) { if (this.useHashes) { // L: 66 - if (this.bannedMemberHashes != null) { // L: 67 - System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); + if (this.bannedMemberHashes != null) { + System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); // L: 67 } else { this.bannedMemberHashes = new long[var1]; // L: 68 } } if (this.useNames) { // L: 70 - if (this.bannedMemberNames != null) { // L: 71 - System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); + if (this.bannedMemberNames != null) { + System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); // L: 71 } else { this.bannedMemberNames = new String[var1]; // L: 72 } @@ -190,12 +180,12 @@ public class ClanSettings { } // L: 74 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1580381638" + garbageValue = "35363585" ) - public int method2979(String var1) { + public int method2955(String var1) { if (var1 != null && var1.length() != 0) { // L: 77 for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78 if (this.memberNames[var2].equals(var1)) { // L: 79 @@ -209,20 +199,20 @@ public class ClanSettings { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "1226760366" + garbageValue = "-1723451340" ) - public int method2915(int var1, int var2, int var3) { + public int method2956(int var1, int var2, int var3) { int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 - return (this.field1610[var1] & var4) >>> var2; // L: 86 + return (this.field1599[var1] & var4) >>> var2; // L: 86 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Integer;", - garbageValue = "-18" + descriptor = "(II)Ljava/lang/Integer;", + garbageValue = "1275001332" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -237,7 +227,7 @@ public class ClanSettings { @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(B)[I", - garbageValue = "11" + garbageValue = "33" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -253,29 +243,29 @@ public class ClanSettings { } int[] var3 = this.sortedMembers; // L: 105 - WorldMapData_0.method4518(var1, var3, 0, var1.length - 1); // L: 107 + class433.method7605(var1, var3, 0, var1.length - 1); // L: 107 } - return this.sortedMembers; // L: 110 + return this.sortedMembers; } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;II)V", - garbageValue = "1792170403" + garbageValue = "1216847947" ) - void method2918(long var1, String var3, int var4) { + void method2959(long var1, String var3, int var4) { if (var3 != null && var3.length() == 0) { // L: 114 var3 = null; } - if (this.useHashes != var1 > 0L) { // L: 115 + if (var1 > 0L != this.useHashes) { // L: 115 throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { // L: 116 + } else if (this.useNames != (var3 != null)) { // L: 116 throw new RuntimeException(""); } else { if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 117 - this.method2913(this.memberCount + 5); + this.method2953(this.memberCount + 5); } if (this.memberHashes != null) { // L: 118 @@ -293,20 +283,20 @@ public class ClanSettings { this.memberRanks[this.memberCount] = 0; // L: 125 } - this.field1610[this.memberCount] = 0; // L: 127 - this.field1611[this.memberCount] = var4; // L: 128 - this.field1600[this.memberCount] = false; // L: 129 + this.field1599[this.memberCount] = 0; // L: 127 + this.field1600[this.memberCount] = var4; // L: 128 + this.field1601[this.memberCount] = false; // L: 129 ++this.memberCount; // L: 130 this.sortedMembers = null; // L: 131 } } // L: 132 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "831178976" ) - void method2919(int var1) { + void method2960(int var1) { if (var1 >= 0 && var1 < this.memberCount) { // L: 135 --this.memberCount; // L: 136 this.sortedMembers = null; // L: 137 @@ -314,16 +304,16 @@ public class ClanSettings { this.memberHashes = null; // L: 139 this.memberNames = null; // L: 140 this.memberRanks = null; // L: 141 - this.field1610 = null; // L: 142 - this.field1611 = null; // L: 143 - this.field1600 = null; // L: 144 + this.field1599 = null; // L: 142 + this.field1600 = null; // L: 143 + this.field1601 = null; // L: 144 this.currentOwner = -1; // L: 145 - this.field1614 = -1; // L: 146 + this.field1604 = -1; // L: 146 } else { System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149 - System.arraycopy(this.field1610, var1 + 1, this.field1610, var1, this.memberCount - var1); // L: 150 - System.arraycopy(this.field1611, var1 + 1, this.field1611, var1, this.memberCount - var1); // L: 151 - System.arraycopy(this.field1600, var1 + 1, this.field1600, var1, this.memberCount - var1); // L: 152 + System.arraycopy(this.field1599, var1 + 1, this.field1599, var1, this.memberCount - var1); // L: 150 + System.arraycopy(this.field1600, var1 + 1, this.field1600, var1, this.memberCount - var1); // L: 151 + System.arraycopy(this.field1601, var1 + 1, this.field1601, var1, this.memberCount - var1); // L: 152 if (this.memberHashes != null) { // L: 153 System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } @@ -340,32 +330,32 @@ public class ClanSettings { } } // L: 157 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "56399515" + garbageValue = "-131657821" ) @Export("updateOwner") void updateOwner() { if (this.memberCount == 0) { // L: 160 this.currentOwner = -1; // L: 161 - this.field1614 = -1; // L: 162 + this.field1604 = -1; // L: 162 } else { this.currentOwner = -1; // L: 165 - this.field1614 = -1; // L: 166 + this.field1604 = -1; // L: 166 int var1 = 0; // L: 167 byte var2 = this.memberRanks[0]; // L: 168 for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169 if (this.memberRanks[var3] > var2) { // L: 170 if (var2 == 125) { // L: 171 - this.field1614 = var1; + this.field1604 = var1; } var1 = var3; // L: 172 var2 = this.memberRanks[var3]; // L: 173 - } else if (this.field1614 == -1 && this.memberRanks[var3] == 125) { // L: 175 - this.field1614 = var3; // L: 176 + } else if (this.field1604 == -1 && this.memberRanks[var3] == 125) { // L: 175 + this.field1604 = var3; // L: 176 } } @@ -377,23 +367,23 @@ public class ClanSettings { } } // L: 163 181 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;B)V", - garbageValue = "94" + garbageValue = "17" ) - void method2912(long var1, String var3) { + void method2996(long var1, String var3) { if (var3 != null && var3.length() == 0) { // L: 184 var3 = null; } if (this.useHashes != var1 > 0L) { // L: 185 throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { // L: 186 + } else if (var3 != null != this.useNames) { // L: 186 throw new RuntimeException(""); } else { if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 187 - this.method2973(this.bannedMemberCount + 5); + this.method2954(this.bannedMemberCount + 5); } if (this.bannedMemberHashes != null) { // L: 188 @@ -408,12 +398,12 @@ public class ClanSettings { } } // L: 191 - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2044582624" + garbageValue = "-1100183884" ) - void method2922(int var1) { + void method2963(int var1) { --this.bannedMemberCount; // L: 194 if (this.bannedMemberCount == 0) { // L: 195 this.bannedMemberHashes = null; // L: 196 @@ -430,17 +420,17 @@ public class ClanSettings { } // L: 203 - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IBI)I", - garbageValue = "2038770318" + descriptor = "(IBB)I", + garbageValue = "-48" ) - int method2940(int var1, byte var2) { + int method2964(int var1, byte var2) { if (var2 != 126 && var2 != 127) { // L: 206 - if (this.currentOwner == var1 && (this.field1614 == -1 || this.memberRanks[this.field1614] < 125)) { // L: 207 - return -1; - } else if (this.memberRanks[var1] == var2) { // L: 208 + if (this.currentOwner == var1 && (this.field1604 == -1 || this.memberRanks[this.field1604] < 125)) { // L: 207 return -1; + } else if (this.memberRanks[var1] == var2) { + return -1; // L: 208 } else { this.memberRanks[var1] = var2; // L: 209 this.updateOwner(); // L: 210 @@ -451,15 +441,15 @@ public class ClanSettings { } } - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-190759888" + garbageValue = "-1731928616" ) - boolean method2924(int var1) { + boolean method2965(int var1) { if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215 this.memberRanks[this.currentOwner] = 125; // L: 216 - this.field1614 = this.currentOwner; // L: 217 + this.field1604 = this.currentOwner; // L: 217 this.memberRanks[var1] = 126; // L: 218 this.currentOwner = var1; // L: 219 return true; // L: 220 @@ -468,47 +458,47 @@ public class ClanSettings { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "-606065608" + garbageValue = "1433245156" ) - int method2925(int var1, boolean var2) { - if (this.field1600[var1] == var2) { // L: 224 + int method3027(int var1, boolean var2) { + if (this.field1601[var1] == var2) { // L: 224 return -1; } else { - this.field1600[var1] = var2; // L: 225 + this.field1601[var1] = var2; // L: 225 return var1; // L: 226 } } - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIIS)I", - garbageValue = "23318" + descriptor = "(IIIIB)I", + garbageValue = "-122" ) - int method2926(int var1, int var2, int var3, int var4) { + int method2967(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; // L: 230 int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231 int var7 = var6 ^ var5; // L: 232 var2 <<= var3; // L: 233 var2 &= var7; // L: 234 - int var8 = this.field1610[var1]; // L: 235 + int var8 = this.field1599[var1]; // L: 235 if ((var8 & var7) == var2) { return -1; // L: 236 } else { var8 &= ~var7; // L: 237 - this.field1610[var1] = var8 | var2; // L: 238 + this.field1599[var1] = var8 | var2; // L: 238 return var1; // L: 239 } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "0" + descriptor = "(III)Z", + garbageValue = "-827323017" ) - boolean method2927(int var1, int var2) { + boolean method2968(int var1, int var2) { if (this.parameters != null) { // L: 243 Node var3 = this.parameters.get((long)var1); // L: 244 if (var3 != null) { // L: 245 @@ -532,12 +522,12 @@ public class ClanSettings { return true; // L: 257 } - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIIIB)Z", - garbageValue = "-101" + garbageValue = "42" ) - boolean method2928(int var1, int var2, int var3, int var4) { + boolean method2969(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; // L: 261 int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262 int var7 = var6 ^ var5; // L: 263 @@ -567,14 +557,14 @@ public class ClanSettings { return true; // L: 281 } - @ObfuscatedName("w") - boolean method2938(int var1, long var2) { + @ObfuscatedName("t") + boolean method2978(int var1, long var2) { if (this.parameters != null) { // L: 285 Node var4 = this.parameters.get((long)var1); // L: 286 if (var4 != null) { // L: 287 if (var4 instanceof class406) { // L: 288 class406 var5 = (class406)var4; // L: 289 - if (var5.field4407 == var2) { // L: 290 + if (var2 == var5.field4407) { // L: 290 return false; } @@ -592,12 +582,12 @@ public class ClanSettings { return true; // L: 299 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "-529235235" + descriptor = "(ILjava/lang/String;B)Z", + garbageValue = "49" ) - boolean method2956(int var1, String var2) { + boolean method2971(int var1, String var2) { if (var2 == null) { // L: 303 var2 = ""; } else if (var2.length() > 80) { // L: 304 @@ -630,12 +620,12 @@ public class ClanSettings { return true; // L: 322 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "18266587" + descriptor = "(Lpi;I)V", + garbageValue = "-1262320600" ) - void method2931(Buffer var1) { + void method2961(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 326 if (var2 >= 1 && var2 <= 6) { // L: 327 int var3 = var1.readUnsignedByte(); // L: 328 @@ -657,10 +647,10 @@ public class ClanSettings { this.bannedMemberNames = null; // L: 337 } - this.field1598 = var1.readInt(); // L: 339 - this.field1594 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field1594 != 0) { // L: 341 - this.field1594 += 16912800; + this.field1583 = var1.readInt(); // L: 339 + this.field1589 = var1.readInt(); // L: 340 + if (var2 <= 3 && this.field1589 != 0) { // L: 341 + this.field1589 += 16912800; } this.memberCount = var1.readUnsignedShort(); // L: 342 @@ -671,10 +661,10 @@ public class ClanSettings { } this.allowGuests = var1.readUnsignedByte() == 1; // L: 348 - this.field1602 = var1.readByte(); // L: 349 - this.field1603 = var1.readByte(); // L: 350 - this.field1604 = var1.readByte(); // L: 351 - this.field1613 = var1.readByte(); // L: 352 + this.field1591 = var1.readByte(); // L: 349 + this.field1592 = var1.readByte(); // L: 350 + this.field1593 = var1.readByte(); // L: 351 + this.field1606 = var1.readByte(); // L: 352 int var4; if (this.memberCount > 0) { // L: 353 if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354 @@ -689,16 +679,16 @@ public class ClanSettings { this.memberRanks = new byte[this.memberCount]; } - if (this.field1610 == null || this.field1610.length < this.memberCount) { // L: 357 - this.field1610 = new int[this.memberCount]; + if (this.field1599 == null || this.field1599.length < this.memberCount) { // L: 357 + this.field1599 = new int[this.memberCount]; } - if (this.field1611 == null || this.field1611.length < this.memberCount) { // L: 358 - this.field1611 = new int[this.memberCount]; + if (this.field1600 == null || this.field1600.length < this.memberCount) { // L: 358 + this.field1600 = new int[this.memberCount]; } - if (this.field1600 == null || this.field1600.length < this.memberCount) { // L: 359 - this.field1600 = new boolean[this.memberCount]; + if (this.field1601 == null || this.field1601.length < this.memberCount) { // L: 359 + this.field1601 = new boolean[this.memberCount]; } for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360 @@ -712,19 +702,19 @@ public class ClanSettings { this.memberRanks[var4] = var1.readByte(); // L: 363 if (var2 >= 2) { // L: 364 - this.field1610[var4] = var1.readInt(); + this.field1599[var4] = var1.readInt(); } if (var2 >= 5) { // L: 365 - this.field1611[var4] = var1.readUnsignedShort(); + this.field1600[var4] = var1.readUnsignedShort(); } else { - this.field1611[var4] = 0; // L: 366 + this.field1600[var4] = 0; // L: 366 } if (var2 >= 6) { // L: 367 - this.field1600[var4] = var1.readUnsignedByte() == 1; + this.field1601[var4] = var1.readUnsignedByte() == 1; } else { - this.field1600[var4] = false; // L: 368 + this.field1601[var4] = false; // L: 368 } } @@ -754,7 +744,7 @@ public class ClanSettings { if (var2 >= 3) { // L: 380 var4 = var1.readUnsignedShort(); // L: 381 if (var4 > 0) { // L: 382 - this.parameters = new IterableNodeHashTable(var4 < 16 ? Login.method1894(var4) : 16); // L: 383 + this.parameters = new IterableNodeHashTable(var4 < 16 ? class67.method1909(var4) : 16); // L: 383 while (var4-- > 0) { // L: 384 int var5 = var1.readInt(); // L: 385 @@ -779,64 +769,65 @@ public class ClanSettings { } } // L: 403 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpq;III)I", - garbageValue = "1431232639" + descriptor = "(Lch;B)V", + garbageValue = "28" ) - static int method2976(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { // L: 33 - return var2; + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + Interpreter.runScript(var0, 500000, 475000); // L: 108 + } // L: 109 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1975517919" + ) + static final void method3031() { + class149.method3138("You can't add yourself to your own friend list"); // L: 110 + } // L: 111 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-26" + ) + static final int method3028(int var0, int var1) { + if (var0 == -2) { // L: 942 + return 12345678; + } else if (var0 == -1) { // L: 943 + if (var1 < 2) { // L: 944 + var1 = 2; + } else if (var1 > 126) { // L: 945 + var1 = 126; + } + + return var1; // L: 946 } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 - return var3 == null ? var2 : var3.integer; // L: 35 36 + var1 = (var0 & 127) * var1 / 128; // L: 948 + if (var1 < 2) { // L: 949 + var1 = 2; + } else if (var1 > 126) { // L: 950 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 951 } } - @ObfuscatedName("jz") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "([Lkn;II)V", - garbageValue = "1847121175" + descriptor = "(ZB)V", + garbageValue = "-89" ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11119 - Widget var3 = var0[var2]; // L: 11120 - if (var3 != null) { // L: 11121 - if (var3.type == 0) { // L: 11122 - if (var3.children != null) { // L: 11123 - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11124 - if (var4 != null) { // L: 11125 - MouseHandler.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 11127 - var5 = new ScriptEvent(); // L: 11128 - var5.widget = var3; // L: 11129 - var5.args = var3.onDialogAbort; // L: 11130 - class1.runScriptEvent(var5); // L: 11131 - } - - if (var1 == 1 && var3.onSubChange != null) { // L: 11133 - if (var3.childIndex >= 0) { // L: 11134 - Widget var6 = HorizontalAlignment.getWidget(var3.id); // L: 11135 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11136 - continue; - } - } - - var5 = new ScriptEvent(); // L: 11140 - var5.widget = var3; // L: 11141 - var5.args = var3.onSubChange; // L: 11142 - class1.runScriptEvent(var5); // L: 11143 - } - } + public static void method3033(boolean var0) { + if (var0 != DevicePcmPlayerProvider.ItemDefinition_inMembersWorld) { // L: 584 + ItemComposition.ItemDefinition_cached.clear(); // L: 586 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 587 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 588 + DevicePcmPlayerProvider.ItemDefinition_inMembersWorld = var0; // L: 590 } - } // L: 11146 + } // L: 592 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 55840bba67..96080bdb4e 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,14 +1,9 @@ -import com.jagex.oldscape.pub.OAuthApi; -import com.jagex.oldscape.pub.OtlTokenRequester; -import com.jagex.oldscape.pub.OtlTokenResponse; -import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.Socket; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -18,1014 +13,992 @@ 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; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed, OAuthApi { - @ObfuscatedName("ro") + @ObfuscatedName("rw") @ObfuscatedSignature( - descriptor = "[Leh;" + descriptor = "[Lex;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("uq") + @ObfuscatedName("us") @ObfuscatedGetter( - intValue = 1668730285 + intValue = 1674651291 ) - public static int field764; - @ObfuscatedName("se") - static boolean field731; - @ObfuscatedName("tn") + public static int field779; + @ObfuscatedName("ss") + static boolean field746; + @ObfuscatedName("tz") @ObfuscatedGetter( - intValue = -910392373 + intValue = 599158567 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("tw") + @ObfuscatedName("to") @ObfuscatedGetter( - intValue = -741785837 + intValue = -296270013 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("ri") + @ObfuscatedName("rk") @ObfuscatedGetter( - intValue = 1225239435 + intValue = 1370188631 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("rm") + @ObfuscatedName("rf") @ObfuscatedGetter( - intValue = -1994078091 + intValue = -1262873417 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("vo") + @ObfuscatedName("vi") @ObfuscatedSignature( - descriptor = "Lbg;" + descriptor = "Lbh;" ) - static final ApproximateRouteStrategy field477; - @ObfuscatedName("sv") + static final ApproximateRouteStrategy field783; + @ObfuscatedName("vy") + static int[] field784; + @ObfuscatedName("vj") + static int[] field785; + @ObfuscatedName("sa") @Export("isCameraLocked") static boolean isCameraLocked; - @ObfuscatedName("vf") - static int[] field743; - @ObfuscatedName("tv") - static boolean field739; - @ObfuscatedName("vp") - static int[] field670; - @ObfuscatedName("sf") + @ObfuscatedName("tu") + static boolean field754; + @ObfuscatedName("ue") @ObfuscatedGetter( - intValue = -626586819 + intValue = 1572034959 ) - @Export("currentTrackGroupId") - static int currentTrackGroupId; - @ObfuscatedName("uk") - @ObfuscatedGetter( - intValue = -1394688195 - ) - static int field759; - @ObfuscatedName("ur") + static int field561; + @ObfuscatedName("uz") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lkp;" ) @Export("playerAppearance") static PlayerComposition playerAppearance; - @ObfuscatedName("tt") - static boolean[] field740; - @ObfuscatedName("ua") + @ObfuscatedName("sw") @ObfuscatedGetter( - intValue = -1186847035 - ) - static int field738; - @ObfuscatedName("sa") - @ObfuscatedGetter( - intValue = -511056461 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("ts") - static int[] field482; - @ObfuscatedName("uy") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("tq") - static int[] field549; - @ObfuscatedName("uo") - @ObfuscatedGetter( - intValue = -19127139 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("tp") - static int[] field766; - @ObfuscatedName("re") - @ObfuscatedGetter( - intValue = -948451773 - ) - static int field721; - @ObfuscatedName("tr") - static int[] field744; - @ObfuscatedName("rz") - @ObfuscatedGetter( - longValue = 36479923069350349L - ) - static long field718; - @ObfuscatedName("sd") - @ObfuscatedGetter( - intValue = 1597289503 + intValue = 1679635193 ) @Export("soundEffectCount") static int soundEffectCount; - @ObfuscatedName("sk") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("sl") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("ss") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("sc") - @ObfuscatedSignature( - descriptor = "[Lad;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("qq") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("so") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("un") - @ObfuscatedSignature( - descriptor = "Loy;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("rn") + @ObfuscatedName("qn") @ObfuscatedGetter( - intValue = 802039019 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = 392085463 - ) - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("rd") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("rh") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("tc") - static short field745; - @ObfuscatedName("tf") - static short field706; - @ObfuscatedName("to") - static short field751; - @ObfuscatedName("rx") - @ObfuscatedSignature( - descriptor = "[Lql;" - ) - @Export("mapIcons") - static SpritePixels[] mapIcons; - @ObfuscatedName("te") - static short field752; - @ObfuscatedName("tz") - static short field750; - @ObfuscatedName("th") - @ObfuscatedGetter( - intValue = 1682209625 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("tg") - static short field562; - @ObfuscatedName("td") - @ObfuscatedGetter( - intValue = 1039364719 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("rw") - @ObfuscatedGetter( - intValue = 611890173 - ) - static int field713; - @ObfuscatedName("rp") - @ObfuscatedSignature( - descriptor = "[Ley;" - ) - @Export("currentClanChannels") - static ClanChannel[] currentClanChannels; - @ObfuscatedName("tu") - @ObfuscatedGetter( - intValue = -1076722529 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("rk") - static int[] field568; - @ObfuscatedName("ty") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("tl") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("ue") - @ObfuscatedGetter( - intValue = 1688103811 - ) - static int field767; - @ObfuscatedName("ru") - static int[] field716; - @ObfuscatedName("qi") - @ObfuscatedGetter( - intValue = -89242055 + intValue = -1673017289 ) @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("qp") + @ObfuscatedName("sq") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("uj") @ObfuscatedGetter( - intValue = -1997550173 + intValue = 984000669 + ) + static int field775; + @ObfuscatedName("qz") + @ObfuscatedGetter( + intValue = 1124774391 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("qw") - static String field712; - @ObfuscatedName("uh") + @ObfuscatedName("sc") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("sm") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("sp") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Lav;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("sb") + @ObfuscatedGetter( + intValue = -1290712593 + ) + @Export("currentTrackGroupId") + static int currentTrackGroupId; + @ObfuscatedName("sy") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("so") + @ObfuscatedGetter( + intValue = 362704857 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("rt") + @ObfuscatedGetter( + intValue = 223521103 + ) + static int field714; + @ObfuscatedName("rj") + @ObfuscatedGetter( + longValue = -2347175531478296847L + ) + static long field585; + @ObfuscatedName("uf") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("tx") + static boolean[] field546; + @ObfuscatedName("uo") + @ObfuscatedGetter( + intValue = 810173849 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("rx") + @ObfuscatedGetter( + intValue = -2104517495 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("tk") + static short field760; + @ObfuscatedName("te") + static short field761; + @ObfuscatedName("tt") + static short field766; + @ObfuscatedName("rd") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("tq") + static short field666; + @ObfuscatedName("tg") + static short field765; + @ObfuscatedName("um") + @ObfuscatedSignature( + descriptor = "Lor;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("tc") + @ObfuscatedGetter( + intValue = -985861069 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("tw") + static short field764; + @ObfuscatedName("td") + @ObfuscatedGetter( + intValue = 115517713 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("ri") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("th") + static int[] field756; + @ObfuscatedName("rc") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("mapIcons") + static SpritePixels[] mapIcons; + @ObfuscatedName("tl") + static int[] field636; + @ObfuscatedName("tb") + static int[] field674; + @ObfuscatedName("ru") + @ObfuscatedSignature( + descriptor = "[Lea;" + ) + @Export("currentClanChannels") + static ClanChannel[] currentClanChannels; + @ObfuscatedName("tm") + static int[] field600; + @ObfuscatedName("ty") + @ObfuscatedGetter( + intValue = -2113477791 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("ra") + @ObfuscatedGetter( + intValue = -319356623 + ) + static int field731; + @ObfuscatedName("qt") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("ts") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("tr") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("rq") + @ObfuscatedGetter( + intValue = 959543265 + ) + @Export("crossWorldMessageIdsIndex") + static int crossWorldMessageIdsIndex; + @ObfuscatedName("rn") + static int[] field733; + @ObfuscatedName("re") + static int[] field732; + @ObfuscatedName("ul") + @ObfuscatedGetter( + intValue = 75180695 + ) + static int field782; + @ObfuscatedName("ug") + @ObfuscatedSignature( + descriptor = "[Llh;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("uc") + @ObfuscatedName("qs") + static String field728; + @ObfuscatedName("uw") @ObfuscatedSignature( - descriptor = "Lbq;" + descriptor = "Lbf;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lgf;" + descriptor = "[Lgv;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("ai") - static boolean field536; - @ObfuscatedName("bk") + @ObfuscatedName("aa") + static boolean field490; + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1384475225 + intValue = 125631107 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bz") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1403980901 + intValue = 1205446505 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lkx;" - ) - static GameBuild field509; - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1486899745 + intValue = 648294645 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bg") + @ObfuscatedName("bh") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("by") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 908315739 + intValue = 302223075 ) - static int field484; - @ObfuscatedName("bu") + static int field617; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 936245025 + intValue = -1896865619 ) @Export("clientType") static int clientType; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -306665125 + intValue = 2077868883 ) - static int field486; - @ObfuscatedName("bb") + static int field498; + @ObfuscatedName("bk") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("cy") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -82914107 + intValue = 1430199997 ) @Export("gameState") static int gameState; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "[Lqx;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("ct") + @ObfuscatedName("cd") + static boolean field504; + @ObfuscatedName("cw") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("ce") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -334140379 + intValue = 395789251 ) @Export("cycle") static int cycle; - @ObfuscatedName("dd") + @ObfuscatedName("dr") @ObfuscatedGetter( - longValue = -1788546083079634723L + longValue = 4039727128502314979L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("dn") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -100074845 + intValue = -1271698921 ) - static int field493; + static int field508; @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = 629104417 + intValue = -636439299 ) - static int field494; - @ObfuscatedName("dj") + static int field509; + @ObfuscatedName("de") @ObfuscatedGetter( - longValue = 1321924427680064723L + longValue = -3400389721311801431L ) - static long field495; - @ObfuscatedName("dk") + static long field510; + @ObfuscatedName("dp") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("dw") + @ObfuscatedName("dx") @ObfuscatedGetter( - intValue = 1351490809 + intValue = -1948172533 ) @Export("rebootTimer") static int rebootTimer; @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = -1663625947 + intValue = -1059936819 ) @Export("hintArrowType") static int hintArrowType; @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = 192342013 + intValue = -1326790571 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("dh") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = -1937230559 + intValue = 1613753799 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("dm") + @ObfuscatedName("dv") @ObfuscatedGetter( - intValue = -1944327797 + intValue = 678748679 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("dq") + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = 1483438593 + intValue = -484656195 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("dy") + @ObfuscatedName("di") @ObfuscatedGetter( - intValue = 625837163 + intValue = -2063879327 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("di") + @ObfuscatedName("dt") @ObfuscatedGetter( - intValue = -238897213 + intValue = 800403081 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dz") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = 1241852729 + intValue = 576607501 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("dv") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dx") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Lcn;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("df") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 1509781755 + intValue = 1784085227 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dl") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = 825267883 + intValue = -20961693 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("eu") + @ObfuscatedName("ec") @ObfuscatedGetter( - intValue = 440824439 + intValue = 1976785561 ) - static int field510; - @ObfuscatedName("et") + static int field525; + @ObfuscatedName("ez") @ObfuscatedGetter( - intValue = -1319621541 + intValue = 962124251 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("ea") + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = 873675793 + intValue = 1954076743 ) @Export("loginState") static int loginState; - @ObfuscatedName("ef") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = 1202903661 + intValue = -1036916585 ) - static int field513; - @ObfuscatedName("fw") + static int field528; + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = 595512899 + intValue = -1101689681 ) - static int field742; - @ObfuscatedName("fl") + static int field661; + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = -1543261187 + intValue = 1469005087 ) - static int field490; - @ObfuscatedName("fz") + static int field530; + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Ldl;" ) - static class124 field516; - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "Lpb;" - ) - static class441 field517; - @ObfuscatedName("fj") - @Export("Login_isUsernameRemembered") - static boolean Login_isUsernameRemembered; + static class124 field531; @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "Lpq;" + ) + static class441 field532; + @ObfuscatedName("ft") + @Export("Login_isUsernameRemembered") + static boolean Login_isUsernameRemembered; + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "Lbt;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("gj") + @ObfuscatedName("gs") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("gg") + @ObfuscatedName("gw") @ObfuscatedSignature( - descriptor = "[Lcx;" + descriptor = "[Lcy;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("gf") + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = 821728721 + intValue = 1354722257 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("ge") + @ObfuscatedName("gt") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("gv") + @ObfuscatedName("gm") @ObfuscatedGetter( - intValue = -1172632999 + intValue = 349713523 ) - static int field609; - @ObfuscatedName("ga") - static int[] field533; - @ObfuscatedName("gb") + static int field547; + @ObfuscatedName("go") + static int[] field548; + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "Lcj;" + descriptor = "Lcl;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("gi") + @ObfuscatedName("ga") @ObfuscatedGetter( - intValue = -1448088797 + intValue = -429421433 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("gy") + @ObfuscatedName("gu") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("gr") + @ObfuscatedName("gd") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("gl") - static boolean field753; @ObfuscatedName("gq") + static boolean field553; + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lmu;" ) @Export("timer") static Timer timer; - @ObfuscatedName("hm") + @ObfuscatedName("hz") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("hu") - @ObfuscatedGetter( - intValue = -1925693523 - ) - static int field541; @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = -1659706153 + intValue = -2040429487 + ) + static int field747; + @ObfuscatedName("hd") + @ObfuscatedGetter( + intValue = 1657321755 + ) + static int field608; + @ObfuscatedName("hq") + @ObfuscatedGetter( + intValue = 800034625 ) static int field558; - @ObfuscatedName("hr") + @ObfuscatedName("hw") @ObfuscatedGetter( - intValue = 321841455 + intValue = -1284292665 ) - static int field543; - @ObfuscatedName("hg") - @ObfuscatedGetter( - intValue = 221917147 - ) - static int field679; - @ObfuscatedName("hn") - @ObfuscatedGetter( - intValue = 1969712165 - ) - static int field545; - @ObfuscatedName("hk") - @Export("isInInstance") - static boolean isInInstance; - @ObfuscatedName("ho") - @Export("instanceChunkTemplates") - static int[][][] instanceChunkTemplates; - @ObfuscatedName("hq") - static final int[] field711; + static int field758; @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = -801639369 + intValue = -1957551061 ) - static int field550; - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "[Lql;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("io") + static int field560; + @ObfuscatedName("hf") + @Export("isInInstance") + static boolean isInInstance; + @ObfuscatedName("hu") + @Export("instanceChunkTemplates") + static int[][][] instanceChunkTemplates; + @ObfuscatedName("hb") + static final int[] field748; + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = 1321495201 + intValue = -1481528837 ) - static int field619; - @ObfuscatedName("ie") - @ObfuscatedGetter( - intValue = -1490389591 - ) - static int field684; + static int field556; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; + @ObfuscatedName("io") + @ObfuscatedGetter( + intValue = 90219493 + ) + static int field566; @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = -1195780917 + intValue = 2041898935 ) - static int field554; - @ObfuscatedName("ip") + static int field670; + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = -1210560909 + intValue = 2062325883 ) - static int field514; - @ObfuscatedName("if") - static boolean field556; - @ObfuscatedName("ih") + static int field694; + @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -1437744235 + intValue = -541139307 + ) + static int field740; + @ObfuscatedName("iu") + static boolean field570; + @ObfuscatedName("is") + @ObfuscatedGetter( + intValue = -5461521 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("jq") + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = -1351920695 + intValue = 1628522517 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("jn") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = 216266331 + intValue = 275555387 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("ji") + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = -1258752111 + intValue = 170715045 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("jt") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -1533362551 + intValue = -1211766585 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("jd") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = -455239761 + intValue = 2051456837 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("jx") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = -1065676509 + intValue = -1066673885 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("jk") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = 201796585 + intValue = -1265757545 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("jj") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = -227218527 + intValue = 924147421 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("jf") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = 2135438815 + intValue = -733089741 ) - static int field566; - @ObfuscatedName("jv") + static int field581; + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = 344639155 + intValue = -145236613 ) - static int field567; - @ObfuscatedName("je") + static int field590; + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -341747801 + intValue = -665527289 ) - static int field696; + static int field489; @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = -1286782535 + intValue = -210849807 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("jr") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = -881862903 + intValue = 868767683 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("js") - @ObfuscatedGetter( - intValue = 1761289457 - ) - static int field571; @ObfuscatedName("ju") - static boolean field602; - @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -1962424793 + intValue = -416666023 ) - static int field542; - @ObfuscatedName("jp") - static boolean field616; - @ObfuscatedName("jy") + static int field586; + @ObfuscatedName("jn") + static boolean field759; + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = 1036039517 + intValue = 865687077 ) - static int field756; - @ObfuscatedName("jz") + static int field588; + @ObfuscatedName("jx") + static boolean field589; + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = -1554495705 + intValue = 158316317 + ) + static int field718; + @ObfuscatedName("je") + @ObfuscatedGetter( + intValue = -170106615 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("jw") + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = -1616639625 + intValue = -1300592885 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("jc") + @ObfuscatedName("js") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("kc") + @ObfuscatedName("kn") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("kw") + @ObfuscatedName("ki") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("kd") + @ObfuscatedName("kg") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("ko") + @ObfuscatedName("ks") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("kt") + @ObfuscatedName("kj") @Export("overheadTextEffects") static int[] overheadTextEffects; @ObfuscatedName("kf") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("kq") + @ObfuscatedName("kp") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("kg") + @ObfuscatedName("kk") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("kn") + @ObfuscatedName("ky") @ObfuscatedGetter( - intValue = -2025340953 + intValue = 1107217747 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("km") + @ObfuscatedName("kc") @ObfuscatedGetter( - intValue = -861538357 + intValue = -1551118407 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("ke") + @ObfuscatedName("kw") @ObfuscatedGetter( - intValue = 41145337 + intValue = 1986228753 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("kl") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = -1179160659 + intValue = 741952061 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("ks") + @ObfuscatedName("kq") @ObfuscatedGetter( - intValue = -1155625427 + intValue = 1652587127 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("kr") + @ObfuscatedName("kb") @ObfuscatedGetter( - intValue = -986269893 + intValue = 734553977 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("kp") + @ObfuscatedName("ku") @ObfuscatedGetter( - intValue = 1318362113 + intValue = -1471175899 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("ku") + @ObfuscatedName("kx") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("kx") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = -1221596075 + intValue = 151117229 ) - static int field595; + static int field610; + @ObfuscatedName("kt") + @ObfuscatedGetter( + intValue = 1905969143 + ) + static int field611; @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = 16392841 - ) - static int field741; - @ObfuscatedName("ky") - @ObfuscatedGetter( - intValue = -859747187 + intValue = 771238189 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("ka") + @ObfuscatedName("kv") @ObfuscatedGetter( - intValue = 1957419163 + intValue = -1731633013 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("kb") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = -1932614367 + intValue = 591102181 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("kj") + @ObfuscatedName("ka") @ObfuscatedGetter( - intValue = 276455063 + intValue = 1965014457 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("kv") - static boolean field601; - @ObfuscatedName("lz") + @ObfuscatedName("kz") + static boolean field767; + @ObfuscatedName("lg") @ObfuscatedGetter( - intValue = -1359218603 + intValue = 1504694891 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("lu") + @ObfuscatedName("lx") @ObfuscatedGetter( - intValue = -763217451 + intValue = -961793091 ) - static int field603; - @ObfuscatedName("lq") + static int field618; + @ObfuscatedName("ln") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ll") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "[Lcw;" + descriptor = "[Lcz;" ) @Export("players") static Player[] players; - @ObfuscatedName("lk") + @ObfuscatedName("li") @ObfuscatedGetter( - intValue = 439770895 + intValue = 911475385 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("lg") + @ObfuscatedName("lq") @ObfuscatedGetter( - intValue = -1383096841 + intValue = -525615991 ) - static int field607; - @ObfuscatedName("ln") + static int field544; + @ObfuscatedName("ll") @ObfuscatedGetter( - longValue = 6514604348113006825L + longValue = 4157369345681014175L ) - static long field608; - @ObfuscatedName("lm") + static long field623; + @ObfuscatedName("lc") @Export("renderSelf") static boolean renderSelf; @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = 171593155 + intValue = -871115459 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("lr") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = -754880113 + intValue = 1054913333 ) - static int field634; - @ObfuscatedName("lp") - static int[] field612; - @ObfuscatedName("lw") + static int field626; + @ObfuscatedName("lo") + static int[] field627; + @ObfuscatedName("lj") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("lv") + @ObfuscatedName("la") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("le") + @ObfuscatedName("ld") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("li") + @ObfuscatedName("lt") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("ld") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 942532963 + intValue = 1885958183 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("lt") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "[[[Lle;" + descriptor = "[[[Lld;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("mp") + @ObfuscatedName("ms") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("mq") + @ObfuscatedName("mr") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("mt") + @ObfuscatedName("mk") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("md") + @ObfuscatedName("mq") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("mj") + @ObfuscatedName("mn") @Export("levels") static int[] levels; - @ObfuscatedName("mr") + @ObfuscatedName("md") @Export("experience") static int[] experience; - @ObfuscatedName("mi") + @ObfuscatedName("me") @ObfuscatedGetter( - intValue = 1375313987 + intValue = -410278811 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("mx") + @ObfuscatedName("ma") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("ml") + @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = -695569243 + intValue = 121755793 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("me") + @ObfuscatedName("my") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("mb") + @ObfuscatedName("mj") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("mk") + @ObfuscatedName("mu") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("mw") + @ObfuscatedName("mf") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("ma") + @ObfuscatedName("mi") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("mu") + @ObfuscatedName("mm") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("mg") + @ObfuscatedName("mc") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("mh") + @ObfuscatedName("mx") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("ms") + @ObfuscatedName("mg") @Export("shiftClickDrop") static boolean shiftClickDrop; @ObfuscatedName("mv") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("mm") + @ObfuscatedName("mw") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("nv") + @ObfuscatedName("np") @ObfuscatedGetter( - intValue = -1871086395 + intValue = -1210803439 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("nt") + @ObfuscatedName("nr") @ObfuscatedGetter( - intValue = -1530402969 + intValue = 119579989 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("np") + @ObfuscatedName("ne") @ObfuscatedGetter( - intValue = 2027210895 + intValue = -1368411589 ) - static int field641; - @ObfuscatedName("nc") + static int field656; + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = -238451065 + intValue = -2015724673 ) - static int field642; - @ObfuscatedName("nq") + static int field657; + @ObfuscatedName("nz") @ObfuscatedGetter( - intValue = -320489825 + intValue = 1419000661 ) @Export("isItemSelected") static int isItemSelected; @@ -1034,357 +1007,357 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { static boolean isSpellSelected; @ObfuscatedName("ni") @ObfuscatedGetter( - intValue = -419489305 + intValue = -1858579497 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("nj") + @ObfuscatedName("ny") @ObfuscatedGetter( - intValue = 913012823 + intValue = -151006751 ) @Export("selectedSpellItemId") static int selectedSpellItemId; - @ObfuscatedName("ny") + @ObfuscatedName("nx") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("nh") + @ObfuscatedName("nd") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("nn") + @ObfuscatedName("nw") @ObfuscatedGetter( - intValue = 1841301513 + intValue = 1632536739 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("nz") + @ObfuscatedName("nu") @ObfuscatedSignature( descriptor = "Lpo;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("nf") + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = 709549119 + intValue = -90975371 ) - static int field652; - @ObfuscatedName("nu") + static int field668; + @ObfuscatedName("nt") @ObfuscatedGetter( - intValue = 773813339 + intValue = -1017961137 ) - static int field653; - @ObfuscatedName("nr") + static int field628; + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = -726450495 + intValue = -1279214155 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("na") + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = -2056870609 + intValue = 1543781551 ) - static int field655; - @ObfuscatedName("od") + static int field524; + @ObfuscatedName("ob") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("os") + @ObfuscatedName("oa") @ObfuscatedGetter( - intValue = 1511589879 + intValue = -1063216989 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("oo") + @ObfuscatedName("om") @ObfuscatedGetter( - intValue = 114871879 + intValue = -749223927 ) @Export("weight") static int weight; - @ObfuscatedName("of") + @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = 245777471 + intValue = -1274512229 ) @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("oi") + static int staffModLevel; + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = -1876332251 + intValue = -1488347039 ) @Export("followerIndex") static int followerIndex; @ObfuscatedName("oe") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("oc") + @ObfuscatedName("oi") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("om") + @ObfuscatedName("oy") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ob") + @ObfuscatedName("ok") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("ox") + @ObfuscatedName("op") @ObfuscatedGetter( - intValue = -113793529 + intValue = -1977634921 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("op") + @ObfuscatedName("on") @ObfuscatedGetter( - intValue = -2043651089 + intValue = 933052317 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("ou") + @ObfuscatedName("oc") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("ol") - static boolean field668; - @ObfuscatedName("oh") + @ObfuscatedName("ot") + static boolean field696; + @ObfuscatedName("oz") @ObfuscatedGetter( - intValue = -1143835253 + intValue = -1107790009 ) - static int field669; + static int field773; + @ObfuscatedName("ou") + @ObfuscatedGetter( + intValue = -754925295 + ) + static int field686; + @ObfuscatedName("ol") + static boolean field687; + @ObfuscatedName("os") + @ObfuscatedGetter( + intValue = -1838827617 + ) + static int field688; @ObfuscatedName("og") @ObfuscatedGetter( - intValue = 22061565 + intValue = 1850811259 ) - static int field628; + static int field757; @ObfuscatedName("oq") - static boolean field671; - @ObfuscatedName("or") - @ObfuscatedGetter( - intValue = 903753461 - ) - static int field596; - @ObfuscatedName("oj") - @ObfuscatedGetter( - intValue = 1998416981 - ) - static int field673; - @ObfuscatedName("oz") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("on") + @ObfuscatedName("ov") @ObfuscatedGetter( - intValue = -1738168199 + intValue = 1092217725 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("pg") + @ObfuscatedName("pu") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("pq") + @ObfuscatedName("pt") @ObfuscatedGetter( - intValue = -1421271391 + intValue = -334272855 ) @Export("changedVarpCount") static int changedVarpCount; @ObfuscatedName("po") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("px") + @ObfuscatedName("pd") @ObfuscatedGetter( - intValue = 1404029533 + intValue = -478615495 ) - static int field746; - @ObfuscatedName("pf") + static int field695; + @ObfuscatedName("pp") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("pa") + @ObfuscatedName("pe") @ObfuscatedGetter( - intValue = 2109604157 + intValue = 2097836455 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("pe") - static int[] field682; - @ObfuscatedName("pr") + @ObfuscatedName("pg") + static int[] field698; + @ObfuscatedName("ph") @ObfuscatedGetter( - intValue = 2129941941 + intValue = 1885131439 ) - static int field683; - @ObfuscatedName("pz") + static int field699; + @ObfuscatedName("pb") @ObfuscatedGetter( - intValue = 1046213047 + intValue = -1111710623 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("ph") + @ObfuscatedName("pn") @ObfuscatedGetter( - intValue = -80976053 + intValue = 1773222505 ) - static int field685; - @ObfuscatedName("ps") - @ObfuscatedGetter( - intValue = -96614403 - ) - static int field726; + static int field701; @ObfuscatedName("pj") @ObfuscatedGetter( - intValue = 1238069005 + intValue = -1118711907 ) - static int field687; - @ObfuscatedName("pk") + static int field702; + @ObfuscatedName("pw") @ObfuscatedGetter( - intValue = -405028691 + intValue = 614772325 ) - static int field749; - @ObfuscatedName("pt") + static int field703; + @ObfuscatedName("pa") @ObfuscatedGetter( - intValue = -1795985535 + intValue = -1232589287 ) - static int field689; - @ObfuscatedName("pi") + static int field755; + @ObfuscatedName("py") @ObfuscatedGetter( - intValue = 514531863 + intValue = -646988223 ) - static int field572; + static int field705; @ObfuscatedName("pc") @ObfuscatedGetter( - intValue = -2000287459 + intValue = 776062487 ) - static int field762; - @ObfuscatedName("pd") + static int field706; + @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = 762274993 + intValue = -409433949 + ) + static int field707; + @ObfuscatedName("pi") + @ObfuscatedGetter( + intValue = 96279785 ) @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("pw") + @ObfuscatedName("pr") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("scriptEvents") static NodeDeque scriptEvents; @ObfuscatedName("pm") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) - static NodeDeque field694; - @ObfuscatedName("pn") + static NodeDeque field710; + @ObfuscatedName("pv") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) - static NodeDeque field695; - @ObfuscatedName("pb") + static NodeDeque field711; + @ObfuscatedName("pq") @ObfuscatedSignature( descriptor = "Lpo;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("qa") + @ObfuscatedName("qr") @ObfuscatedGetter( - intValue = -1183396979 + intValue = -988949017 ) @Export("rootWidgetCount") static int rootWidgetCount; @ObfuscatedName("qf") @ObfuscatedGetter( - intValue = 365020005 + intValue = -398701791 ) - static int field698; - @ObfuscatedName("qk") - static boolean[] field564; - @ObfuscatedName("qm") - static boolean[] field651; - @ObfuscatedName("qh") - static boolean[] field576; - @ObfuscatedName("qs") + static int field540; + @ObfuscatedName("qd") + static boolean[] field715; + @ObfuscatedName("ql") + static boolean[] field716; + @ObfuscatedName("qu") + static boolean[] field717; + @ObfuscatedName("qe") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("qx") + @ObfuscatedName("qq") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("ql") + @ObfuscatedName("qi") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("qb") + @ObfuscatedName("qy") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("qj") + @ObfuscatedName("qx") @ObfuscatedGetter( - intValue = -2080658517 + intValue = 1720526633 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("qo") - @ObfuscatedGetter( - longValue = 4892386005405626473L - ) - static long field529; @ObfuscatedName("qv") + @ObfuscatedGetter( + longValue = 669441914719297349L + ) + static long field601; + @ObfuscatedName("qa") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("qe") - static int[] field709; - @ObfuscatedName("fd") - String field518; - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "Lp;" - ) - class14 field519; - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "Lm;" - ) - class19 field618; + @ObfuscatedName("qo") + static int[] field725; + @ObfuscatedName("fl") + String field564; @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "Ld;" + ) + class14 field622; + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "Lx;" + ) + class19 field690; + @ObfuscatedName("fc") @ObfuscatedSignature( descriptor = "Lcom/jagex/oldscape/pub/OtlTokenRequester;" ) - OtlTokenRequester field544; - @ObfuscatedName("fi") - Future field522; - @ObfuscatedName("gd") + OtlTokenRequester field536; + @ObfuscatedName("fq") + Future field599; + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) - Buffer field525; + Buffer field496; + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "Ll;" + ) + class7 field541; @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "Lf;" - ) - class7 field526; - @ObfuscatedName("gp") @ObfuscatedGetter( - longValue = -4252506564993549717L + longValue = 1413967701067592279L ) - long field658; + long field542; static { - field536 = true; // L: 134 + field490 = true; // L: 134 worldId = 1; // L: 135 worldProperties = 0; // L: 136 gameBuild = 0; // L: 138 isMembersWorld = false; // L: 141 isLowDetail = false; // L: 142 - field484 = -1; // L: 147 + field617 = -1; // L: 147 clientType = -1; // L: 148 - field486 = -1; // L: 149 + field498 = -1; // L: 149 onMobile = false; // L: 150 gameState = 0; // L: 162 isLoading = true; // L: 185 cycle = 0; // L: 186 mouseLastLastPressedTimeMillis = -1L; // L: 187 - field493 = -1; // L: 189 - field494 = -1; // L: 190 - field495 = -1L; // L: 191 + field508 = -1; // L: 189 + field509 = -1; // L: 190 + field510 = -1L; // L: 191 hadFocus = true; // L: 192 rebootTimer = 0; // L: 193 hintArrowType = 0; // L: 194 @@ -1399,44 +1372,44 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { npcAttackOption = AttackOption.AttackOption_hidden; // L: 204 titleLoadingStage = 0; // L: 209 js5ConnectState = 0; // L: 212 - field510 = 0; // L: 213 + field525 = 0; // L: 213 js5Errors = 0; // L: 235 loginState = 0; // L: 237 - field513 = 0; // L: 238 - field742 = 0; // L: 239 - field490 = 0; // L: 240 - field516 = class124.field1510; // L: 241 - field517 = class441.field4672; // L: 242 + field528 = 0; // L: 238 + field661 = 0; // L: 239 + field530 = 0; // L: 240 + field531 = class124.field1495; // L: 241 + field532 = class441.field4678; // L: 242 Login_isUsernameRemembered = false; // L: 261 secureRandomFuture = new SecureRandomFuture(); // L: 262 randomDatData = null; // L: 269 npcs = new NPC[32768]; // L: 273 npcCount = 0; // L: 274 npcIndices = new int[32768]; // L: 275 - field609 = 0; // L: 276 - field533 = new int[250]; // L: 277 + field547 = 0; // L: 276 + field548 = new int[250]; // L: 277 packetWriter = new PacketWriter(); // L: 280 logoutTimer = 0; // L: 282 hadNetworkError = false; // L: 283 useBufferedSocket = true; // L: 284 - field753 = false; // L: 285 + field553 = false; // L: 285 timer = new Timer(); // L: 286 fontsMap = new HashMap(); // L: 292 - field541 = 0; // L: 299 - field558 = 1; // L: 300 - field543 = 0; // L: 301 - field679 = 1; // L: 302 - field545 = 0; // L: 303 + field747 = 0; // L: 299 + field608 = 1; // L: 300 + field558 = 0; // L: 301 + field758 = 1; // L: 302 + field560 = 0; // L: 303 collisionMaps = new CollisionMap[4]; // L: 311 isInInstance = false; // L: 312 instanceChunkTemplates = new int[4][13][13]; // L: 313 - field711 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 314 - field550 = 0; // L: 317 - field619 = 2301979; // L: 329 - field684 = 5063219; // L: 330 - field554 = 3353893; // L: 331 - field514 = 7759444; // L: 332 - field556 = false; // L: 333 + field748 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 314 + field556 = 0; // L: 317 + field566 = 2301979; // L: 329 + field670 = 5063219; // L: 330 + field694 = 3353893; // L: 331 + field740 = 7759444; // L: 332 + field570 = false; // L: 333 alternativeScrollbarWidth = 0; // L: 334 camAngleX = 128; // L: 342 camAngleY = 0; // L: 343 @@ -1446,16 +1419,16 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { mouseCamClickedY = 0; // L: 347 oculusOrbState = 0; // L: 348 camFollowHeight = 50; // L: 349 - field566 = 0; // L: 353 - field567 = 0; // L: 354 - field696 = 0; // L: 355 + field581 = 0; // L: 353 + field590 = 0; // L: 354 + field489 = 0; // L: 355 oculusOrbNormalSpeed = 12; // L: 357 oculusOrbSlowedSpeed = 6; // L: 358 - field571 = 0; // L: 359 - field602 = false; // L: 360 - field542 = 0; // L: 361 - field616 = false; // L: 362 - field756 = 0; // L: 363 + field586 = 0; // L: 359 + field759 = false; // L: 360 + field588 = 0; // L: 361 + field589 = false; // L: 362 + field718 = 0; // L: 363 overheadTextCount = 0; // L: 364 overheadTextLimit = 50; // L: 365 overheadTextXs = new int[overheadTextLimit]; // L: 366 @@ -1475,24 +1448,24 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { mouseCrossState = 0; // L: 380 mouseCrossColor = 0; // L: 381 showMouseCross = true; // L: 382 - field595 = 0; // L: 384 - field741 = 0; // L: 385 + field610 = 0; // L: 384 + field611 = 0; // L: 385 dragItemSlotSource = 0; // L: 388 draggedWidgetX = 0; // L: 389 draggedWidgetY = 0; // L: 390 dragItemSlotDestination = 0; // L: 391 - field601 = false; // L: 392 + field767 = false; // L: 392 itemDragDuration = 0; // L: 393 - field603 = 0; // L: 394 + field618 = 0; // L: 394 showLoadingMessages = true; // L: 396 players = new Player[2048]; // L: 398 localPlayerIndex = -1; // L: 400 - field607 = 0; // L: 401 - field608 = -1L; // L: 402 + field544 = 0; // L: 401 + field623 = -1L; // L: 402 renderSelf = true; // L: 404 drawPlayerNames = 0; // L: 409 - field634 = 0; // L: 410 - field612 = new int[1000]; // L: 411 + field626 = 0; // L: 410 + field627 = new int[1000]; // L: 411 playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 413 playerMenuActions = new String[8]; // L: 414 playerOptionsPriorities = new boolean[8]; // L: 415 @@ -1521,8 +1494,8 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { showMouseOverText = true; // L: 444 viewportX = -1; // L: 445 viewportY = -1; // L: 446 - field641 = 0; // L: 450 - field642 = 50; // L: 451 + field656 = 0; // L: 450 + field657 = 50; // L: 451 isItemSelected = 0; // L: 452 selectedItemName = null; // L: 456 isSpellSelected = false; // L: 457 @@ -1532,10 +1505,10 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { selectedSpellName = null; // L: 463 rootInterface = -1; // L: 464 interfaceParents = new NodeHashTable(8); // L: 465 - field652 = 0; // L: 470 - field653 = -1; // L: 471 + field668 = 0; // L: 470 + field628 = -1; // L: 471 chatEffects = 0; // L: 472 - field655 = 0; // L: 473 + field524 = 0; // L: 473 meslayerContinueWidget = null; // L: 474 runEnergy = 0; // L: 475 weight = 0; // L: 476 @@ -1548,60 +1521,60 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { widgetClickX = 0; // L: 483 widgetClickY = 0; // L: 484 draggedOnWidget = null; // L: 485 - field668 = false; // L: 486 - field669 = -1; // L: 487 - field628 = -1; // L: 488 - field671 = false; // L: 489 - field596 = -1; // L: 490 - field673 = -1; // L: 491 + field696 = false; // L: 486 + field773 = -1; // L: 487 + field686 = -1; // L: 488 + field687 = false; // L: 489 + field688 = -1; // L: 490 + field757 = -1; // L: 491 isDraggingWidget = false; // L: 492 cycleCntr = 1; // L: 497 changedVarps = new int[32]; // L: 500 changedVarpCount = 0; // L: 501 changedItemContainers = new int[32]; // L: 502 - field746 = 0; // L: 503 + field695 = 0; // L: 503 changedSkills = new int[32]; // L: 504 changedSkillsCount = 0; // L: 505 - field682 = new int[32]; // L: 506 - field683 = 0; // L: 507 + field698 = new int[32]; // L: 506 + field699 = 0; // L: 507 chatCycle = 0; // L: 508 - field685 = 0; // L: 509 - field726 = 0; // L: 510 - field687 = 0; // L: 511 - field749 = 0; // L: 512 - field689 = 0; // L: 513 - field572 = 0; // L: 514 - field762 = 0; // L: 515 + field701 = 0; // L: 509 + field702 = 0; // L: 510 + field703 = 0; // L: 511 + field755 = 0; // L: 512 + field705 = 0; // L: 513 + field706 = 0; // L: 514 + field707 = 0; // L: 515 mouseWheelRotation = 0; // L: 521 scriptEvents = new NodeDeque(); // L: 522 - field694 = new NodeDeque(); // L: 523 - field695 = new NodeDeque(); // L: 524 + field710 = new NodeDeque(); // L: 523 + field711 = new NodeDeque(); // L: 524 widgetFlags = new NodeHashTable(512); // L: 525 rootWidgetCount = 0; // L: 527 - field698 = -2; // L: 528 - field564 = new boolean[100]; // L: 529 - field651 = new boolean[100]; // L: 530 - field576 = new boolean[100]; // L: 531 + field540 = -2; // L: 528 + field715 = new boolean[100]; // L: 529 + field716 = new boolean[100]; // L: 530 + field717 = new boolean[100]; // L: 531 rootWidgetXs = new int[100]; // L: 532 rootWidgetYs = new int[100]; // L: 533 rootWidgetWidths = new int[100]; // L: 534 rootWidgetHeights = new int[100]; // L: 535 gameDrawingMode = 0; // L: 536 - field529 = 0L; // L: 537 + field601 = 0L; // L: 537 isResizable = true; // L: 538 - field709 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 545 + field725 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 545 publicChatMode = 0; // L: 546 tradeChatMode = 0; // L: 548 - field712 = ""; // L: 549 + field728 = ""; // L: 549 crossWorldMessageIds = new long[100]; // L: 551 crossWorldMessageIdsIndex = 0; // L: 552 - field713 = 0; // L: 554 - field716 = new int[128]; // L: 555 - field568 = new int[128]; // L: 556 - field718 = -1L; // L: 557 + field731 = 0; // L: 554 + field732 = new int[128]; // L: 555 + field733 = new int[128]; // L: 556 + field585 = -1L; // L: 557 currentClanSettings = new ClanSettings[3]; // L: 561 currentClanChannels = new ClanChannel[3]; // L: 563 - field721 = -1; // L: 565 + field714 = -1; // L: 565 mapIconCount = 0; // L: 566 mapIconXs = new int[1000]; // L: 567 mapIconYs = new int[1000]; // L: 568 @@ -1610,7 +1583,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { destinationY = 0; // L: 571 minimapState = 0; // L: 578 currentTrackGroupId = -1; // L: 579 - field731 = false; // L: 580 + field746 = false; // L: 580 soundEffectCount = 0; // L: 586 soundEffectIds = new int[50]; // L: 587 queuedSoundEffectLoops = new int[50]; // L: 588 @@ -1618,4335 +1591,4453 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { soundLocations = new int[50]; // L: 590 soundEffects = new SoundEffect[50]; // L: 591 isCameraLocked = false; // L: 593 - field739 = false; // L: 604 - field740 = new boolean[5]; // L: 612 - field482 = new int[5]; // L: 613 - field549 = new int[5]; // L: 614 - field766 = new int[5]; // L: 615 - field744 = new int[5]; // L: 616 - field745 = 256; // L: 617 - field706 = 205; // L: 618 + field754 = false; // L: 604 + field546 = new boolean[5]; // L: 612 + field756 = new int[5]; // L: 613 + field636 = new int[5]; // L: 614 + field674 = new int[5]; // L: 615 + field600 = new int[5]; // L: 616 + field760 = 256; // L: 617 + field761 = 205; // L: 618 zoomHeight = 256; // L: 619 zoomWidth = 320; // L: 620 - field562 = 1; // L: 621 - field750 = 32767; // L: 622 - field751 = 1; // L: 623 - field752 = 32767; // L: 624 + field764 = 1; // L: 621 + field765 = 32767; // L: 622 + field766 = 1; // L: 623 + field666 = 32767; // L: 624 viewportOffsetX = 0; // L: 625 viewportOffsetY = 0; // L: 626 viewportWidth = 0; // L: 627 viewportHeight = 0; // L: 628 viewportZoom = 0; // L: 629 playerAppearance = new PlayerComposition(); // L: 631 - field759 = -1; // L: 632 - field738 = -1; // L: 633 + field561 = -1; // L: 632 + field775 = -1; // L: 633 platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 635 grandExchangeOffers = new GrandExchangeOffer[8]; // L: 637 GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 640 - field764 = -1; // L: 647 + field779 = -1; // L: 647 archiveLoaders = new ArrayList(10); // L: 648 archiveLoadersDone = 0; // L: 649 - field767 = 0; // L: 650 - field477 = new ApproximateRouteStrategy(); // L: 659 - field743 = new int[50]; // L: 660 - field670 = new int[50]; // L: 661 + field782 = 0; // L: 650 + field783 = new ApproximateRouteStrategy(); // L: 659 + field784 = new int[50]; // L: 660 + field785 = new int[50]; // L: 661 } public Client() { - this.field658 = -1L; // L: 267 - } + this.field542 = -1L; // L: 267 + } // L: 12725 - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1462606142" ) @Export("resizeGame") protected final void resizeGame() { - field529 = WorldMapSprite.method4989() + 500L; // L: 3947 - this.resizeJS(); // L: 3948 - if (rootInterface != -1) { // L: 3949 + field601 = class136.method2931() + 500L; // L: 4285 + this.resizeJS(); // L: 4286 + if (rootInterface != -1) { // L: 4287 this.resizeRoot(true); } - } // L: 3950 + } // L: 4288 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "120" + descriptor = "(I)V", + garbageValue = "1665364684" ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; // L: 924 - int[] var2 = new int[]{1000, 100, 500}; // L: 925 - if (var1 != null && var2 != null) { // L: 927 - ByteArrayPool.ByteArrayPool_alternativeSizes = var1; // L: 940 - GameObject.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 941 - ScriptEvent.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 942 + ArchiveLoader.method2061(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 831 + SecureRandomFuture.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 832 + UserComparator9.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 833 + class329.currentPort = SecureRandomFuture.worldPort; // L: 834 + PlayerComposition.field3304 = class293.field3308; // L: 835 + class144.field1629 = class293.field3309; // L: 836 + WorldMapIcon_0.field2300 = class293.field3310; // L: 837 + WorldMapRectangle.field2356 = class293.field3312; // L: 838 + VerticalAlignment.urlRequester = new class101(); // L: 839 + this.setUpKeyboard(); // L: 840 + this.method428(); // L: 841 + MenuAction.mouseWheel = this.mouseWheel(); // L: 842 + class182.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 843 + class131.clientPreferences = AbstractWorldMapData.method4344(); // L: 844 + this.setUpClipboard(); // L: 845 + ModelData0.method5093(this, class193.field2189); // L: 846 + class131.setWindowedMode(class131.clientPreferences.method2251()); // L: 847 + Decimator.friendSystem = new FriendSystem(class122.loginType); // L: 848 + this.field622 = new class14("tokenRequest", 1, 1); // L: 849 + } // L: 850 - for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 943 - ScriptEvent.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 944 - ByteArrayPool.field4173.add(var1[var3]); // L: 945 - } - - Collections.sort(ByteArrayPool.field4173); // L: 947 - } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 928 - GameObject.ByteArrayPool_altSizeArrayCounts = null; // L: 929 - ScriptEvent.ByteArrayPool_arrays = null; // L: 930 - ByteArrayPool.field4173.clear(); // L: 932 - ByteArrayPool.field4173.add(100); // L: 933 - ByteArrayPool.field4173.add(5000); // L: 934 - ByteArrayPool.field4173.add(10000); // L: 935 - ByteArrayPool.field4173.add(30000); // L: 936 - } - - class101.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 949 - BuddyRankComparator.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 950 - ItemContainer.currentPort = class101.worldPort; // L: 951 - TileItem.field1281 = class293.field3323; // L: 952 - class20.field102 = class293.field3321; // L: 953 - VerticalAlignment.field1950 = class293.field3320; // L: 954 - class160.field1747 = class293.field3326; // L: 955 - UserComparator9.urlRequester = new class101(); // L: 956 - this.setUpKeyboard(); // L: 957 - this.method534(); // L: 958 - class18.mouseWheel = this.mouseWheel(); // L: 959 - PcmPlayer.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 960 - Interpreter.clientPreferences = class349.method6537(); // L: 961 - this.setUpClipboard(); // L: 962 - String var4 = ModeWhere.field4087; // L: 964 - class29.field168 = this; // L: 966 - if (var4 != null) { // L: 967 - class29.field169 = var4; - } - - UserComparator6.setWindowedMode(Interpreter.clientPreferences.method2317()); // L: 969 - class155.friendSystem = new FriendSystem(class83.loginType); // L: 970 - this.field519 = new class14("tokenRequest", 1, 1); // L: 971 - } // L: 972 - - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "612160698" ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 976 - this.doCycleJs5(); // L: 977 - Canvas.method391(); // L: 978 - class126.method2819(); // L: 979 - MouseHandler.playPcmPlayers(); // L: 980 - synchronized(KeyHandler.KeyHandler_instance) { // L: 982 - ++KeyHandler.KeyHandler_idleCycles; // L: 983 - KeyHandler.field135 = KeyHandler.field137; // L: 984 - KeyHandler.field132 = 0; // L: 985 - KeyHandler.field134 = 0; // L: 986 - Arrays.fill(KeyHandler.field121, false); // L: 987 - Arrays.fill(KeyHandler.field125, false); // L: 988 - if (KeyHandler.field124 < 0) { // L: 989 - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 990 - KeyHandler.field124 = KeyHandler.field138; // L: 991 - } else { - while (KeyHandler.field138 != KeyHandler.field124) { // L: 994 - int var2 = KeyHandler.field129[KeyHandler.field138]; // L: 995 - KeyHandler.field138 = KeyHandler.field138 + 1 & 127; // L: 996 - if (var2 < 0) { // L: 997 - var2 = ~var2; // L: 998 - if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 999 - KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 1000 - KeyHandler.field125[var2] = true; // L: 1001 - KeyHandler.field133[KeyHandler.field134] = var2; // L: 1002 - ++KeyHandler.field134; // L: 1003 - } - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field132 < KeyHandler.field139.length - 1) { // L: 1007 - KeyHandler.field121[var2] = true; // L: 1008 - KeyHandler.field139[++KeyHandler.field132 - 1] = var2; // L: 1009 - } + ++cycle; // L: 853 + this.doCycleJs5(); // L: 854 - KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 1011 + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 858 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 859 + } // L: 860 + + if (var1 == null) { // L: 861 + int var5; + try { + if (class273.musicPlayerStatus == 1) { // L: 867 + var5 = class273.midiPcmStream.method5264(); // L: 868 + if (var5 > 0 && class273.midiPcmStream.isReady()) { // L: 869 + var5 -= class273.pcmSampleLength; // L: 870 + if (var5 < 0) { // L: 871 + var5 = 0; + } + + class273.midiPcmStream.setPcmStreamVolume(var5); // L: 872 + } else { + class273.midiPcmStream.clear(); // L: 875 + class273.midiPcmStream.removeAll(); // L: 876 + if (class273.musicTrackArchive != null) { // L: 877 + class273.musicPlayerStatus = 2; + } else { + class273.musicPlayerStatus = 0; // L: 878 + } + + ArchiveDiskActionHandler.musicTrack = null; // L: 879 + class152.soundCache = null; // L: 880 + } } + } catch (Exception var9) { // L: 883 + var9.printStackTrace(); // L: 884 + class273.midiPcmStream.clear(); // L: 885 + class273.musicPlayerStatus = 0; // L: 886 + ArchiveDiskActionHandler.musicTrack = null; // L: 887 + class152.soundCache = null; // L: 888 + class273.musicTrackArchive = null; // L: 889 } + + class116.playPcmPlayers(); // L: 892 + synchronized(KeyHandler.KeyHandler_instance) { // L: 894 + ++KeyHandler.KeyHandler_idleCycles; // L: 895 + KeyHandler.field141 = KeyHandler.field138; // L: 896 + KeyHandler.field118 = 0; // L: 897 + KeyHandler.field132 = 0; // L: 898 + Arrays.fill(KeyHandler.field140, false); // L: 899 + Arrays.fill(KeyHandler.field131, false); // L: 900 + if (KeyHandler.field128 < 0) { // L: 901 + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 902 + KeyHandler.field128 = KeyHandler.field133; // L: 903 + } else { + while (KeyHandler.field128 != KeyHandler.field133) { // L: 906 + int var6 = KeyHandler.field145[KeyHandler.field133]; // L: 907 + KeyHandler.field133 = KeyHandler.field133 + 1 & 127; // L: 908 + if (var6 < 0) { // L: 909 + var6 = ~var6; // L: 910 + if (KeyHandler.KeyHandler_pressedKeys[var6]) { // L: 911 + KeyHandler.KeyHandler_pressedKeys[var6] = false; // L: 912 + KeyHandler.field131[var6] = true; // L: 913 + KeyHandler.field139[KeyHandler.field132] = var6; // L: 914 + ++KeyHandler.field132; // L: 915 + } + } else { + if (!KeyHandler.KeyHandler_pressedKeys[var6] && KeyHandler.field118 < KeyHandler.field143.length - 1) { // L: 919 + KeyHandler.field140[var6] = true; // L: 920 + KeyHandler.field143[++KeyHandler.field118 - 1] = var6; // L: 921 + } + + KeyHandler.KeyHandler_pressedKeys[var6] = true; // L: 923 + } + } + } + + if (KeyHandler.field118 > 0) { // L: 927 + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field138 = KeyHandler.field142; // L: 928 + } + + HealthBarDefinition.method3473(); // L: 931 + if (MenuAction.mouseWheel != null) { // L: 932 + var5 = MenuAction.mouseWheel.useRotation(); // L: 933 + mouseWheelRotation = var5; // L: 934 + } + + if (gameState == 0) { // L: 936 + Archive.load(); // L: 937 + UserComparator9.method2619(); // L: 938 + } else if (gameState == 5) { // L: 940 + class360.method6592(this, class13.fontPlain12); // L: 941 + Archive.load(); // L: 942 + UserComparator9.method2619(); // L: 943 + } else if (gameState != 10 && gameState != 11) { // L: 945 + if (gameState == 20) { // L: 946 + class360.method6592(this, class13.fontPlain12); // L: 947 + this.doCycleLoggedOut(); // L: 948 + } else if (gameState == 50) { // L: 950 + class360.method6592(this, class13.fontPlain12); // L: 951 + this.doCycleLoggedOut(); // L: 952 + } else if (gameState == 25) { // L: 954 + FriendSystem.method1715(); + } + } else { + class360.method6592(this, class13.fontPlain12); + } + + if (gameState == 30) { // L: 955 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 956 + this.doCycleLoggedOut(); + } + + return; // L: 957 } - if (KeyHandler.field132 > 0) { // L: 1015 - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field137 = KeyHandler.field136; // L: 1016 + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 862 } + } - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 1022 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 1025 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 1028 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 1029 - } // L: 1030 - - if (class18.mouseWheel != null) { // L: 1032 - int var5 = class18.mouseWheel.useRotation(); // L: 1033 - mouseWheelRotation = var5; // L: 1034 - } - - if (gameState == 0) { // L: 1036 - HorizontalAlignment.load(); // L: 1037 - class78.method2098(); // L: 1038 - } else if (gameState == 5) { // L: 1040 - class194.method3894(this, ViewportMouse.fontPlain12); // L: 1041 - HorizontalAlignment.load(); // L: 1042 - class78.method2098(); // L: 1043 - } else if (gameState != 10 && gameState != 11) { // L: 1045 - if (gameState == 20) { // L: 1046 - class194.method3894(this, ViewportMouse.fontPlain12); // L: 1047 - this.doCycleLoggedOut(); // L: 1048 - } else if (gameState == 50) { // L: 1050 - class194.method3894(this, ViewportMouse.fontPlain12); // L: 1051 - this.doCycleLoggedOut(); // L: 1052 - } else if (gameState == 25) { // L: 1054 - DirectByteArrayCopier.method5546(); - } - } else { - class194.method3894(this, ViewportMouse.fontPlain12); - } - - if (gameState == 30) { // L: 1055 - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 1056 - this.doCycleLoggedOut(); - } - - } // L: 1057 - - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1683905481" + descriptor = "(ZS)V", + garbageValue = "-8708" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2 = class356.method6621(); // L: 1061 - if (var2 && field731 && class290.pcmPlayer0 != null) { // L: 1062 1063 - class290.pcmPlayer0.tryDiscard(); + boolean var2; + label175: { + try { + if (class273.musicPlayerStatus == 2) { // L: 963 + if (ArchiveDiskActionHandler.musicTrack == null) { // L: 964 + ArchiveDiskActionHandler.musicTrack = MusicTrack.readTrack(class273.musicTrackArchive, AccessFile.musicTrackGroupId, class273.musicTrackFileId); // L: 965 + if (ArchiveDiskActionHandler.musicTrack == null) { // L: 966 + var2 = false; // L: 967 + break label175; + } + } + + if (class152.soundCache == null) { // L: 971 + class152.soundCache = new SoundCache(class273.soundEffectsArchive, class273.musicSamplesArchive); + } + + if (class273.midiPcmStream.loadMusicTrack(ArchiveDiskActionHandler.musicTrack, class273.musicPatchesArchive, class152.soundCache, 22050)) { // L: 972 + class273.midiPcmStream.clearAll(); // L: 973 + class273.midiPcmStream.setPcmStreamVolume(class273.musicTrackVolume); // L: 974 + class273.midiPcmStream.setMusicTrack(ArchiveDiskActionHandler.musicTrack, class17.musicTrackBoolean); // L: 975 + class273.musicPlayerStatus = 0; // L: 976 + ArchiveDiskActionHandler.musicTrack = null; // L: 977 + class152.soundCache = null; // L: 978 + class273.musicTrackArchive = null; // L: 979 + var2 = true; // L: 980 + break label175; + } + } + } catch (Exception var6) { // L: 985 + var6.printStackTrace(); // L: 986 + class273.midiPcmStream.clear(); // L: 987 + class273.musicPlayerStatus = 0; // L: 988 + ArchiveDiskActionHandler.musicTrack = null; // L: 989 + class152.soundCache = null; // L: 990 + class273.musicTrackArchive = null; // L: 991 + } + + var2 = false; // L: 993 } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field529 != 0L && WorldMapSprite.method4989() > field529) { // L: 1065 1066 - UserComparator6.setWindowedMode(ReflectionCheck.getWindowedMode()); // L: 1067 + if (var2 && field746 && KeyHandler.pcmPlayer0 != null) { // L: 996 997 + KeyHandler.pcmPlayer0.tryDiscard(); } - int var3; - if (var1) { // L: 1070 - for (var3 = 0; var3 < 100; ++var3) { // L: 1071 - field564[var3] = true; + if ((gameState == 10 || gameState == 20 || gameState == 30) && field601 != 0L && class136.method2931() > field601) { // L: 999 1000 + class131.setWindowedMode(getWindowedMode()); // L: 1001 + } + + int var4; + if (var1) { // L: 1004 + for (var4 = 0; var4 < 100; ++var4) { // L: 1005 + field715[var4] = true; } } - if (gameState == 0) { // L: 1073 + if (gameState == 0) { // L: 1007 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 1074 - class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 1075 - if (gameState == 20) { // L: 1076 - class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); - } else if (gameState == 50) { // L: 1077 - class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); - } else if (gameState == 25) { // L: 1078 - if (field545 == 1) { // L: 1079 - if (field541 > field558) { // L: 1080 - field558 = field541; + } else if (gameState == 5) { // L: 1008 + class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1009 + if (gameState == 20) { // L: 1010 + class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); + } else if (gameState == 50) { // L: 1011 + class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); + } else if (gameState == 25) { // L: 1012 + if (field560 == 1) { // L: 1013 + if (field747 > field608) { // L: 1014 + field608 = field747; } - var3 = (field558 * 50 - field541 * 50) / field558; // L: 1081 - class119.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1082 - } else if (field545 == 2) { // L: 1084 - if (field543 > field679) { // L: 1085 - field679 = field543; + var4 = (field608 * 50 - field747 * 50) / field608; // L: 1015 + MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1016 + } else if (field560 == 2) { // L: 1018 + if (field558 > field758) { // L: 1019 + field758 = field558; } - var3 = (field679 * 50 - field543 * 50) / field679 + 50; // L: 1086 - class119.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1087 + var4 = (field758 * 50 - field558 * 50) / field758 + 50; // L: 1020 + MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1021 } else { - class119.drawLoadingMessage("Loading - please wait.", false); // L: 1089 + MusicPatch.drawLoadingMessage("Loading - please wait.", false); // L: 1023 } - } else if (gameState == 30) { // L: 1091 + } else if (gameState == 30) { // L: 1025 this.drawLoggedIn(); - } else if (gameState == 40) { // L: 1092 - class119.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 1093 - class119.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 1026 + MusicPatch.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1027 + MusicPatch.drawLoadingMessage("Please wait...", false); } } else { - class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); // L: 1083 + class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1094 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1095 - if (field651[var3]) { // L: 1096 - SpotAnimationDefinition.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1097 - field651[var3] = false; // L: 1098 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1028 + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1029 + if (field716[var4]) { // L: 1030 + FontName.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1031 + field716[var4] = false; // L: 1032 } } - } else if (gameState > 0) { // L: 1102 - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 1103 + } else if (gameState > 0) { // L: 1036 + FontName.rasterProvider.drawFull(0, 0); // L: 1037 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1104 - field651[var3] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1038 + field716[var4] = false; } } - } // L: 1106 + } // L: 1040 - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2114912088" + garbageValue = "-1364313232" ) @Export("kill0") protected final void kill0() { - if (JagexCache.varcs.hasUnwrittenChanges()) { // L: 1109 - JagexCache.varcs.write(); + if (class160.varcs.hasUnwrittenChanges()) { // L: 1043 + class160.varcs.write(); } - if (BuddyRankComparator.mouseRecorder != null) { // L: 1110 - BuddyRankComparator.mouseRecorder.isRunning = false; + if (class120.mouseRecorder != null) { // L: 1044 + class120.mouseRecorder.isRunning = false; } - BuddyRankComparator.mouseRecorder = null; // L: 1111 - packetWriter.close(); // L: 1112 - if (KeyHandler.KeyHandler_instance != null) { // L: 1114 - synchronized(KeyHandler.KeyHandler_instance) { // L: 1115 - KeyHandler.KeyHandler_instance = null; // L: 1116 - } // L: 1117 + class120.mouseRecorder = null; // L: 1045 + packetWriter.close(); // L: 1046 + class205.method4256(); // L: 1047 + class116.method2705(); // L: 1048 + MenuAction.mouseWheel = null; // L: 1049 + if (KeyHandler.pcmPlayer0 != null) { // L: 1050 + KeyHandler.pcmPlayer0.shutdown(); } - class160.method3237(); // L: 1120 - class18.mouseWheel = null; // L: 1121 - if (class290.pcmPlayer0 != null) { // L: 1122 - class290.pcmPlayer0.shutdown(); + if (ViewportMouse.pcmPlayer1 != null) { // L: 1051 + ViewportMouse.pcmPlayer1.shutdown(); } - if (class182.pcmPlayer1 != null) { // L: 1123 - class182.pcmPlayer1.shutdown(); + if (NetCache.NetCache_socket != null) { // L: 1053 + NetCache.NetCache_socket.close(); } - class309.method5804(); // L: 1124 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1126 - if (ArchiveDiskActionHandler.field3940 != 0) { // L: 1127 - ArchiveDiskActionHandler.field3940 = 1; // L: 1128 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1056 + if (ArchiveDiskActionHandler.field3945 != 0) { // L: 1057 + ArchiveDiskActionHandler.field3945 = 1; // L: 1058 try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1130 - } catch (InterruptedException var4) { // L: 1132 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1060 + } catch (InterruptedException var4) { // L: 1062 } } } - if (UserComparator9.urlRequester != null) { // L: 1136 - UserComparator9.urlRequester.close(); // L: 1137 - UserComparator9.urlRequester = null; // L: 1138 + if (VerticalAlignment.urlRequester != null) { // L: 1066 + VerticalAlignment.urlRequester.close(); // L: 1067 + VerticalAlignment.urlRequester = null; // L: 1068 } - World.method1655(); // L: 1140 - this.field519.method178(); // L: 1141 - } // L: 1142 + FriendLoginUpdate.method6685(); // L: 1070 + this.field622.method167(); // L: 1071 + } // L: 1072 - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "14" + descriptor = "(I)V", + garbageValue = "111435525" ) - protected final void vmethod1135() { + protected final void vmethod1140() { } // L: 668 - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1620120590" - ) - boolean method1138() { - return AbstractWorldMapData.field2796 != null && !AbstractWorldMapData.field2796.trim().isEmpty(); // L: 903 - } - @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "34" + descriptor = "(I)Z", + garbageValue = "104545398" ) - boolean method1139() { - return this.field544 != null; // L: 907 + boolean method1532() { + return class360.field4209 != null && !class360.field4209.trim().isEmpty(); // L: 811 } - @ObfuscatedName("es") + @ObfuscatedName("eh") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "42" + ) + boolean method1476() { + return this.field536 != null; // L: 815 + } + + @ObfuscatedName("ev") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "70" + garbageValue = "20" ) - void method1146(String var1) throws MalformedURLException, IOException { - URL var2 = new URL(class124.field1518 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 911 - OtlTokenRequester var3 = this.field544; // L: 912 - if (var3 != null) { // L: 913 - this.field522 = var3.request(var2); // L: 914 + void method1366(String var1) throws MalformedURLException, IOException { + URL var2 = new URL(class113.field1372 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 819 + OtlTokenRequester var3 = this.field536; // L: 820 + if (var3 != null) { // L: 821 + this.field599 = var3.request(var2); // L: 822 } else { - class10 var4 = new class10(var2, class9.field44); // L: 917 - var4.method87("Authorization", "Bearer " + var1); // L: 918 - this.field618 = this.field519.method180(var4); // L: 919 + class10 var4 = new class10(var2, class9.field37); // L: 825 + var4.method77("Authorization", "Bearer " + var1); // L: 826 + this.field690 = this.field622.method166(var4); // L: 827 } - } // L: 915 920 + } // L: 823 828 - @ObfuscatedName("eg") + @ObfuscatedName("fp") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1743294306" + garbageValue = "-2117459446" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1191 - boolean var1 = class65.method1875(); // L: 1192 - if (!var1) { // L: 1193 + if (gameState != 1000) { // L: 1117 + long var2 = class136.method2931(); // L: 1120 + int var4 = (int)(var2 - NetCache.field3982); // L: 1121 + NetCache.field3982 = var2; // L: 1122 + if (var4 > 200) { // L: 1123 + var4 = 200; + } + + NetCache.NetCache_loadTime += var4; // L: 1124 + boolean var1; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1125 + var1 = true; // L: 1126 + } else if (NetCache.NetCache_socket == null) { // L: 1129 + var1 = false; // L: 1130 + } else { + try { + label243: { + if (NetCache.NetCache_loadTime > 30000) { // L: 1134 + throw new IOException(); + } + + NetFileRequest var5; + Buffer var6; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1135 + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1136 + var6 = new Buffer(4); // L: 1137 + var6.writeByte(1); // L: 1138 + var6.writeMedium((int)var5.key); // L: 1139 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1140 + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1141 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 1142 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1143 + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1145 + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1146 + var6 = new Buffer(4); // L: 1147 + var6.writeByte(0); // L: 1148 + var6.writeMedium((int)var5.key); // L: 1149 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1150 + var5.removeDual(); // L: 1151 + NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1152 + --NetCache.NetCache_pendingWritesCount; // L: 1153 + ++NetCache.NetCache_pendingResponsesCount; // L: 1154 + } + + for (int var17 = 0; var17 < 100; ++var17) { // L: 1156 + int var18 = NetCache.NetCache_socket.available(); // L: 1157 + if (var18 < 0) { // L: 1158 + throw new IOException(); + } + + if (var18 == 0) { // L: 1159 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 1160 + byte var7 = 0; // L: 1161 + if (class271.NetCache_currentResponse == null) { // L: 1162 + var7 = 8; + } else if (NetCache.field3995 == 0) { // L: 1163 + var7 = 1; + } + + int var8; + int var9; + int var10; + int var12; + byte[] var10000; + int var10001; + Buffer var25; + if (var7 > 0) { // L: 1164 + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1165 + if (var8 > var18) { // L: 1166 + var8 = var18; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1167 + if (NetCache.field3998 != 0) { // L: 1168 + for (var9 = 0; var9 < var8; ++var9) { // L: 1169 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var9; + var10000[var10001] ^= NetCache.field3998; + } + } + + var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1171 + var25.offset += var8; + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1172 + break; + } + + if (class271.NetCache_currentResponse == null) { // L: 1173 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1174 + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1175 + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1176 + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1177 + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1178 + long var13 = (long)(var10 + (var9 << 16)); // L: 1179 + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1180 + Coord.field3289 = true; // L: 1181 + if (var15 == null) { // L: 1182 + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1183 + Coord.field3289 = false; // L: 1184 + } + + if (var15 == null) { // L: 1186 + throw new IOException(); // L: 1187 + } + + int var16 = var11 == 0 ? 5 : 9; // L: 1189 + class271.NetCache_currentResponse = var15; // L: 1190 + class194.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + class271.NetCache_currentResponse.padding); // L: 1191 + class194.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1192 + class194.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1193 + NetCache.field3995 = 8; // L: 1194 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1195 + } else if (NetCache.field3995 == 0) { // L: 1198 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1199 + NetCache.field3995 = 1; // L: 1200 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1201 + } else { + class271.NetCache_currentResponse = null; // L: 1205 + } + } + } else { + var8 = class194.NetCache_responseArchiveBuffer.array.length - class271.NetCache_currentResponse.padding; // L: 1211 + var9 = 512 - NetCache.field3995; // L: 1212 + if (var9 > var8 - class194.NetCache_responseArchiveBuffer.offset) { // L: 1213 + var9 = var8 - class194.NetCache_responseArchiveBuffer.offset; + } + + if (var9 > var18) { // L: 1214 + var9 = var18; + } + + NetCache.NetCache_socket.read(class194.NetCache_responseArchiveBuffer.array, class194.NetCache_responseArchiveBuffer.offset, var9); // L: 1215 + if (NetCache.field3998 != 0) { // L: 1216 + for (var10 = 0; var10 < var9; ++var10) { // L: 1217 + var10000 = class194.NetCache_responseArchiveBuffer.array; + var10001 = class194.NetCache_responseArchiveBuffer.offset + var10; + var10000[var10001] ^= NetCache.field3998; + } + } + + var25 = class194.NetCache_responseArchiveBuffer; // L: 1219 + var25.offset += var9; + NetCache.field3995 += var9; // L: 1220 + if (var8 == class194.NetCache_responseArchiveBuffer.offset) { // L: 1221 + if (16711935L == class271.NetCache_currentResponse.key) { // L: 1222 + Huffman.NetCache_reference = class194.NetCache_responseArchiveBuffer; // L: 1223 + + for (var10 = 0; var10 < 256; ++var10) { // L: 1224 + Archive var19 = NetCache.NetCache_archives[var10]; // L: 1225 + if (var19 != null) { // L: 1226 + Huffman.NetCache_reference.offset = var10 * 8 + 5; // L: 1227 + var12 = Huffman.NetCache_reference.readInt(); // L: 1228 + int var20 = Huffman.NetCache_reference.readInt(); // L: 1229 + var19.loadIndex(var12, var20); // L: 1230 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 1235 + NetCache.NetCache_crc.update(class194.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1236 + var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1237 + if (var10 != class271.NetCache_currentResponse.crc) { // L: 1238 + try { + NetCache.NetCache_socket.close(); // L: 1240 + } catch (Exception var23) { // L: 1242 + } + + ++NetCache.NetCache_crcMismatches; // L: 1243 + NetCache.NetCache_socket = null; // L: 1244 + NetCache.field3998 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1245 + var1 = false; // L: 1246 + break label243; + } + + NetCache.NetCache_crcMismatches = 0; // L: 1249 + NetCache.NetCache_ioExceptions = 0; // L: 1250 + class271.NetCache_currentResponse.archive.write((int)(class271.NetCache_currentResponse.key & 65535L), class194.NetCache_responseArchiveBuffer.array, (class271.NetCache_currentResponse.key & 16711680L) == 16711680L, Coord.field3289); // L: 1251 + } + + class271.NetCache_currentResponse.remove(); // L: 1253 + if (Coord.field3289) { // L: 1254 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 1255 + } + + NetCache.field3995 = 0; // L: 1256 + class271.NetCache_currentResponse = null; // L: 1257 + class194.NetCache_responseArchiveBuffer = null; // L: 1258 + } else { + if (NetCache.field3995 != 512) { // L: 1260 + break; + } + + NetCache.field3995 = 0; + } + } + } + + var1 = true; // L: 1264 + } + } catch (IOException var24) { + try { + NetCache.NetCache_socket.close(); // L: 1268 + } catch (Exception var22) { // L: 1270 + } + + ++NetCache.NetCache_ioExceptions; // L: 1271 + NetCache.NetCache_socket = null; // L: 1272 + var1 = false; // L: 1273 + } + } + + if (!var1) { // L: 1277 this.doCycleJs5Connect(); } } - } // L: 1194 + } // L: 1278 - @ObfuscatedName("et") + @ObfuscatedName("fo") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1720635301" + garbageValue = "-49490538" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1197 - this.error("js5crc"); // L: 1198 - InterfaceParent.updateGameState(1000); // L: 1199 + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1281 + this.error("js5crc"); // L: 1282 + Decimator.updateGameState(1000); // L: 1283 } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1202 - if (gameState <= 5) { // L: 1203 - this.error("js5io"); // L: 1204 - InterfaceParent.updateGameState(1000); // L: 1205 - return; // L: 1206 + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1286 + if (gameState <= 5) { // L: 1287 + this.error("js5io"); // L: 1288 + Decimator.updateGameState(1000); // L: 1289 + return; // L: 1290 } - field510 = 3000; // L: 1209 - NetCache.NetCache_ioExceptions = 3; // L: 1210 + field525 = 3000; // L: 1293 + NetCache.NetCache_ioExceptions = 3; // L: 1294 } - if (--field510 + 1 <= 0) { // L: 1213 + if (--field525 + 1 <= 0) { // L: 1297 try { - if (js5ConnectState == 0) { // L: 1215 - class194.js5SocketTask = class434.taskHandler.newSocketTask(GrandExchangeOfferOwnWorldComparator.worldHost, ItemContainer.currentPort); // L: 1216 - ++js5ConnectState; // L: 1217 + if (js5ConnectState == 0) { // L: 1299 + VerticalAlignment.js5SocketTask = GameEngine.taskHandler.newSocketTask(class17.worldHost, class329.currentPort); // L: 1300 + ++js5ConnectState; // L: 1301 } - if (js5ConnectState == 1) { // L: 1219 - if (class194.js5SocketTask.status == 2) { // L: 1220 - this.js5Error(-1); // L: 1221 - return; // L: 1222 + if (js5ConnectState == 1) { // L: 1303 + if (VerticalAlignment.js5SocketTask.status == 2) { // L: 1304 + this.js5Error(-1); // L: 1305 + return; // L: 1306 } - if (class194.js5SocketTask.status == 1) { // L: 1224 + if (VerticalAlignment.js5SocketTask.status == 1) { // L: 1308 ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 1226 - if (useBufferedSocket) { // L: 1227 - Socket var2 = (Socket)class194.js5SocketTask.result; // L: 1229 - BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1231 - ApproximateRouteStrategy.js5Socket = var1; // L: 1233 + if (js5ConnectState == 2) { // L: 1310 + if (useBufferedSocket) { // L: 1311 + Socket var2 = (Socket)VerticalAlignment.js5SocketTask.result; // L: 1313 + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1315 + Decimator.js5Socket = var1; // L: 1317 } else { - ApproximateRouteStrategy.js5Socket = new NetSocket((Socket)class194.js5SocketTask.result, class434.taskHandler, 5000); // L: 1236 + Decimator.js5Socket = new NetSocket((Socket)VerticalAlignment.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1320 } - Buffer var11 = new Buffer(5); // L: 1238 - var11.writeByte(15); // L: 1239 - var11.writeInt(204); // L: 1240 - ApproximateRouteStrategy.js5Socket.write(var11.array, 0, 5); // L: 1241 - ++js5ConnectState; // L: 1242 - class29.field165 = WorldMapSprite.method4989(); // L: 1243 + Buffer var13 = new Buffer(5); // L: 1322 + var13.writeByte(15); // L: 1323 + var13.writeInt(204); // L: 1324 + Decimator.js5Socket.write(var13.array, 0, 5); // L: 1325 + ++js5ConnectState; // L: 1326 + KeyHandler.field149 = class136.method2931(); // L: 1327 } - if (js5ConnectState == 3) { // L: 1245 - if (ApproximateRouteStrategy.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1246 - int var5 = ApproximateRouteStrategy.js5Socket.readUnsignedByte(); // L: 1247 - if (var5 != 0) { // L: 1248 - this.js5Error(var5); // L: 1249 - return; // L: 1250 + if (js5ConnectState == 3) { // L: 1329 + if (Decimator.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1330 + int var5 = Decimator.js5Socket.readUnsignedByte(); // L: 1331 + if (var5 != 0) { // L: 1332 + this.js5Error(var5); // L: 1333 + return; // L: 1334 } - ++js5ConnectState; // L: 1252 - } else if (WorldMapSprite.method4989() - class29.field165 > 30000L) { // L: 1255 - this.js5Error(-2); // L: 1256 - return; // L: 1257 + ++js5ConnectState; // L: 1336 + } else if (class136.method2931() - KeyHandler.field149 > 30000L) { // L: 1339 + this.js5Error(-2); // L: 1340 + return; // L: 1341 } } - if (js5ConnectState == 4) { // L: 1261 - AbstractSocket var12 = ApproximateRouteStrategy.js5Socket; // L: 1262 - boolean var6 = gameState > 20; // L: 1263 - if (NetCache.NetCache_socket != null) { // L: 1265 + if (js5ConnectState == 4) { // L: 1345 + AbstractSocket var14 = Decimator.js5Socket; // L: 1346 + boolean var6 = gameState > 20; // L: 1347 + if (NetCache.NetCache_socket != null) { // L: 1349 try { - NetCache.NetCache_socket.close(); // L: 1267 - } catch (Exception var9) { // L: 1269 + NetCache.NetCache_socket.close(); // L: 1351 + } catch (Exception var11) { // L: 1353 } - NetCache.NetCache_socket = null; // L: 1270 + NetCache.NetCache_socket = null; // L: 1354 } - NetCache.NetCache_socket = var12; // L: 1272 - NPC.method2366(var6); // L: 1273 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1274 - NetCache.NetCache_currentResponse = null; // L: 1275 - class291.NetCache_responseArchiveBuffer = null; // L: 1276 - NetCache.field3990 = 0; // L: 1277 + NetCache.NetCache_socket = var14; // L: 1356 + Buffer var3; + if (NetCache.NetCache_socket != null) { // L: 1358 + try { + var3 = new Buffer(4); // L: 1360 + var3.writeByte(var6 ? 2 : 3); // L: 1361 + var3.writeMedium(0); // L: 1362 + NetCache.NetCache_socket.write(var3.array, 0, 4); // L: 1363 + } catch (IOException var10) { + try { + NetCache.NetCache_socket.close(); // L: 1367 + } catch (Exception var9) { // L: 1369 + } + + ++NetCache.NetCache_ioExceptions; // L: 1370 + NetCache.NetCache_socket = null; // L: 1371 + } + } + + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1374 + class271.NetCache_currentResponse = null; // L: 1375 + class194.NetCache_responseArchiveBuffer = null; // L: 1376 + NetCache.field3995 = 0; // L: 1377 while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1279 - if (var3 == null) { // L: 1280 + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1379 + if (var15 == null) { // L: 1380 while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1286 - if (var3 == null) { // L: 1287 - if (NetCache.field3999 != 0) { // L: 1293 + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1386 + if (var15 == null) { // L: 1387 + if (NetCache.field3998 != 0) { // L: 1393 try { - Buffer var13 = new Buffer(4); // L: 1295 - var13.writeByte(4); // L: 1296 - var13.writeByte(NetCache.field3999); // L: 1297 - var13.writeShort(0); // L: 1298 - NetCache.NetCache_socket.write(var13.array, 0, 4); // L: 1299 + var3 = new Buffer(4); // L: 1395 + var3.writeByte(4); // L: 1396 + var3.writeByte(NetCache.field3998); // L: 1397 + var3.writeShort(0); // L: 1398 + NetCache.NetCache_socket.write(var3.array, 0, 4); // L: 1399 } catch (IOException var8) { try { - NetCache.NetCache_socket.close(); // L: 1303 - } catch (Exception var7) { // L: 1305 + NetCache.NetCache_socket.close(); // L: 1403 + } catch (Exception var7) { // L: 1405 } - ++NetCache.NetCache_ioExceptions; // L: 1306 - NetCache.NetCache_socket = null; // L: 1307 + ++NetCache.NetCache_ioExceptions; // L: 1406 + NetCache.NetCache_socket = null; // L: 1407 } } - NetCache.NetCache_loadTime = 0; // L: 1310 - NetCache.field3976 = WorldMapSprite.method4989(); // L: 1311 - class194.js5SocketTask = null; // L: 1313 - ApproximateRouteStrategy.js5Socket = null; // L: 1314 - js5ConnectState = 0; // L: 1315 - js5Errors = 0; // L: 1316 - return; // L: 1322 + NetCache.NetCache_loadTime = 0; // L: 1410 + NetCache.field3982 = class136.method2931(); // L: 1411 + VerticalAlignment.js5SocketTask = null; // L: 1413 + Decimator.js5Socket = null; // L: 1414 + js5ConnectState = 0; // L: 1415 + js5Errors = 0; // L: 1416 + return; // L: 1422 } - NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1288 - NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1289 - ++NetCache.NetCache_pendingWritesCount; // L: 1290 - --NetCache.NetCache_pendingResponsesCount; // L: 1291 + NetCache.NetCache_pendingWritesQueue.addLast(var15); // L: 1388 + NetCache.NetCache_pendingWrites.put(var15, var15.key); // L: 1389 + ++NetCache.NetCache_pendingWritesCount; // L: 1390 + --NetCache.NetCache_pendingResponsesCount; // L: 1391 } } - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1281 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1282 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1283 + NetCache.NetCache_pendingPriorityWrites.put(var15, var15.key); // L: 1381 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1382 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1383 } } - } catch (IOException var10) { // L: 1319 - this.js5Error(-3); // L: 1320 + } catch (IOException var12) { // L: 1419 + this.js5Error(-3); // L: 1420 } } } - } // L: 1200 + } // L: 1284 - @ObfuscatedName("ew") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1597130616" + descriptor = "(IB)V", + garbageValue = "66" ) @Export("js5Error") void js5Error(int var1) { - class194.js5SocketTask = null; // L: 1325 - ApproximateRouteStrategy.js5Socket = null; // L: 1326 - js5ConnectState = 0; // L: 1327 - if (ItemContainer.currentPort == class101.worldPort) { // L: 1328 - ItemContainer.currentPort = BuddyRankComparator.js5Port; + VerticalAlignment.js5SocketTask = null; // L: 1425 + Decimator.js5Socket = null; // L: 1426 + js5ConnectState = 0; // L: 1427 + if (SecureRandomFuture.worldPort == class329.currentPort) { // L: 1428 + class329.currentPort = UserComparator9.js5Port; } else { - ItemContainer.currentPort = class101.worldPort; // L: 1329 + class329.currentPort = SecureRandomFuture.worldPort; // L: 1429 } - ++js5Errors; // L: 1330 - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1331 - if (gameState <= 5) { // L: 1332 - this.error("js5connect_full"); // L: 1333 - InterfaceParent.updateGameState(1000); // L: 1334 - } else { - field510 = 3000; // L: 1336 - } - } else if (js5Errors >= 2 && var1 == 6) { // L: 1338 - this.error("js5connect_outofdate"); // L: 1339 - InterfaceParent.updateGameState(1000); // L: 1340 - } else if (js5Errors >= 4) { - if (gameState <= 5) { - this.error("js5connect"); - InterfaceParent.updateGameState(1000); // L: 1345 - } else { - field510 = 3000; + ++js5Errors; // L: 1430 + if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1431 + if (js5Errors >= 2 && var1 == 6) { // L: 1438 + this.error("js5connect_outofdate"); // L: 1439 + Decimator.updateGameState(1000); // L: 1440 + } else if (js5Errors >= 4) { // L: 1442 + if (gameState <= 5) { // L: 1443 + this.error("js5connect"); // L: 1444 + Decimator.updateGameState(1000); // L: 1445 + } else { + field525 = 3000; // L: 1447 + } } + } else if (gameState <= 5) { // L: 1432 + this.error("js5connect_full"); // L: 1433 + Decimator.updateGameState(1000); // L: 1434 + } else { + field525 = 3000; // L: 1436 } - } // L: 1349 + } // L: 1449 - @ObfuscatedName("fa") + @ObfuscatedName("fx") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1515563233" + garbageValue = "-1166216650" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 1770 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 1771 + Object var1 = packetWriter.getSocket(); // L: 1978 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 1979 try { - if (loginState == 0) { // L: 1773 - if (class260.secureRandom == null && (secureRandomFuture.isDone() || field513 > 250)) { // L: 1774 - class260.secureRandom = secureRandomFuture.get(); // L: 1775 - secureRandomFuture.shutdown(); // L: 1776 - secureRandomFuture = null; // L: 1777 + if (loginState == 0) { // L: 1981 + if (class347.secureRandom == null && (secureRandomFuture.isDone() || field528 > 250)) { // L: 1982 + class347.secureRandom = secureRandomFuture.get(); // L: 1983 + secureRandomFuture.shutdown(); // L: 1984 + secureRandomFuture = null; // L: 1985 } - if (class260.secureRandom != null) { // L: 1779 - if (var1 != null) { // L: 1780 - ((AbstractSocket)var1).close(); // L: 1781 - var1 = null; // L: 1782 + if (class347.secureRandom != null) { // L: 1987 + if (var1 != null) { // L: 1988 + ((AbstractSocket)var1).close(); // L: 1989 + var1 = null; // L: 1990 } - WorldMapEvent.socketTask = null; // L: 1784 - hadNetworkError = false; // L: 1785 - field513 = 0; // L: 1786 - if (field517.method8013()) { // L: 1787 + DynamicObject.socketTask = null; // L: 1992 + hadNetworkError = false; // L: 1993 + field528 = 0; // L: 1994 + if (field532.method7928()) { // L: 1995 try { - this.method1146(AbstractWorldMapData.field2796); // L: 1789 - UrlRequester.method2533(20); // L: 1790 - } catch (Throwable var23) { // L: 1792 - class301.RunException_sendStackTrace((String)null, var23); // L: 1793 - class150.getLoginError(65); // L: 1794 - return; // L: 1795 + this.method1366(class360.field4209); // L: 1997 + ModeWhere.method6099(20); // L: 1998 + } catch (Throwable var27) { // L: 2000 + Widget.RunException_sendStackTrace((String)null, var27); // L: 2001 + ScriptFrame.getLoginError(65); // L: 2002 + return; // L: 2003 } } else { - UrlRequester.method2533(1); // L: 1799 + ModeWhere.method6099(1); // L: 2007 } } } - if (loginState == 20) { // L: 1803 - if (this.field522 != null) { // L: 1804 - if (!this.field522.isDone()) { // L: 1805 - return; // L: 1806 + if (loginState == 20) { // L: 2011 + if (this.field599 != null) { // L: 2012 + if (!this.field599.isDone()) { // L: 2013 + return; // L: 2014 } - if (this.field522.isCancelled()) { // L: 1808 - class150.getLoginError(65); // L: 1809 - this.field522 = null; // L: 1810 - return; // L: 1811 + if (this.field599.isCancelled()) { // L: 2016 + ScriptFrame.getLoginError(65); // L: 2017 + this.field599 = null; // L: 2018 + return; // L: 2019 } try { - OtlTokenResponse var3 = (OtlTokenResponse)this.field522.get(); // L: 1814 - if (!var3.isSuccess()) { // L: 1815 - class150.getLoginError(65); // L: 1816 - this.field522 = null; // L: 1817 - return; // L: 1818 + OtlTokenResponse var3 = (OtlTokenResponse)this.field599.get(); // L: 2022 + if (!var3.isSuccess()) { // L: 2023 + ScriptFrame.getLoginError(65); // L: 2024 + this.field599 = null; // L: 2025 + return; // L: 2026 } - this.field518 = var3.getToken(); // L: 1820 - this.field522 = null; // L: 1821 - } catch (Exception var22) { // L: 1823 - class301.RunException_sendStackTrace((String)null, var22); // L: 1824 - class150.getLoginError(65); // L: 1825 - this.field522 = null; // L: 1826 - return; // L: 1827 + this.field564 = var3.getToken(); // L: 2028 + this.field599 = null; // L: 2029 + } catch (Exception var26) { // L: 2031 + Widget.RunException_sendStackTrace((String)null, var26); // L: 2032 + ScriptFrame.getLoginError(65); // L: 2033 + this.field599 = null; // L: 2034 + return; // L: 2035 } } else { - if (this.field618 == null) { // L: 1830 - class150.getLoginError(65); // L: 1851 - return; // L: 1852 + if (this.field690 == null) { // L: 2038 + ScriptFrame.getLoginError(65); // L: 2059 + return; // L: 2060 } - if (!this.field618.method303()) { // L: 1831 - return; // L: 1832 + if (!this.field690.method268()) { // L: 2039 + return; // L: 2040 } - if (this.field618.method316()) { // L: 1834 - class301.RunException_sendStackTrace(this.field618.method299(), (Throwable)null); // L: 1835 - class150.getLoginError(65); // L: 1836 - this.field618 = null; // L: 1837 - return; // L: 1838 + if (this.field690.method283()) { // L: 2042 + Widget.RunException_sendStackTrace(this.field690.method271(), (Throwable)null); // L: 2043 + ScriptFrame.getLoginError(65); // L: 2044 + this.field690 = null; // L: 2045 + return; // L: 2046 } - class21 var25 = this.field618.method301(); // L: 1840 - if (var25.method328() != 200) { // L: 1841 - class301.RunException_sendStackTrace("Response code: " + var25.method328() + "Response body: " + var25.method330(), (Throwable)null); // L: 1842 - class150.getLoginError(65); // L: 1843 - this.field618 = null; // L: 1844 - return; // L: 1845 + class21 var30 = this.field690.method274(); // L: 2048 + if (var30.method299() != 200) { // L: 2049 + Widget.RunException_sendStackTrace("Response code: " + var30.method299() + "Response body: " + var30.method297(), (Throwable)null); // L: 2050 + ScriptFrame.getLoginError(65); // L: 2051 + this.field690 = null; // L: 2052 + return; // L: 2053 } - this.field518 = var25.method330(); // L: 1847 - this.field618 = null; // L: 1848 + this.field564 = var30.method297(); // L: 2055 + this.field690 = null; // L: 2056 } - field513 = 0; // L: 1854 - UrlRequester.method2533(1); // L: 1855 + field528 = 0; // L: 2062 + ModeWhere.method6099(1); // L: 2063 } - if (loginState == 1) { // L: 1857 - if (WorldMapEvent.socketTask == null) { // L: 1858 - WorldMapEvent.socketTask = class434.taskHandler.newSocketTask(GrandExchangeOfferOwnWorldComparator.worldHost, ItemContainer.currentPort); // L: 1859 + if (loginState == 1) { // L: 2065 + if (DynamicObject.socketTask == null) { // L: 2066 + DynamicObject.socketTask = GameEngine.taskHandler.newSocketTask(class17.worldHost, class329.currentPort); // L: 2067 } - if (WorldMapEvent.socketTask.status == 2) { // L: 1861 + if (DynamicObject.socketTask.status == 2) { // L: 2069 throw new IOException(); } - if (WorldMapEvent.socketTask.status == 1) { // L: 1862 - if (useBufferedSocket) { // L: 1863 - Socket var4 = (Socket)WorldMapEvent.socketTask.result; // L: 1865 - BufferedNetSocket var26 = new BufferedNetSocket(var4, 40000, 5000); // L: 1867 - var1 = var26; // L: 1869 + if (DynamicObject.socketTask.status == 1) { // L: 2070 + if (useBufferedSocket) { // L: 2071 + Socket var4 = (Socket)DynamicObject.socketTask.result; // L: 2073 + BufferedNetSocket var31 = new BufferedNetSocket(var4, 40000, 5000); // L: 2075 + var1 = var31; // L: 2077 } else { - var1 = new NetSocket((Socket)WorldMapEvent.socketTask.result, class434.taskHandler, 5000); // L: 1872 + var1 = new NetSocket((Socket)DynamicObject.socketTask.result, GameEngine.taskHandler, 5000); // L: 2080 } - packetWriter.setSocket((AbstractSocket)var1); // L: 1874 - WorldMapEvent.socketTask = null; // L: 1875 - UrlRequester.method2533(2); // L: 1876 + packetWriter.setSocket((AbstractSocket)var1); // L: 2082 + DynamicObject.socketTask = null; // L: 2083 + ModeWhere.method6099(2); // L: 2084 } } - PacketBufferNode var27; - if (loginState == 2) { // L: 1879 - packetWriter.clearBuffer(); // L: 1880 - var27 = FriendSystem.method1723(); // L: 1881 - var27.packetBuffer.writeByte(LoginPacket.field3135.id); // L: 1882 - packetWriter.addNode(var27); // L: 1883 - packetWriter.flush(); // L: 1884 - var2.offset = 0; // L: 1885 - UrlRequester.method2533(3); // L: 1886 + PacketBufferNode var33; + if (loginState == 2) { // L: 2087 + packetWriter.clearBuffer(); // L: 2088 + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2093 + var33 = new PacketBufferNode(); // L: 2094 + } else { + var33 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2097 + } + + var33.clientPacket = null; // L: 2100 + var33.clientPacketLength = 0; // L: 2101 + var33.packetBuffer = new PacketBuffer(5000); // L: 2102 + var33.packetBuffer.writeByte(LoginPacket.field3137.id); // L: 2106 + packetWriter.addNode(var33); // L: 2107 + packetWriter.flush(); // L: 2108 + var2.offset = 0; // L: 2109 + ModeWhere.method6099(3); // L: 2110 } - boolean var12; - int var13; - if (loginState == 3) { // L: 1888 - if (class290.pcmPlayer0 != null) { // L: 1889 - class290.pcmPlayer0.method722(); + boolean var14; + int var15; + if (loginState == 3) { // L: 2112 + if (KeyHandler.pcmPlayer0 != null) { // L: 2113 + KeyHandler.pcmPlayer0.method690(); } - if (class182.pcmPlayer1 != null) { // L: 1890 - class182.pcmPlayer1.method722(); + if (ViewportMouse.pcmPlayer1 != null) { // L: 2114 + ViewportMouse.pcmPlayer1.method690(); } - var12 = true; // L: 1891 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1892 1893 - var12 = false; + var14 = true; // L: 2115 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2116 2117 + var14 = false; } - if (var12) { // L: 1895 - var13 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1896 - if (class290.pcmPlayer0 != null) { // L: 1897 - class290.pcmPlayer0.method722(); + if (var14) { // L: 2119 + var15 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2120 + if (KeyHandler.pcmPlayer0 != null) { // L: 2121 + KeyHandler.pcmPlayer0.method690(); } - if (class182.pcmPlayer1 != null) { // L: 1898 - class182.pcmPlayer1.method722(); + if (ViewportMouse.pcmPlayer1 != null) { // L: 2122 + ViewportMouse.pcmPlayer1.method690(); } - if (var13 != 0) { // L: 1899 - class150.getLoginError(var13); // L: 1900 - return; // L: 1901 + if (var15 != 0) { // L: 2123 + ScriptFrame.getLoginError(var15); // L: 2124 + return; // L: 2125 } - var2.offset = 0; // L: 1903 - UrlRequester.method2533(4); // L: 1904 + var2.offset = 0; // L: 2127 + ModeWhere.method6099(4); // L: 2128 } } - int var40; - if (loginState == 4) { // L: 1907 - if (var2.offset < 8) { // L: 1908 - var40 = ((AbstractSocket)var1).available(); // L: 1909 - if (var40 > 8 - var2.offset) { // L: 1910 - var40 = 8 - var2.offset; + int var44; + if (loginState == 4) { // L: 2131 + if (var2.offset < 8) { // L: 2132 + var44 = ((AbstractSocket)var1).available(); // L: 2133 + if (var44 > 8 - var2.offset) { // L: 2134 + var44 = 8 - var2.offset; } - if (var40 > 0) { // L: 1911 - ((AbstractSocket)var1).read(var2.array, var2.offset, var40); // L: 1912 - var2.offset += var40; // L: 1913 + if (var44 > 0) { // L: 2135 + ((AbstractSocket)var1).read(var2.array, var2.offset, var44); // L: 2136 + var2.offset += var44; // L: 2137 } } - if (var2.offset == 8) { // L: 1916 - var2.offset = 0; // L: 1917 - class121.field1479 = var2.readLong(); // L: 1918 - UrlRequester.method2533(5); // L: 1919 + if (var2.offset == 8) { // L: 2140 + var2.offset = 0; // L: 2141 + ServerPacket.field3129 = var2.readLong(); // L: 2142 + ModeWhere.method6099(5); // L: 2143 } } int var7; int var9; - int var14; - if (loginState == 5) { // L: 1922 - packetWriter.packetBuffer.offset = 0; // L: 1923 - packetWriter.clearBuffer(); // L: 1924 - PacketBuffer var28 = new PacketBuffer(500); // L: 1925 - int[] var29 = new int[]{class260.secureRandom.nextInt(), class260.secureRandom.nextInt(), class260.secureRandom.nextInt(), class260.secureRandom.nextInt()}; // L: 1926 1927 1928 1929 1930 - var28.offset = 0; // L: 1931 - var28.writeByte(1); // L: 1932 - var28.writeInt(var29[0]); // L: 1933 - var28.writeInt(var29[1]); // L: 1934 - var28.writeInt(var29[2]); // L: 1935 - var28.writeInt(var29[3]); // L: 1936 - var28.writeLong(class121.field1479); // L: 1937 - int var11; - if (gameState == 40) { // L: 1938 - var28.writeInt(NPCComposition.field1918[0]); // L: 1939 - var28.writeInt(NPCComposition.field1918[1]); // L: 1940 - var28.writeInt(NPCComposition.field1918[2]); // L: 1941 - var28.writeInt(NPCComposition.field1918[3]); // L: 1942 + int var17; + if (loginState == 5) { // L: 2146 + packetWriter.packetBuffer.offset = 0; // L: 2147 + packetWriter.clearBuffer(); // L: 2148 + PacketBuffer var32 = new PacketBuffer(500); // L: 2149 + int[] var36 = new int[]{class347.secureRandom.nextInt(), class347.secureRandom.nextInt(), class347.secureRandom.nextInt(), class347.secureRandom.nextInt()}; // L: 2150 2151 2152 2153 2154 + var32.offset = 0; // L: 2155 + var32.writeByte(1); // L: 2156 + var32.writeInt(var36[0]); // L: 2157 + var32.writeInt(var36[1]); // L: 2158 + var32.writeInt(var36[2]); // L: 2159 + var32.writeInt(var36[3]); // L: 2160 + var32.writeLong(ServerPacket.field3129); // L: 2161 + if (gameState == 40) { // L: 2162 + var32.writeInt(VertexNormal.field2817[0]); // L: 2163 + var32.writeInt(VertexNormal.field2817[1]); // L: 2164 + var32.writeInt(VertexNormal.field2817[2]); // L: 2165 + var32.writeInt(VertexNormal.field2817[3]); // L: 2166 } else { - if (gameState == 50) { // L: 1945 - var28.writeByte(class124.field1512.rsOrdinal()); // L: 1946 - var28.writeInt(class9.field35); // L: 1947 + if (gameState == 50) { // L: 2169 + var32.writeByte(class124.field1497.rsOrdinal()); // L: 2170 + var32.writeInt(WorldMapSectionType.field2321); // L: 2171 } else { - var28.writeByte(field516.rsOrdinal()); // L: 1950 - switch(field516.field1513) { // L: 1951 - case 0: - case 3: - var28.writeMedium(UrlRequest.field1346); // L: 1975 - ++var28.offset; // L: 1976 - break; + var32.writeByte(field531.rsOrdinal()); // L: 2174 + switch(field531.field1493) { // L: 2175 case 1: - LinkedHashMap var6 = Interpreter.clientPreferences.parameters; // L: 1955 - String var8 = Login.Login_username; // L: 1957 - var9 = var8.length(); // L: 1959 - int var10 = 0; // L: 1960 + var32.offset += 4; // L: 2185 + break; // L: 2186 + case 2: + case 3: + var32.writeMedium(WorldMapID.field2386); // L: 2179 + ++var32.offset; // L: 2180 + break; // L: 2181 + case 4: + LinkedHashMap var6 = class131.clientPreferences.parameters; // L: 2191 + String var8 = Login.Login_username; // L: 2193 + var9 = var8.length(); // L: 2195 + int var10 = 0; // L: 2196 - for (var11 = 0; var11 < var9; ++var11) { // L: 1961 + for (int var11 = 0; var11 < var9; ++var11) { // L: 2197 var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var28.writeInt((Integer)var6.get(var10)); // L: 1964 - break; // L: 1965 - case 2: - var28.offset += 4; // L: 1969 + var32.writeInt((Integer)var6.get(var10)); // L: 2200 } } - if (field517.method8013()) { // L: 1981 - var28.writeByte(class441.field4667.rsOrdinal()); // L: 1982 - var28.writeStringCp1252NullTerminated(this.field518); // L: 1983 + if (field532.method7928()) { // L: 2205 + var32.writeByte(class441.field4671.rsOrdinal()); // L: 2206 + var32.writeStringCp1252NullTerminated(this.field564); // L: 2207 } else { - var28.writeByte(class441.field4672.rsOrdinal()); // L: 1986 - var28.writeStringCp1252NullTerminated(Login.Login_password); // L: 1987 + var32.writeByte(class441.field4678.rsOrdinal()); // L: 2210 + var32.writeStringCp1252NullTerminated(Login.Login_password); // L: 2211 } } - var28.encryptRsa(class67.field875, class67.field878); // L: 1990 - NPCComposition.field1918 = var29; // L: 1991 - PacketBufferNode var5 = FriendSystem.method1723(); // L: 1992 - var5.packetBuffer.offset = 0; // L: 1993 - if (gameState == 40) { // L: 1994 - var5.packetBuffer.writeByte(LoginPacket.field3134.id); // L: 1995 + var32.encryptRsa(class67.field882, class67.field880); // L: 2214 + VertexNormal.field2817 = var36; // L: 2215 + PacketBufferNode var40; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2220 + var40 = new PacketBufferNode(); // L: 2221 } else { - var5.packetBuffer.writeByte(LoginPacket.field3133.id); // L: 1998 + var40 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2224 } - var5.packetBuffer.writeShort(0); // L: 2000 - var14 = var5.packetBuffer.offset; // L: 2001 - var5.packetBuffer.writeInt(204); // L: 2002 - var5.packetBuffer.writeInt(1); // L: 2003 - var5.packetBuffer.writeByte(clientType); // L: 2004 - var5.packetBuffer.writeByte(field486); // L: 2005 - var5.packetBuffer.writeBytes(var28.array, 0, var28.offset); // L: 2006 - var7 = var5.packetBuffer.offset; // L: 2007 - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2008 - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2009 - var5.packetBuffer.writeShort(class4.canvasWidth); // L: 2010 - var5.packetBuffer.writeShort(class309.canvasHeight); // L: 2011 - PacketBuffer var38 = var5.packetBuffer; // L: 2012 - if (randomDatData != null) { // L: 2014 - var38.writeBytes(randomDatData, 0, randomDatData.length); // L: 2015 + var40.clientPacket = null; // L: 2227 + var40.clientPacketLength = 0; // L: 2228 + var40.packetBuffer = new PacketBuffer(5000); // L: 2229 + var40.packetBuffer.offset = 0; // L: 2233 + if (gameState == 40) { // L: 2234 + var40.packetBuffer.writeByte(LoginPacket.field3133.id); // L: 2235 } else { - byte[] var15 = class67.method1878(); // L: 2018 - var38.writeBytes(var15, 0, var15.length); // L: 2019 + var40.packetBuffer.writeByte(LoginPacket.field3132.id); // L: 2238 } - if (!class429.field4593.endsWith(";A")) { // L: 2021 - class429.field4593 = class429.field4593 + ";A"; // L: 2022 - } - - var5.packetBuffer.writeStringCp1252NullTerminated(class429.field4593); // L: 2024 - var5.packetBuffer.writeInt(class7.field27); // L: 2025 - Buffer var42 = new Buffer(UserComparator2.platformInfo.size()); // L: 2026 - UserComparator2.platformInfo.write(var42); // L: 2027 - var5.packetBuffer.writeBytes(var42.array, 0, var42.array.length); // L: 2028 - var5.packetBuffer.writeByte(clientType); // L: 2029 - var5.packetBuffer.writeInt(0); // L: 2030 - var5.packetBuffer.writeInt(class268.archive11.hash); // L: 2031 - var5.packetBuffer.method7806(ReflectionCheck.archive20.hash); // L: 2032 - var5.packetBuffer.writeIntME(DevicePcmPlayerProvider.archive14.hash); // L: 2033 - var5.packetBuffer.writeInt(WorldMapData_1.archive8.hash); // L: 2034 - var5.packetBuffer.writeIntME(FloorOverlayDefinition.archive2.hash); // L: 2035 - var5.packetBuffer.writeIntME(class202.archive19.hash); // L: 2036 - var5.packetBuffer.method7806(0); // L: 2037 - var5.packetBuffer.method7746(MouseHandler.archive4.hash); // L: 2038 - var5.packetBuffer.writeInt(class132.archive9.hash); // L: 2039 - var5.packetBuffer.writeIntME(World.archive10.hash); // L: 2040 - var5.packetBuffer.writeInt(class4.archive13.hash); // L: 2041 - var5.packetBuffer.method7806(JagexCache.archive18.hash); // L: 2042 - var5.packetBuffer.method7806(ViewportMouse.archive15.hash); // L: 2043 - var5.packetBuffer.method7746(class145.archive7.hash); // L: 2044 - var5.packetBuffer.method7746(ArchiveLoader.archive6.hash); // L: 2045 - var5.packetBuffer.writeInt(class302.archive5.hash); // L: 2046 - var5.packetBuffer.method7806(class121.archive3.hash); // L: 2047 - var5.packetBuffer.method7746(class321.archive1.hash); // L: 2048 - var5.packetBuffer.method7806(ArchiveLoader.archive17.hash); // L: 2049 - var5.packetBuffer.writeIntME(TileItem.archive0.hash); // L: 2050 - var5.packetBuffer.writeInt(class135.archive12.hash); // L: 2051 - var5.packetBuffer.xteaEncrypt(var29, var7, var5.packetBuffer.offset); // L: 2052 - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2053 - packetWriter.addNode(var5); // L: 2054 - packetWriter.flush(); // L: 2055 - packetWriter.isaacCipher = new IsaacCipher(var29); // L: 2056 - int[] var16 = new int[4]; // L: 2057 - - for (var11 = 0; var11 < 4; ++var11) { // L: 2058 - var16[var11] = var29[var11] + 50; - } - - var2.newIsaacCipher(var16); // L: 2059 - UrlRequester.method2533(6); // L: 2060 - } - - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2062 2063 - var40 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2064 - if (var40 == 61) { // L: 2065 - var13 = ((AbstractSocket)var1).available(); // L: 2066 - class260.field2888 = var13 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2067 - UrlRequester.method2533(5); // L: 2068 - } - - if (var40 == 21 && gameState == 20) { // L: 2070 - UrlRequester.method2533(12); // L: 2071 - } else if (var40 == 2) { // L: 2073 - UrlRequester.method2533(14); // L: 2074 - } else if (var40 == 15 && gameState == 40) { // L: 2076 - packetWriter.serverPacketLength = -1; // L: 2077 - UrlRequester.method2533(19); // L: 2078 - } else if (var40 == 64) { // L: 2080 - UrlRequester.method2533(10); // L: 2081 - } else if (var40 == 23 && field742 < 1) { // L: 2083 - ++field742; // L: 2084 - UrlRequester.method2533(0); // L: 2085 - } else if (var40 == 29) { // L: 2087 - UrlRequester.method2533(17); // L: 2088 + var40.packetBuffer.writeShort(0); // L: 2240 + var7 = var40.packetBuffer.offset; // L: 2241 + var40.packetBuffer.writeInt(204); // L: 2242 + var40.packetBuffer.writeInt(1); // L: 2243 + var40.packetBuffer.writeByte(clientType); // L: 2244 + var40.packetBuffer.writeByte(field498); // L: 2245 + var40.packetBuffer.writeBytes(var32.array, 0, var32.offset); // L: 2246 + var17 = var40.packetBuffer.offset; // L: 2247 + var40.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2248 + var40.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2249 + var40.packetBuffer.writeShort(InvDefinition.canvasWidth); // L: 2250 + var40.packetBuffer.writeShort(class321.canvasHeight); // L: 2251 + PacketBuffer var18 = var40.packetBuffer; // L: 2252 + int var12; + if (randomDatData != null) { // L: 2254 + var18.writeBytes(randomDatData, 0, randomDatData.length); // L: 2255 } else { - if (var40 != 69) { // L: 2090 - class150.getLoginError(var40); // L: 2094 - return; // L: 2095 + byte[] var19 = new byte[24]; // L: 2260 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 2262 + JagexCache.JagexCache_randomDat.readFully(var19); // L: 2263 + + for (var12 = 0; var12 < 24 && var19[var12] == 0; ++var12) { // L: 2264 2265 2266 + } + + if (var12 >= 24) { // L: 2268 + throw new IOException(); + } + } catch (Exception var28) { + for (int var13 = 0; var13 < 24; ++var13) { // L: 2271 + var19[var13] = -1; + } } - UrlRequester.method2533(7); // L: 2091 + var18.writeBytes(var19, 0, var19.length); // L: 2276 + } + + if (!class65.field868.endsWith(";A")) { // L: 2278 + class65.field868 = class65.field868 + ";A"; // L: 2279 + } + + var40.packetBuffer.writeStringCp1252NullTerminated(class65.field868); // L: 2281 + var40.packetBuffer.writeInt(GrandExchangeOfferOwnWorldComparator.field483); // L: 2282 + Buffer var21 = new Buffer(class263.platformInfo.size()); // L: 2283 + class263.platformInfo.write(var21); // L: 2284 + var40.packetBuffer.writeBytes(var21.array, 0, var21.array.length); // L: 2285 + var40.packetBuffer.writeByte(clientType); // L: 2286 + var40.packetBuffer.writeInt(0); // L: 2287 + var40.packetBuffer.writeInt(Message.archive11.hash); // L: 2288 + var40.packetBuffer.method7721(ApproximateRouteStrategy.archive20.hash); // L: 2289 + var40.packetBuffer.writeIntME(class291.archive14.hash); // L: 2290 + var40.packetBuffer.writeInt(class145.archive8.hash); // L: 2291 + var40.packetBuffer.writeIntME(class10.archive2.hash); // L: 2292 + var40.packetBuffer.writeIntME(ObjectSound.archive19.hash); // L: 2293 + var40.packetBuffer.method7721(0); // L: 2294 + var40.packetBuffer.method7723(class182.archive4.hash); // L: 2295 + var40.packetBuffer.writeInt(WorldMapDecorationType.archive9.hash); // L: 2296 + var40.packetBuffer.writeIntME(JagexCache.archive10.hash); // L: 2297 + var40.packetBuffer.writeInt(class166.archive13.hash); // L: 2298 + var40.packetBuffer.method7721(WorldMapRectangle.archive18.hash); // L: 2299 + var40.packetBuffer.method7721(class28.archive15.hash); // L: 2300 + var40.packetBuffer.method7723(LoginScreenAnimation.archive7.hash); // L: 2301 + var40.packetBuffer.method7723(class16.archive6.hash); // L: 2302 + var40.packetBuffer.writeInt(Players.archive5.hash); // L: 2303 + var40.packetBuffer.method7721(BufferedNetSocket.archive3.hash); // L: 2304 + var40.packetBuffer.method7723(UserComparator8.archive1.hash); // L: 2305 + var40.packetBuffer.method7721(class54.archive17.hash); // L: 2306 + var40.packetBuffer.writeIntME(KeyHandler.archive0.hash); // L: 2307 + var40.packetBuffer.writeInt(class152.archive12.hash); // L: 2308 + var40.packetBuffer.xteaEncrypt(var36, var17, var40.packetBuffer.offset); // L: 2309 + var40.packetBuffer.writeLengthShort(var40.packetBuffer.offset - var7); // L: 2310 + packetWriter.addNode(var40); // L: 2311 + packetWriter.flush(); // L: 2312 + packetWriter.isaacCipher = new IsaacCipher(var36); // L: 2313 + int[] var46 = new int[4]; // L: 2314 + + for (var12 = 0; var12 < 4; ++var12) { // L: 2315 + var46[var12] = var36[var12] + 50; + } + + var2.newIsaacCipher(var46); // L: 2316 + ModeWhere.method6099(6); // L: 2317 + } + + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2319 2320 + var44 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2321 + if (var44 == 61) { // L: 2322 + var15 = ((AbstractSocket)var1).available(); // L: 2323 + field504 = var15 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2324 + ModeWhere.method6099(5); // L: 2325 + } + + if (var44 == 21 && gameState == 20) { // L: 2327 + ModeWhere.method6099(12); // L: 2328 + } else if (var44 == 2) { // L: 2330 + ModeWhere.method6099(14); // L: 2331 + } else if (var44 == 15 && gameState == 40) { // L: 2333 + packetWriter.serverPacketLength = -1; // L: 2334 + ModeWhere.method6099(19); // L: 2335 + } else if (var44 == 64) { // L: 2337 + ModeWhere.method6099(10); // L: 2338 + } else if (var44 == 23 && field661 < 1) { // L: 2340 + ++field661; // L: 2341 + ModeWhere.method6099(0); // L: 2342 + } else if (var44 == 29) { // L: 2344 + ModeWhere.method6099(17); // L: 2345 + } else { + if (var44 != 69) { // L: 2347 + ScriptFrame.getLoginError(var44); // L: 2351 + return; // L: 2352 + } + + ModeWhere.method6099(7); // L: 2348 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2099 2100 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2101 - var2.offset = 0; // L: 2102 - class116.field1418 = var2.readUnsignedShort(); // L: 2103 - UrlRequester.method2533(8); // L: 2104 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2356 2357 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2358 + var2.offset = 0; // L: 2359 + VertexNormal.field2816 = var2.readUnsignedShort(); // L: 2360 + ModeWhere.method6099(8); // L: 2361 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= class116.field1418) { // L: 2107 2108 - var2.offset = 0; // L: 2109 - ((AbstractSocket)var1).read(var2.array, var2.offset, class116.field1418); // L: 2110 - class6 var30 = JagexCache.method3224()[var2.readUnsignedByte()]; // L: 2111 + if (loginState == 8 && ((AbstractSocket)var1).available() >= VertexNormal.field2816) { // L: 2364 2365 + var2.offset = 0; // L: 2366 + ((AbstractSocket)var1).read(var2.array, var2.offset, VertexNormal.field2816); // L: 2367 + class6[] var34 = new class6[]{class6.field14}; // L: 2370 + class6 var38 = var34[var2.readUnsignedByte()]; // L: 2372 try { - class3 var31 = class385.method7027(var30); // L: 2113 - this.field526 = new class7(var2, var31); // L: 2114 - UrlRequester.method2533(9); // L: 2115 - } catch (Exception var21) { // L: 2117 - class150.getLoginError(22); // L: 2118 - return; // L: 2119 + switch(var38.field12) { // L: 2376 + case 0: + class0 var5 = new class0(); // L: 2379 + this.field541 = new class7(var2, var5); // L: 2389 + ModeWhere.method6099(9); // L: 2390 + break; + default: + throw new IllegalArgumentException(); // L: 2384 + } + } catch (Exception var25) { // L: 2392 + ScriptFrame.getLoginError(22); // L: 2393 + return; // L: 2394 } } - if (loginState == 9 && this.field526.method42()) { // L: 2123 2124 - this.field525 = this.field526.method44(); // L: 2125 - this.field526.method43(); // L: 2126 - this.field526 = null; // L: 2127 - if (this.field525 == null) { // L: 2128 - class150.getLoginError(22); // L: 2129 - return; // L: 2130 + if (loginState == 9 && this.field541.method43()) { // L: 2398 2399 + this.field496 = this.field541.method45(); // L: 2400 + this.field541.method47(); // L: 2401 + this.field541 = null; // L: 2402 + if (this.field496 == null) { // L: 2403 + ScriptFrame.getLoginError(22); // L: 2404 + return; // L: 2405 } - packetWriter.clearBuffer(); // L: 2132 - var27 = FriendSystem.method1723(); // L: 2133 - var27.packetBuffer.writeByte(LoginPacket.field3137.id); // L: 2134 - var27.packetBuffer.writeShort(this.field525.offset); // L: 2135 - var27.packetBuffer.method7818(this.field525); // L: 2136 - packetWriter.addNode(var27); // L: 2137 - packetWriter.flush(); // L: 2138 - this.field525 = null; // L: 2139 - UrlRequester.method2533(6); // L: 2140 + packetWriter.clearBuffer(); // L: 2407 + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2412 + var33 = new PacketBufferNode(); // L: 2413 + } else { + var33 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2416 + } + + var33.clientPacket = null; // L: 2419 + var33.clientPacketLength = 0; // L: 2420 + var33.packetBuffer = new PacketBuffer(5000); // L: 2421 + var33.packetBuffer.writeByte(LoginPacket.field3134.id); // L: 2425 + var33.packetBuffer.writeShort(this.field496.offset); // L: 2426 + var33.packetBuffer.method7668(this.field496); // L: 2427 + packetWriter.addNode(var33); // L: 2428 + packetWriter.flush(); // L: 2429 + this.field496 = null; // L: 2430 + ModeWhere.method6099(6); // L: 2431 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2143 2144 - WorldMapSectionType.field2768 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2145 - UrlRequester.method2533(11); // L: 2146 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2434 2435 + class11.field54 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2436 + ModeWhere.method6099(11); // L: 2437 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= WorldMapSectionType.field2768) { // L: 2149 2150 - ((AbstractSocket)var1).read(var2.array, 0, WorldMapSectionType.field2768); // L: 2151 - var2.offset = 0; // L: 2152 - UrlRequester.method2533(6); // L: 2153 + if (loginState == 11 && ((AbstractSocket)var1).available() >= class11.field54) { // L: 2440 2441 + ((AbstractSocket)var1).read(var2.array, 0, class11.field54); // L: 2442 + var2.offset = 0; // L: 2443 + ModeWhere.method6099(6); // L: 2444 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2156 2157 - field490 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2158 - UrlRequester.method2533(13); // L: 2159 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2447 2448 + field530 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2449 + ModeWhere.method6099(13); // L: 2450 } - if (loginState == 13) { // L: 2162 - field513 = 0; // L: 2163 - GrandExchangeEvent.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field490 / 60 + " seconds."); // L: 2164 - if (--field490 <= 0) { // L: 2165 - UrlRequester.method2533(0); + if (loginState == 13) { // L: 2453 + field528 = 0; // L: 2454 + class4.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field530 / 60 + " seconds."); // L: 2455 + if (--field530 <= 0) { // L: 2456 + ModeWhere.method6099(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2168 2169 - class124.field1514 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2170 - UrlRequester.method2533(15); // L: 2171 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2459 2460 + class391.field4372 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2461 + ModeWhere.method6099(15); // L: 2462 } - if (loginState == 15 && ((AbstractSocket)var1).available() >= class124.field1514) { // L: 2174 2175 - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2176 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2177 - var2.offset = 0; // L: 2178 - boolean var41 = false; // L: 2179 - if (var12) { // L: 2180 - var13 = var2.readByteIsaac() << 24; // L: 2181 - var13 |= var2.readByteIsaac() << 16; // L: 2182 - var13 |= var2.readByteIsaac() << 8; // L: 2183 - var13 |= var2.readByteIsaac(); // L: 2184 - String var37 = Login.Login_username; // L: 2186 - var7 = var37.length(); // L: 2188 - int var17 = 0; // L: 2189 - var9 = 0; // L: 2190 + if (loginState == 15 && ((AbstractSocket)var1).available() >= class391.field4372) { // L: 2465 2466 + var14 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2467 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2468 + var2.offset = 0; // L: 2469 + boolean var45 = false; // L: 2470 + if (var14) { // L: 2471 + var15 = var2.readByteIsaac() << 24; // L: 2472 + var15 |= var2.readByteIsaac() << 16; // L: 2473 + var15 |= var2.readByteIsaac() << 8; // L: 2474 + var15 |= var2.readByteIsaac(); // L: 2475 + String var42 = Login.Login_username; // L: 2477 + var7 = var42.length(); // L: 2479 + var17 = 0; // L: 2480 + var9 = 0; // L: 2481 while (true) { if (var9 >= var7) { - if (Interpreter.clientPreferences.parameters.size() >= 10 && !Interpreter.clientPreferences.parameters.containsKey(var17)) { // L: 2194 2195 - Iterator var39 = Interpreter.clientPreferences.parameters.entrySet().iterator(); // L: 2196 - var39.next(); // L: 2197 - var39.remove(); // L: 2198 + if (class131.clientPreferences.parameters.size() >= 10 && !class131.clientPreferences.parameters.containsKey(var17)) { // L: 2485 2486 + Iterator var43 = class131.clientPreferences.parameters.entrySet().iterator(); // L: 2487 + var43.next(); // L: 2488 + var43.remove(); // L: 2489 } - Interpreter.clientPreferences.parameters.put(var17, var13); // L: 2201 + class131.clientPreferences.parameters.put(var17, var15); // L: 2492 break; } - var17 = (var17 << 5) - var17 + var37.charAt(var9); + var17 = (var17 << 5) - var17 + var42.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { // L: 2203 - Interpreter.clientPreferences.method2316(Login.Login_username); // L: 2204 + if (Login_isUsernameRemembered) { // L: 2494 + class131.clientPreferences.method2286(Login.Login_username); // L: 2495 } else { - Interpreter.clientPreferences.method2316((String)null); // L: 2207 + class131.clientPreferences.method2286((String)null); // L: 2498 } - class307.savePreferences(); // L: 2209 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2210 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2211 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2212 - localPlayerIndex <<= 8; // L: 2213 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2214 - field607 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2215 - ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2216 - var2.offset = 0; // L: 2217 - this.field658 = var2.readLong(); // L: 2218 - if (class124.field1514 >= 29) { // L: 2219 - ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2220 - var2.offset = 0; // L: 2221 - field608 = var2.readLong(); // L: 2222 + GameEngine.savePreferences(); // L: 2500 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2501 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2502 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2503 + localPlayerIndex <<= 8; // L: 2504 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2505 + field544 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2506 + ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2507 + var2.offset = 0; // L: 2508 + this.field542 = var2.readLong(); // L: 2509 + if (class391.field4372 >= 29) { // L: 2510 + ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2511 + var2.offset = 0; // L: 2512 + field623 = var2.readLong(); // L: 2513 } - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2224 - var2.offset = 0; // L: 2225 - ServerPacket[] var34 = class230.ServerPacket_values(); // L: 2226 - var14 = var2.readSmartByteShortIsaac(); // L: 2227 - if (var14 < 0 || var14 >= var34.length) { // L: 2228 - throw new IOException(var14 + " " + var2.offset); + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2515 + var2.offset = 0; // L: 2516 + ServerPacket[] var37 = class82.ServerPacket_values(); // L: 2517 + int var23 = var2.readSmartByteShortIsaac(); // L: 2518 + if (var23 < 0 || var23 >= var37.length) { // L: 2519 + throw new IOException(var23 + " " + var2.offset); } - packetWriter.serverPacket = var34[var14]; // L: 2229 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2230 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2231 - var2.offset = 0; // L: 2232 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2233 + packetWriter.serverPacket = var37[var23]; // L: 2520 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2521 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2522 + var2.offset = 0; // L: 2523 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2524 try { - Client var19 = UserComparator10.client; // L: 2235 - JSObject.getWindow(var19).call("zap", (Object[])null); // L: 2238 - } catch (Throwable var20) { // L: 2241 + class27.method383(class127.client, "zap"); // L: 2526 + } catch (Throwable var24) { // L: 2528 } - UrlRequester.method2533(16); // L: 2242 + ModeWhere.method6099(16); // L: 2529 } - if (loginState == 16) { // L: 2245 - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2246 - var2.offset = 0; // L: 2247 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2248 - timer.method6597(); // L: 2249 - PacketWriter.method2489(); // L: 2250 - Strings.updatePlayer(var2); // L: 2251 - class193.field2197 = -1; // L: 2252 - class146.loadRegions(false, var2); // L: 2253 - packetWriter.serverPacket = null; // L: 2254 + if (loginState == 16) { // L: 2532 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2533 + var2.offset = 0; // L: 2534 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2535 + timer.method6564(); // L: 2536 + Renderable.method4925(); // L: 2537 + Fonts.updatePlayer(var2); // L: 2538 + ScriptEvent.field1042 = -1; // L: 2539 + StudioGame.loadRegions(false, var2); // L: 2540 + packetWriter.serverPacket = null; // L: 2541 } } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2258 2259 - var2.offset = 0; // L: 2260 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2261 - var2.offset = 0; // L: 2262 - class142.field1634 = var2.readUnsignedShort(); // L: 2263 - UrlRequester.method2533(18); // L: 2264 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2545 2546 + var2.offset = 0; // L: 2547 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2548 + var2.offset = 0; // L: 2549 + SceneTilePaint.field2826 = var2.readUnsignedShort(); // L: 2550 + ModeWhere.method6099(18); // L: 2551 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class142.field1634) { // L: 2267 2268 - var2.offset = 0; // L: 2269 - ((AbstractSocket)var1).read(var2.array, 0, class142.field1634); // L: 2270 - var2.offset = 0; // L: 2271 - String var33 = var2.readStringCp1252NullTerminated(); // L: 2272 - String var32 = var2.readStringCp1252NullTerminated(); // L: 2273 - String var35 = var2.readStringCp1252NullTerminated(); // L: 2274 - GrandExchangeEvent.setLoginResponseString(var33, var32, var35); // L: 2275 - InterfaceParent.updateGameState(10); // L: 2276 + if (loginState == 18 && ((AbstractSocket)var1).available() >= SceneTilePaint.field2826) { // L: 2554 2555 + var2.offset = 0; // L: 2556 + ((AbstractSocket)var1).read(var2.array, 0, SceneTilePaint.field2826); // L: 2557 + var2.offset = 0; // L: 2558 + String var35 = var2.readStringCp1252NullTerminated(); // L: 2559 + String var41 = var2.readStringCp1252NullTerminated(); // L: 2560 + String var39 = var2.readStringCp1252NullTerminated(); // L: 2561 + class4.setLoginResponseString(var35, var41, var39); // L: 2562 + Decimator.updateGameState(10); // L: 2563 } - if (loginState != 19) { // L: 2279 - ++field513; // L: 2326 - if (field513 > 2000) { // L: 2327 - if (field742 < 1) { // L: 2328 - if (ItemContainer.currentPort == class101.worldPort) { // L: 2329 - ItemContainer.currentPort = BuddyRankComparator.js5Port; - } else { - ItemContainer.currentPort = class101.worldPort; // L: 2330 - } - - ++field742; // L: 2331 - UrlRequester.method2533(0); // L: 2332 - } else { - class150.getLoginError(-3); // L: 2335 - } - } - } else { - if (packetWriter.serverPacketLength == -1) { // L: 2280 - if (((AbstractSocket)var1).available() < 2) { // L: 2281 + if (loginState == 19) { // L: 2566 + if (packetWriter.serverPacketLength == -1) { // L: 2567 + if (((AbstractSocket)var1).available() < 2) { // L: 2568 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2282 - var2.offset = 0; // L: 2283 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2284 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2569 + var2.offset = 0; // L: 2570 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2571 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2286 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2287 - var2.offset = 0; // L: 2288 - var40 = packetWriter.serverPacketLength; // L: 2289 - timer.method6598(); // L: 2290 - packetWriter.clearBuffer(); // L: 2292 - packetWriter.packetBuffer.offset = 0; // L: 2293 - packetWriter.serverPacket = null; // L: 2294 - packetWriter.field1320 = null; // L: 2295 - packetWriter.field1329 = null; // L: 2296 - packetWriter.field1331 = null; // L: 2297 - packetWriter.serverPacketLength = 0; // L: 2298 - packetWriter.field1326 = 0; // L: 2299 - rebootTimer = 0; // L: 2300 - class268.method5228(); // L: 2301 - minimapState = 0; // L: 2302 - destinationX = 0; // L: 2303 - - for (var13 = 0; var13 < 2048; ++var13) { // L: 2304 - players[var13] = null; + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2573 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2574 + var2.offset = 0; // L: 2575 + var44 = packetWriter.serverPacketLength; // L: 2576 + timer.method6566(); // L: 2577 + ReflectionCheck.method1080(); // L: 2578 + Fonts.updatePlayer(var2); // L: 2579 + if (var44 != var2.offset) { // L: 2580 + throw new RuntimeException(); // L: 2581 } - - class19.localPlayer = null; // L: 2305 - - for (var13 = 0; var13 < npcs.length; ++var13) { // L: 2306 - NPC var36 = npcs[var13]; // L: 2307 - if (var36 != null) { // L: 2308 - var36.targetIndex = -1; // L: 2309 - var36.false0 = false; // L: 2310 + } + } else { + ++field528; // L: 2585 + if (field528 > 2000) { // L: 2586 + if (field661 < 1) { // L: 2587 + if (class329.currentPort == SecureRandomFuture.worldPort) { // L: 2588 + class329.currentPort = UserComparator9.js5Port; + } else { + class329.currentPort = SecureRandomFuture.worldPort; // L: 2589 } - } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2314 - InterfaceParent.updateGameState(30); // L: 2316 - - for (var13 = 0; var13 < 100; ++var13) { // L: 2317 - field564[var13] = true; - } - - class17.method228(); // L: 2318 - Strings.updatePlayer(var2); // L: 2320 - if (var40 != var2.offset) { // L: 2321 - throw new RuntimeException(); // L: 2322 + ++field661; // L: 2590 + ModeWhere.method6099(0); // L: 2591 + } else { + ScriptFrame.getLoginError(-3); // L: 2594 } } } } } - } catch (IOException var24) { // L: 2339 - if (field742 < 1) { // L: 2340 - if (ItemContainer.currentPort == class101.worldPort) { // L: 2341 - ItemContainer.currentPort = BuddyRankComparator.js5Port; + } catch (IOException var29) { // L: 2598 + if (field661 < 1) { // L: 2599 + if (SecureRandomFuture.worldPort == class329.currentPort) { // L: 2600 + class329.currentPort = UserComparator9.js5Port; } else { - ItemContainer.currentPort = class101.worldPort; // L: 2342 + class329.currentPort = SecureRandomFuture.worldPort; // L: 2601 } - ++field742; // L: 2343 - UrlRequester.method2533(0); // L: 2344 + ++field661; // L: 2602 + ModeWhere.method6099(0); // L: 2603 } else { - class150.getLoginError(-2); // L: 2347 + ScriptFrame.getLoginError(-2); // L: 2606 } } - } // L: 2166 2256 2324 2333 2336 2345 2348 2350 + } // L: 2457 2543 2583 2592 2595 2604 2607 2609 - @ObfuscatedName("fd") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2093046778" + descriptor = "(B)V", + garbageValue = "0" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 2678 + if (rebootTimer > 1) { // L: 2996 --rebootTimer; } - if (logoutTimer > 0) { // L: 2679 + if (logoutTimer > 0) { // L: 2997 --logoutTimer; } - if (hadNetworkError) { // L: 2680 - hadNetworkError = false; // L: 2681 - class9.method64(); // L: 2682 + if (hadNetworkError) { // L: 2998 + hadNetworkError = false; // L: 2999 + ClanChannelMember.method2868(); // L: 3000 } else { - if (!isMenuOpen) { // L: 2685 - VarpDefinition.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 3003 + ByteArrayPool.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1153(packetWriter); ++var1) { // L: 2686 2687 + for (var1 = 0; var1 < 100 && this.method1158(packetWriter); ++var1) { // L: 3004 3005 } - if (gameState == 30) { // L: 2689 - while (true) { - ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 2693 - boolean var30; - if (var2 == null) { // L: 2694 - var30 = false; // L: 2695 - } else { - var30 = true; // L: 2698 + if (gameState == 30) { // L: 3007 + int var2; + PacketBufferNode var14; + while (WorldMapID.method4360()) { // L: 3008 + var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2963, packetWriter.isaacCipher); // L: 3009 + var14.packetBuffer.writeByte(0); // L: 3010 + var2 = var14.packetBuffer.offset; // L: 3011 + class151.performReflectionCheck(var14.packetBuffer); // L: 3012 + var14.packetBuffer.method7774(var14.packetBuffer.offset - var2); // L: 3013 + packetWriter.addNode(var14); // L: 3014 + } + + if (timer.field4179) { // L: 3016 + var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2935, packetWriter.isaacCipher); // L: 3018 + var14.packetBuffer.writeByte(0); // L: 3019 + var2 = var14.packetBuffer.offset; // L: 3020 + timer.write(var14.packetBuffer); // L: 3021 + var14.packetBuffer.method7774(var14.packetBuffer.offset - var2); // L: 3022 + packetWriter.addNode(var14); // L: 3023 + timer.method6580(); // L: 3024 + } + + int var3; + int var4; + int var5; + int var6; + int var7; + int var10; + int var11; + synchronized(class120.mouseRecorder.lock) { // L: 3027 + if (!field490) { // L: 3028 + class120.mouseRecorder.index = 0; // L: 3114 + } else if (MouseHandler.MouseHandler_lastButton != 0 || class120.mouseRecorder.index >= 40) { // L: 3029 + PacketBufferNode var15 = null; // L: 3031 + var3 = 0; // L: 3032 + var4 = 0; // L: 3033 + var5 = 0; // L: 3034 + var6 = 0; // L: 3035 + + for (var7 = 0; var7 < class120.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 3036 3037 + var4 = var7; // L: 3038 + int var8 = class120.mouseRecorder.ys[var7]; // L: 3039 + if (var8 < -1) { // L: 3040 + var8 = -1; + } else if (var8 > 65534) { // L: 3041 + var8 = 65534; + } + + int var9 = class120.mouseRecorder.xs[var7]; // L: 3042 + if (var9 < -1) { // L: 3043 + var9 = -1; + } else if (var9 > 65534) { // L: 3044 + var9 = 65534; + } + + if (var9 != field508 || var8 != field509) { // L: 3045 + if (var15 == null) { // L: 3048 + var15 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2965, packetWriter.isaacCipher); // L: 3049 + var15.packetBuffer.writeByte(0); // L: 3050 + var3 = var15.packetBuffer.offset; // L: 3051 + PacketBuffer var10000 = var15.packetBuffer; // L: 3052 + var10000.offset += 2; + var5 = 0; // L: 3053 + var6 = 0; // L: 3054 + } + + int var12; + if (field510 != -1L) { // L: 3059 + var10 = var9 - field508; // L: 3060 + var11 = var8 - field509; // L: 3061 + var12 = (int)((class120.mouseRecorder.millis[var7] - field510) / 20L); // L: 3062 + var5 = (int)((long)var5 + (class120.mouseRecorder.millis[var7] - field510) % 20L); // L: 3063 + } else { + var10 = var9; // L: 3066 + var11 = var8; // L: 3067 + var12 = Integer.MAX_VALUE; // L: 3068 + } + + field508 = var9; // L: 3070 + field509 = var8; // L: 3071 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3072 + var10 += 32; // L: 3073 + var11 += 32; // L: 3074 + var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3075 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3077 + var10 += 128; // L: 3078 + var11 += 128; // L: 3079 + var15.packetBuffer.writeByte(var12 + 128); // L: 3080 + var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3081 + } else if (var12 < 32) { // L: 3083 + var15.packetBuffer.writeByte(var12 + 192); // L: 3084 + if (var9 != -1 && var8 != -1) { // L: 3085 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3086 + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3089 + if (var9 != -1 && var8 != -1) { // L: 3090 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3091 + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; // L: 3093 + field510 = class120.mouseRecorder.millis[var7]; // L: 3094 + } + } + + if (var15 != null) { // L: 3096 + var15.packetBuffer.method7774(var15.packetBuffer.offset - var3); // L: 3097 + var7 = var15.packetBuffer.offset; // L: 3098 + var15.packetBuffer.offset = var3; // L: 3099 + var15.packetBuffer.writeByte(var5 / var6); // L: 3100 + var15.packetBuffer.writeByte(var5 % var6); // L: 3101 + var15.packetBuffer.offset = var7; // L: 3102 + packetWriter.addNode(var15); // L: 3103 + } + + if (var4 >= class120.mouseRecorder.index) { // L: 3105 + class120.mouseRecorder.index = 0; + } else { + MouseRecorder var41 = class120.mouseRecorder; // L: 3107 + var41.index -= var4; + System.arraycopy(class120.mouseRecorder.xs, var4, class120.mouseRecorder.xs, 0, class120.mouseRecorder.index); // L: 3108 + System.arraycopy(class120.mouseRecorder.ys, var4, class120.mouseRecorder.ys, 0, class120.mouseRecorder.index); // L: 3109 + System.arraycopy(class120.mouseRecorder.millis, var4, class120.mouseRecorder.millis, 0, class120.mouseRecorder.index); // L: 3110 + } + } + } + + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3116 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3117 + if (var16 > 32767L) { // L: 3118 + var16 = 32767L; } - int var3; - PacketBufferNode var31; - if (!var30) { // L: 2700 - PacketBufferNode var14; - int var15; - if (timer.field4182) { // L: 2708 - var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2935, packetWriter.isaacCipher); // L: 2710 - var14.packetBuffer.writeByte(0); // L: 2711 - var15 = var14.packetBuffer.offset; // L: 2712 - timer.write(var14.packetBuffer); // L: 2713 - var14.packetBuffer.method7756(var14.packetBuffer.offset - var15); // L: 2714 - packetWriter.addNode(var14); // L: 2715 - timer.method6593(); // L: 2716 + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3119 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3120 + if (var3 < 0) { // L: 3121 + var3 = 0; + } else if (var3 > class321.canvasHeight) { // L: 3122 + var3 = class321.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3123 + if (var4 < 0) { // L: 3124 + var4 = 0; + } else if (var4 > InvDefinition.canvasWidth) { // L: 3125 + var4 = InvDefinition.canvasWidth; + } + + var5 = (int)var16; // L: 3126 + var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2976, packetWriter.isaacCipher); // L: 3127 + var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 3128 + var18.packetBuffer.writeShort(var4); // L: 3129 + var18.packetBuffer.writeShort(var3); // L: 3130 + packetWriter.addNode(var18); // L: 3131 + } + + if (KeyHandler.field118 > 0) { // L: 3133 + var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); // L: 3134 + var14.packetBuffer.writeShort(0); // L: 3135 + var2 = var14.packetBuffer.offset; // L: 3136 + long var19 = class136.method2931(); // L: 3137 + + for (var5 = 0; var5 < KeyHandler.field118; ++var5) { // L: 3138 + long var21 = var19 - field585; // L: 3139 + if (var21 > 16777215L) { // L: 3140 + var21 = 16777215L; } - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - PacketBuffer var10000; - synchronized(BuddyRankComparator.mouseRecorder.lock) { // L: 2719 - if (!field536) { // L: 2720 - BuddyRankComparator.mouseRecorder.index = 0; // L: 2806 - } else if (MouseHandler.MouseHandler_lastButton != 0 || BuddyRankComparator.mouseRecorder.index >= 40) { // L: 2721 - var31 = null; // L: 2723 - var3 = 0; // L: 2724 - var4 = 0; // L: 2725 - var5 = 0; // L: 2726 - var6 = 0; // L: 2727 + field585 = var19; // L: 3141 + var14.packetBuffer.writeByte(KeyHandler.field143[var5]); // L: 3142 + var14.packetBuffer.method7680((int)var21); // L: 3143 + } - for (var7 = 0; var7 < BuddyRankComparator.mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { // L: 2728 2729 - var4 = var7; // L: 2730 - var8 = BuddyRankComparator.mouseRecorder.ys[var7]; // L: 2731 - if (var8 < -1) { // L: 2732 - var8 = -1; - } else if (var8 > 65534) { // L: 2733 - var8 = 65534; - } + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3145 + packetWriter.addNode(var14); // L: 3146 + } - var9 = BuddyRankComparator.mouseRecorder.xs[var7]; // L: 2734 - if (var9 < -1) { // L: 2735 - var9 = -1; - } else if (var9 > 65534) { // L: 2736 - var9 = 65534; - } + if (field588 > 0) { // L: 3148 + --field588; + } - if (var9 != field493 || var8 != field494) { // L: 2737 - if (var31 == null) { // L: 2740 - var31 = ItemContainer.getPacketBufferNode(ClientPacket.field2965, packetWriter.isaacCipher); // L: 2741 - var31.packetBuffer.writeByte(0); // L: 2742 - var3 = var31.packetBuffer.offset; // L: 2743 - var10000 = var31.packetBuffer; // L: 2744 - var10000.offset += 2; - var5 = 0; // L: 2745 - var6 = 0; // L: 2746 - } + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3149 + field589 = true; + } - if (-1L != field495) { // L: 2751 - var10 = var9 - field493; // L: 2752 - var11 = var8 - field494; // L: 2753 - var12 = (int)((BuddyRankComparator.mouseRecorder.millis[var7] - field495) / 20L); // L: 2754 - var5 = (int)((long)var5 + (BuddyRankComparator.mouseRecorder.millis[var7] - field495) % 20L); // L: 2755 - } else { - var10 = var9; // L: 2758 - var11 = var8; // L: 2759 - var12 = Integer.MAX_VALUE; // L: 2760 - } + if (field589 && field588 <= 0) { // L: 3150 + field588 = 20; // L: 3151 + field589 = false; // L: 3152 + var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2990, packetWriter.isaacCipher); // L: 3154 + var14.packetBuffer.method7711(camAngleY); // L: 3155 + var14.packetBuffer.writeShort(camAngleX); // L: 3156 + packetWriter.addNode(var14); // L: 3157 + } - field493 = var9; // L: 2762 - field494 = var8; // L: 2763 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2764 - var10 += 32; // L: 2765 - var11 += 32; // L: 2766 - var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2767 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2769 - var10 += 128; // L: 2770 - var11 += 128; // L: 2771 - var31.packetBuffer.writeByte(var12 + 128); // L: 2772 - var31.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2773 - } else if (var12 < 32) { // L: 2775 - var31.packetBuffer.writeByte(var12 + 192); // L: 2776 - if (var9 != -1 && var8 != -1) { // L: 2777 - var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 2778 - } else { - var31.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var31.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2781 - if (var9 != -1 && var8 != -1) { // L: 2782 - var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 2783 - } else { - var31.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } + if (Varcs.hasFocus && !hadFocus) { // L: 3159 + hadFocus = true; // L: 3160 + var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2978, packetWriter.isaacCipher); // L: 3162 + var14.packetBuffer.writeByte(1); // L: 3163 + packetWriter.addNode(var14); // L: 3164 + } - ++var6; // L: 2785 - field495 = BuddyRankComparator.mouseRecorder.millis[var7]; // L: 2786 - } + if (!Varcs.hasFocus && hadFocus) { // L: 3166 + hadFocus = false; // L: 3167 + var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2978, packetWriter.isaacCipher); // L: 3169 + var14.packetBuffer.writeByte(0); // L: 3170 + packetWriter.addNode(var14); // L: 3171 + } + + if (ScriptFrame.worldMap != null) { // L: 3174 + ScriptFrame.worldMap.method7215(); + } + + if (Interpreter.ClanChat_inClanChat) { // L: 3176 + if (ClientPacket.friendsChat != null) { // L: 3177 + ClientPacket.friendsChat.sort(); // L: 3178 + } + + ModeWhere.method6102(); // L: 3180 + Interpreter.ClanChat_inClanChat = false; // L: 3181 + } + + class19.method287(); // L: 3184 + if (field714 != class18.Client_plane) { // L: 3186 + field714 = class18.Client_plane; // L: 3187 + var1 = class18.Client_plane; // L: 3188 + int[] var33 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 3190 + var3 = var33.length; // L: 3191 + + for (var4 = 0; var4 < var3; ++var4) { // L: 3192 + var33[var4] = 0; + } + + for (var4 = 1; var4 < 103; ++var4) { // L: 3193 + var5 = (103 - var4) * 2048 + 24628; // L: 3194 + + for (var6 = 1; var6 < 103; ++var6) { // L: 3195 + if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { // L: 3196 + ArchiveLoader.scene.drawTileMinimap(var33, var5, 512, var1, var6, var4); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { // L: 3197 + ArchiveLoader.scene.drawTileMinimap(var33, var5, 512, var1 + 1, var6, var4); + } + + var5 += 4; // L: 3198 + } + } + + var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3201 + var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3202 + HealthBarUpdate.sceneMinimapSprite.setRaster(); // L: 3203 + + for (var6 = 1; var6 < 103; ++var6) { // L: 3204 + for (var7 = 1; var7 < 103; ++var7) { // L: 3205 + if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { // L: 3206 + GrandExchangeOfferUnitPriceComparator.drawObject(var1, var7, var6, var4, var5); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { // L: 3207 + GrandExchangeOfferUnitPriceComparator.drawObject(var1 + 1, var7, var6, var4, var5); + } + } + } + + mapIconCount = 0; // L: 3210 + + for (var6 = 0; var6 < 104; ++var6) { // L: 3211 + for (var7 = 0; var7 < 104; ++var7) { // L: 3212 + long var23 = ArchiveLoader.scene.getFloorDecorationTag(class18.Client_plane, var6, var7); // L: 3213 + if (0L != var23) { // L: 3214 + var10 = FileSystem.Entity_unpackID(var23); // L: 3215 + var11 = class146.getObjectDefinition(var10).mapIconId; // L: 3216 + if (var11 >= 0 && UserComparator7.WorldMapElement_get(var11).field1823) { // L: 3217 3218 + mapIcons[mapIconCount] = UserComparator7.WorldMapElement_get(var11).getSpriteBool(false); // L: 3221 + mapIconXs[mapIconCount] = var6; // L: 3222 + mapIconYs[mapIconCount] = var7; // L: 3223 + ++mapIconCount; // L: 3224 } + } + } + } - if (var31 != null) { // L: 2788 - var31.packetBuffer.method7756(var31.packetBuffer.offset - var3); // L: 2789 - var7 = var31.packetBuffer.offset; // L: 2790 - var31.packetBuffer.offset = var3; // L: 2791 - var31.packetBuffer.writeByte(var5 / var6); // L: 2792 - var31.packetBuffer.writeByte(var5 % var6); // L: 2793 - var31.packetBuffer.offset = var7; // L: 2794 - packetWriter.addNode(var31); // L: 2795 - } + FontName.rasterProvider.apply(); // L: 3229 + } - if (var4 >= BuddyRankComparator.mouseRecorder.index) { // L: 2797 - BuddyRankComparator.mouseRecorder.index = 0; - } else { - MouseRecorder var49 = BuddyRankComparator.mouseRecorder; // L: 2799 - var49.index -= var4; - System.arraycopy(BuddyRankComparator.mouseRecorder.xs, var4, BuddyRankComparator.mouseRecorder.xs, 0, BuddyRankComparator.mouseRecorder.index); // L: 2800 - System.arraycopy(BuddyRankComparator.mouseRecorder.ys, var4, BuddyRankComparator.mouseRecorder.ys, 0, BuddyRankComparator.mouseRecorder.index); // L: 2801 - System.arraycopy(BuddyRankComparator.mouseRecorder.millis, var4, BuddyRankComparator.mouseRecorder.millis, 0, BuddyRankComparator.mouseRecorder.index); // L: 2802 + if (gameState == 30) { // L: 3233 + MenuAction.method1907(); // L: 3234 + class136.method2923(); // L: 3235 + ++packetWriter.field1322; // L: 3236 + if (packetWriter.field1322 > 750) { // L: 3237 + ClanChannelMember.method2868(); // L: 3238 + } else { + class92.method2362(); // L: 3241 + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 3243 + var2 = npcIndices[var1]; // L: 3244 + NPC var25 = npcs[var2]; // L: 3245 + if (var25 != null) { // L: 3246 + class149.updateActorSequence(var25, var25.definition.size); // L: 3247 + } + } + + int[] var31 = Players.Players_indices; // L: 3252 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 3253 + Player var35 = players[var31[var2]]; // L: 3254 + if (var35 != null && var35.overheadTextCyclesRemaining > 0) { // L: 3255 + --var35.overheadTextCyclesRemaining; // L: 3256 + if (var35.overheadTextCyclesRemaining == 0) { // L: 3257 + var35.overheadText = null; } } } - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2808 - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2809 - if (var16 > 32767L) { // L: 2810 - var16 = 32767L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2811 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2812 - if (var3 < 0) { // L: 2813 - var3 = 0; - } else if (var3 > class309.canvasHeight) { // L: 2814 - var3 = class309.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2815 - if (var4 < 0) { // L: 2816 - var4 = 0; - } else if (var4 > class4.canvasWidth) { // L: 2817 - var4 = class4.canvasWidth; - } - - var5 = (int)var16; // L: 2818 - var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2955, packetWriter.isaacCipher); // L: 2819 - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2820 - var18.packetBuffer.writeShort(var4); // L: 2821 - var18.packetBuffer.writeShort(var3); // L: 2822 - packetWriter.addNode(var18); // L: 2823 - } - - if (KeyHandler.field132 > 0) { // L: 2825 - var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); // L: 2826 - var14.packetBuffer.writeShort(0); // L: 2827 - var15 = var14.packetBuffer.offset; // L: 2828 - long var19 = WorldMapSprite.method4989(); // L: 2829 - - for (var5 = 0; var5 < KeyHandler.field132; ++var5) { // L: 2830 - long var21 = var19 - field718; // L: 2831 - if (var21 > 16777215L) { // L: 2832 - var21 = 16777215L; + for (var2 = 0; var2 < npcCount; ++var2) { // L: 3260 + var3 = npcIndices[var2]; // L: 3261 + NPC var26 = npcs[var3]; // L: 3262 + if (var26 != null && var26.overheadTextCyclesRemaining > 0) { // L: 3263 + --var26.overheadTextCyclesRemaining; // L: 3264 + if (var26.overheadTextCyclesRemaining == 0) { // L: 3265 + var26.overheadText = null; } - - field718 = var19; // L: 2833 - var14.packetBuffer.writeByte(KeyHandler.field139[var5]); // L: 2834 - var14.packetBuffer.method7803((int)var21); // L: 2835 - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 2837 - packetWriter.addNode(var14); // L: 2838 - } - - if (field542 > 0) { // L: 2840 - --field542; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2841 - field616 = true; - } - - if (field616 && field542 <= 0) { // L: 2842 - field542 = 20; // L: 2843 - field616 = false; // L: 2844 - var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2975, packetWriter.isaacCipher); // L: 2846 - var14.packetBuffer.method7796(camAngleY); // L: 2847 - var14.packetBuffer.writeShort(camAngleX); // L: 2848 - packetWriter.addNode(var14); // L: 2849 - } - - if (Varps.hasFocus && !hadFocus) { // L: 2851 - hadFocus = true; // L: 2852 - var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2897, packetWriter.isaacCipher); // L: 2854 - var14.packetBuffer.writeByte(1); // L: 2855 - packetWriter.addNode(var14); // L: 2856 - } - - if (!Varps.hasFocus && hadFocus) { // L: 2858 - hadFocus = false; // L: 2859 - var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2897, packetWriter.isaacCipher); // L: 2861 - var14.packetBuffer.writeByte(0); // L: 2862 - packetWriter.addNode(var14); // L: 2863 - } - - if (ClanChannel.worldMap != null) { // L: 2866 - ClanChannel.worldMap.method7303(); - } - - UserComparator7.method2577(); // L: 2867 - if (class82.field1070) { // L: 2869 - SecureRandomFuture.method1968(); // L: 2870 - class82.field1070 = false; // L: 2871 - } - - WorldMapSectionType.method4945(); // L: 2874 - if (gameState != 30) { // L: 2875 - return; - } - - class286.method5549(); // L: 2876 - - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2878 - var10002 = queuedSoundEffectDelays[var1]--; // L: 2879 - if (queuedSoundEffectDelays[var1] >= -10) { // L: 2880 - SoundEffect var32 = soundEffects[var1]; // L: 2892 - if (var32 == null) { // L: 2893 - var10000 = null; // L: 2894 - var32 = SoundEffect.readSoundEffect(MouseHandler.archive4, soundEffectIds[var1], 0); - if (var32 == null) { // L: 2895 - continue; - } - - int[] var50 = queuedSoundEffectDelays; // L: 2896 - var50[var1] += var32.calculateDelay(); - soundEffects[var1] = var32; // L: 2897 - } - - if (queuedSoundEffectDelays[var1] < 0) { // L: 2903 - if (soundLocations[var1] != 0) { // L: 2905 - var4 = (soundLocations[var1] & 255) * 128; // L: 2906 - var5 = soundLocations[var1] >> 16 & 255; // L: 2907 - var6 = var5 * 128 + 64 - class19.localPlayer.x; // L: 2908 - if (var6 < 0) { // L: 2909 - var6 = -var6; - } - - var7 = soundLocations[var1] >> 8 & 255; // L: 2910 - var8 = var7 * 128 + 64 - class19.localPlayer.y; // L: 2911 - if (var8 < 0) { // L: 2912 - var8 = -var8; - } - - var9 = var8 + var6 - 128; // L: 2913 - if (var9 > var4) { // L: 2914 - queuedSoundEffectDelays[var1] = -100; // L: 2915 - continue; // L: 2916 - } - - if (var9 < 0) { // L: 2918 - var9 = 0; - } - - var3 = (var4 - var9) * Interpreter.clientPreferences.method2286() / var4; // L: 2919 - } else { - var3 = Interpreter.clientPreferences.method2269(); // L: 2921 - } - - if (var3 > 0) { // L: 2922 - RawSound var23 = var32.toRawSound().resample(LoginScreenAnimation.decimator); // L: 2923 - RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 2924 - var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 2925 - WorldMapIcon_1.pcmStreamMixer.addSubStream(var24); // L: 2926 - } - - queuedSoundEffectDelays[var1] = -100; // L: 2928 - } - } else { - --soundEffectCount; // L: 2881 - - for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 2882 - soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 2883 - soundEffects[var15] = soundEffects[var15 + 1]; // L: 2884 - queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 2885 - queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 2886 - soundLocations[var15] = soundLocations[var15 + 1]; // L: 2887 - } - - --var1; // L: 2889 } } - if (field731 && !KeyHandler.method376()) { // L: 2931 - if (Interpreter.clientPreferences.method2288() != 0 && currentTrackGroupId != -1) { // L: 2932 - WorldMapSection2.method4561(ArchiveLoader.archive6, currentTrackGroupId, 0, Interpreter.clientPreferences.method2288(), false); - } - - field731 = false; // L: 2933 - } - - ++packetWriter.field1326; // L: 2936 - if (packetWriter.field1326 > 750) { // L: 2937 - class9.method64(); // L: 2938 - return; // L: 2939 - } - - var1 = Players.Players_count; // L: 2942 - int[] var33 = Players.Players_indices; // L: 2943 - - for (var3 = 0; var3 < var1; ++var3) { // L: 2944 - Player var42 = players[var33[var3]]; // L: 2945 - if (var42 != null) { // L: 2946 - BuddyRankComparator.updateActorSequence(var42, 1); // L: 2947 - } - } - - for (var1 = 0; var1 < npcCount; ++var1) { // L: 2952 - var15 = npcIndices[var1]; // L: 2953 - NPC var25 = npcs[var15]; // L: 2954 - if (var25 != null) { // L: 2955 - BuddyRankComparator.updateActorSequence(var25, var25.definition.size); // L: 2956 - } - } - - VarpDefinition.method3345(); // L: 2960 - ++field550; // L: 2961 - if (mouseCrossColor != 0) { // L: 2962 - mouseCrossState += 20; // L: 2963 - if (mouseCrossState >= 400) { // L: 2964 + ++field556; // L: 3269 + if (mouseCrossColor != 0) { // L: 3270 + mouseCrossState += 20; // L: 3271 + if (mouseCrossState >= 400) { // L: 3272 mouseCrossColor = 0; } } - if (class12.field64 != null) { // L: 2966 - ++field595; // L: 2967 - if (field595 >= 15) { // L: 2968 - class290.invalidateWidget(class12.field64); // L: 2969 - class12.field64 = null; // L: 2970 + if (GrandExchangeOfferAgeComparator.field4011 != null) { // L: 3274 + ++field610; // L: 3275 + if (field610 >= 15) { // L: 3276 + class346.invalidateWidget(GrandExchangeOfferAgeComparator.field4011); // L: 3277 + GrandExchangeOfferAgeComparator.field4011 = null; // L: 3278 } } - Widget var39 = Player.mousedOverWidgetIf1; // L: 2973 - Widget var34 = class160.field1750; // L: 2974 - Player.mousedOverWidgetIf1 = null; // L: 2975 - class160.field1750 = null; // L: 2976 - draggedOnWidget = null; // L: 2977 - field671 = false; // L: 2978 - field668 = false; // L: 2979 - field713 = 0; // L: 2980 + Widget var32 = DevicePcmPlayerProvider.mousedOverWidgetIf1; // L: 3281 + Widget var34 = GrandExchangeOfferOwnWorldComparator.field486; // L: 3282 + DevicePcmPlayerProvider.mousedOverWidgetIf1 = null; // L: 3283 + GrandExchangeOfferOwnWorldComparator.field486 = null; // L: 3284 + draggedOnWidget = null; // L: 3285 + field687 = false; // L: 3286 + field696 = false; // L: 3287 + field731 = 0; // L: 3288 - while (class16.isKeyDown() && field713 < 128) { // L: 2981 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class241.field2833 == 66) { // L: 2982 - StringBuilder var43 = new StringBuilder(); // L: 2985 - - Message var40; - for (Iterator var45 = Messages.Messages_hashTable.iterator(); var45.hasNext(); var43.append(var40.text).append('\n')) { // L: 2986 2992 - var40 = (Message)var45.next(); // L: 2987 - if (var40.sender != null && !var40.sender.isEmpty()) { // L: 2989 - var43.append(var40.sender).append(':'); // L: 2990 - } - } - - String var48 = var43.toString(); // L: 2995 - UserComparator10.client.method535(var48); // L: 2998 - } else if (oculusOrbState != 1 || class1.field3 <= 0) { // L: 3001 - field568[field713] = class241.field2833; // L: 3004 - field716[field713] = class1.field3; // L: 3005 - ++field713; // L: 3006 + while (SecureRandomCallable.isKeyDown() && field731 < 128) { // L: 3289 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && GameEngine.field218 == 66) { // L: 3290 + String var36 = TextureProvider.method4950(); // L: 3291 + class127.client.method452(var36); // L: 3292 + } else if (oculusOrbState != 1 || ItemComposition.field2121 <= 0) { // L: 3295 + field733[field731] = GameEngine.field218; // L: 3298 + field732[field731] = ItemComposition.field2121; // L: 3299 + ++field731; // L: 3300 } } - boolean var35 = staffModLevel >= 2; // L: 3010 - if (var35 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3012 - var4 = class19.localPlayer.plane - mouseWheelRotation; // L: 3013 - if (var4 < 0) { // L: 3014 - var4 = 0; - } else if (var4 > 3) { // L: 3015 - var4 = 3; + if (class113.method2651() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3302 + var3 = GrandExchangeEvents.localPlayer.plane - mouseWheelRotation; // L: 3303 + if (var3 < 0) { // L: 3304 + var3 = 0; + } else if (var3 > 3) { // L: 3305 + var3 = 3; } - if (var4 != class19.localPlayer.plane) { // L: 3016 - class392.method7191(class19.localPlayer.pathX[0] + ApproximateRouteStrategy.baseX, class19.localPlayer.pathY[0] + class250.baseY, var4, false); // L: 3017 + if (var3 != GrandExchangeEvents.localPlayer.plane) { // L: 3306 + StructComposition.method3619(GrandExchangeEvents.localPlayer.pathX[0] + GrandExchangeOfferOwnWorldComparator.baseX, GrandExchangeEvents.localPlayer.pathY[0] + VarcInt.baseY, var3, false); // L: 3307 } - mouseWheelRotation = 0; // L: 3019 + mouseWheelRotation = 0; // L: 3309 } - if (rootInterface != -1) { // L: 3021 - ItemComposition.updateRootInterface(rootInterface, 0, 0, class4.canvasWidth, class309.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 3311 + Language.updateRootInterface(rootInterface, 0, 0, InvDefinition.canvasWidth, class321.canvasHeight, 0, 0); } - ++cycleCntr; // L: 3022 + ++cycleCntr; // L: 3312 while (true) { - Widget var41; - ScriptEvent var44; - Widget var46; + Widget var27; + ScriptEvent var37; + Widget var38; do { - var44 = (ScriptEvent)field694.removeLast(); // L: 3024 - if (var44 == null) { // L: 3025 + var37 = (ScriptEvent)field710.removeLast(); // L: 3314 + if (var37 == null) { // L: 3315 while (true) { do { - var44 = (ScriptEvent)field695.removeLast(); // L: 3036 - if (var44 == null) { // L: 3037 + var37 = (ScriptEvent)field711.removeLast(); // L: 3326 + if (var37 == null) { // L: 3327 while (true) { do { - var44 = (ScriptEvent)scriptEvents.removeLast(); // L: 3048 - if (var44 == null) { // L: 3049 - this.menu(); // L: 3059 - class154.method3127(); // L: 3060 - if (clickedWidget != null) { // L: 3061 - this.method1159(); + var37 = (ScriptEvent)scriptEvents.removeLast(); // L: 3338 + if (var37 == null) { // L: 3339 + this.menu(); // L: 3349 + if (ScriptFrame.worldMap != null) { // L: 3351 + ScriptFrame.worldMap.method7327(class18.Client_plane, (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX, (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY, false); // L: 3352 + ScriptFrame.worldMap.loadCache(); // L: 3353 } - if (FloorDecoration.dragInventoryWidget != null) { // L: 3062 - class290.invalidateWidget(FloorDecoration.dragInventoryWidget); // L: 3063 - ++itemDragDuration; // L: 3064 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3065 - if (field601) { // L: 3066 - if (FloorDecoration.dragInventoryWidget == GrandExchangeEvent.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3067 - Widget var47 = FloorDecoration.dragInventoryWidget; // L: 3068 - byte var36 = 0; // L: 3069 - if (field655 == 1 && var47.contentType == 206) { // L: 3070 - var36 = 1; + if (clickedWidget != null) { // L: 3356 + this.method1164(); + } + + PacketBufferNode var40; + if (class142.dragInventoryWidget != null) { // L: 3357 + class346.invalidateWidget(class142.dragInventoryWidget); // L: 3358 + ++itemDragDuration; // L: 3359 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3360 + if (field767) { // L: 3361 + if (class142.dragInventoryWidget == GrandExchangeEvent.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3362 + Widget var39 = class142.dragInventoryWidget; // L: 3363 + byte var30 = 0; // L: 3364 + if (field524 == 1 && var39.contentType == 206) { // L: 3365 + var30 = 1; } - if (var47.itemIds[dragItemSlotDestination] <= 0) { // L: 3071 - var36 = 0; + if (var39.itemIds[dragItemSlotDestination] <= 0) { // L: 3366 + var30 = 0; } - if (class239.method4998(WorldMapSection2.getWidgetFlags(var47))) { // L: 3072 - var6 = dragItemSlotSource; // L: 3073 - var7 = dragItemSlotDestination; // L: 3074 - var47.itemIds[var7] = var47.itemIds[var6]; // L: 3075 - var47.itemQuantities[var7] = var47.itemQuantities[var6]; // L: 3076 - var47.itemIds[var6] = -1; // L: 3077 - var47.itemQuantities[var6] = 0; // L: 3078 - } else if (var36 == 1) { // L: 3080 - var6 = dragItemSlotSource; // L: 3081 - var7 = dragItemSlotDestination; // L: 3082 + if (ReflectionCheck.method1079(class326.getWidgetFlags(var39))) { // L: 3367 + var5 = dragItemSlotSource; // L: 3368 + var6 = dragItemSlotDestination; // L: 3369 + var39.itemIds[var6] = var39.itemIds[var5]; // L: 3370 + var39.itemQuantities[var6] = var39.itemQuantities[var5]; // L: 3371 + var39.itemIds[var5] = -1; // L: 3372 + var39.itemQuantities[var5] = 0; // L: 3373 + } else if (var30 == 1) { // L: 3375 + var5 = dragItemSlotSource; // L: 3376 + var6 = dragItemSlotDestination; // L: 3377 - while (var7 != var6) { // L: 3083 - if (var6 > var7) { // L: 3084 - var47.swapItems(var6 - 1, var6); // L: 3085 - --var6; // L: 3086 - } else if (var6 < var7) { // L: 3088 - var47.swapItems(var6 + 1, var6); // L: 3089 - ++var6; // L: 3090 + while (var6 != var5) { // L: 3378 + if (var5 > var6) { // L: 3379 + var39.swapItems(var5 - 1, var5); // L: 3380 + --var5; // L: 3381 + } else if (var5 < var6) { // L: 3383 + var39.swapItems(var5 + 1, var5); // L: 3384 + ++var5; // L: 3385 } } } else { - var47.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3095 + var39.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3390 } - var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2996, packetWriter.isaacCipher); // L: 3098 - var18.packetBuffer.method7791(dragItemSlotDestination); // L: 3099 - var18.packetBuffer.method7795(dragItemSlotSource); // L: 3100 - var18.packetBuffer.method7806(FloorDecoration.dragInventoryWidget.id); // L: 3101 - var18.packetBuffer.method7787(var36); // L: 3102 - packetWriter.addNode(var18); // L: 3103 + var40 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2996, packetWriter.isaacCipher); // L: 3393 + var40.packetBuffer.method7712(dragItemSlotDestination); // L: 3394 + var40.packetBuffer.method7710(dragItemSlotSource); // L: 3395 + var40.packetBuffer.method7721(class142.dragInventoryWidget.id); // L: 3396 + var40.packetBuffer.method7804(var30); // L: 3397 + packetWriter.addNode(var40); // L: 3398 } - } else if (this.shouldLeftClickOpenMenu()) { // L: 3107 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3108 - } else if (menuOptionsCount > 0) { // L: 3110 - UserComparator8.method2576(draggedWidgetX, draggedWidgetY); // L: 3111 + } else if (this.shouldLeftClickOpenMenu()) { // L: 3402 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3403 + } else if (menuOptionsCount > 0) { // L: 3405 + UrlRequest.method2551(draggedWidgetX, draggedWidgetY); // L: 3406 } - field595 = 10; // L: 3114 - MouseHandler.MouseHandler_lastButton = 0; // L: 3115 - FloorDecoration.dragInventoryWidget = null; // L: 3116 - } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3119 3120 - field601 = true; // L: 3121 + field610 = 10; // L: 3409 + MouseHandler.MouseHandler_lastButton = 0; // L: 3410 + class142.dragInventoryWidget = null; // L: 3411 + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3414 3415 + field767 = true; // L: 3416 } } - if (Scene.shouldSendWalk()) { // L: 3126 - var4 = Scene.Scene_selectedX; // L: 3127 - var5 = Scene.Scene_selectedY; // L: 3128 - var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2911, packetWriter.isaacCipher); // L: 3130 - var18.packetBuffer.writeByte(5); // L: 3131 - var18.packetBuffer.method7795(var4 + ApproximateRouteStrategy.baseX); // L: 3132 - var18.packetBuffer.writeShort(var5 + class250.baseY); // L: 3133 - var18.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3134 - packetWriter.addNode(var18); // L: 3135 - Scene.method4167(); // L: 3136 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3137 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3138 - mouseCrossColor = 1; // L: 3139 - mouseCrossState = 0; // L: 3140 - destinationX = var4; // L: 3141 - destinationY = var5; // L: 3142 + if (Scene.shouldSendWalk()) { // L: 3421 + var3 = Scene.Scene_selectedX; // L: 3422 + var4 = Scene.Scene_selectedY; // L: 3423 + var40 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2911, packetWriter.isaacCipher); // L: 3425 + var40.packetBuffer.writeByte(5); // L: 3426 + var40.packetBuffer.method7710(var3 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 3427 + var40.packetBuffer.writeShort(var4 + VarcInt.baseY); // L: 3428 + var40.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3429 + packetWriter.addNode(var40); // L: 3430 + Scene.method4771(); // L: 3431 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3432 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3433 + mouseCrossColor = 1; // L: 3434 + mouseCrossState = 0; // L: 3435 + destinationX = var3; // L: 3436 + destinationY = var4; // L: 3437 } - if (var39 != Player.mousedOverWidgetIf1) { // L: 3144 - if (var39 != null) { // L: 3145 - class290.invalidateWidget(var39); + if (var32 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 3439 + if (var32 != null) { // L: 3440 + class346.invalidateWidget(var32); } - if (Player.mousedOverWidgetIf1 != null) { // L: 3146 - class290.invalidateWidget(Player.mousedOverWidgetIf1); + if (DevicePcmPlayerProvider.mousedOverWidgetIf1 != null) { // L: 3441 + class346.invalidateWidget(DevicePcmPlayerProvider.mousedOverWidgetIf1); } } - if (var34 != class160.field1750 && field641 == field642) { // L: 3148 - if (var34 != null) { // L: 3149 - class290.invalidateWidget(var34); + if (var34 != GrandExchangeOfferOwnWorldComparator.field486 && field657 == field656) { // L: 3443 + if (var34 != null) { // L: 3444 + class346.invalidateWidget(var34); } - if (class160.field1750 != null) { // L: 3150 - class290.invalidateWidget(class160.field1750); + if (GrandExchangeOfferOwnWorldComparator.field486 != null) { // L: 3445 + class346.invalidateWidget(GrandExchangeOfferOwnWorldComparator.field486); } } - if (class160.field1750 != null) { // L: 3152 - if (field641 < field642) { // L: 3153 - ++field641; // L: 3154 - if (field642 == field641) { // L: 3155 - class290.invalidateWidget(class160.field1750); + if (GrandExchangeOfferOwnWorldComparator.field486 != null) { // L: 3447 + if (field656 < field657) { // L: 3448 + ++field656; // L: 3449 + if (field656 == field657) { // L: 3450 + class346.invalidateWidget(GrandExchangeOfferOwnWorldComparator.field486); } } - } else if (field641 > 0) { // L: 3158 - --field641; + } else if (field656 > 0) { // L: 3453 + --field656; } - if (oculusOrbState == 0) { // L: 3160 - var4 = class19.localPlayer.x; // L: 3161 - var5 = class19.localPlayer.y; // L: 3162 - if (Messages.oculusOrbFocalPointX - var4 < -500 || Messages.oculusOrbFocalPointX - var4 > 500 || class115.oculusOrbFocalPointY - var5 < -500 || class115.oculusOrbFocalPointY - var5 > 500) { // L: 3163 - Messages.oculusOrbFocalPointX = var4; // L: 3164 - class115.oculusOrbFocalPointY = var5; // L: 3165 - } - - if (var4 != Messages.oculusOrbFocalPointX) { // L: 3167 - Messages.oculusOrbFocalPointX += (var4 - Messages.oculusOrbFocalPointX) / 16; - } - - if (var5 != class115.oculusOrbFocalPointY) { // L: 3168 - class115.oculusOrbFocalPointY += (var5 - class115.oculusOrbFocalPointY) / 16; - } - - var6 = Messages.oculusOrbFocalPointX >> 7; // L: 3169 - var7 = class115.oculusOrbFocalPointY >> 7; // L: 3170 - var8 = Archive.getTileHeight(Messages.oculusOrbFocalPointX, class115.oculusOrbFocalPointY, class160.Client_plane); // L: 3171 - var9 = 0; // L: 3172 - if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3173 - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3174 - for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3175 - var12 = class160.Client_plane; // L: 3176 - if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3177 - ++var12; - } - - int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3178 - if (var26 > var9) { // L: 3179 - var9 = var26; - } - } - } - } - - var10 = var9 * 192; // L: 3183 - if (var10 > 98048) { // L: 3184 - var10 = 98048; - } - - if (var10 < 32768) { // L: 3185 - var10 = 32768; - } - - if (var10 > field756) { // L: 3186 - field756 += (var10 - field756) / 24; - } else if (var10 < field756) { // L: 3187 - field756 += (var10 - field756) / 80; - } - - FloorOverlayDefinition.field2136 = Archive.getTileHeight(class19.localPlayer.x, class19.localPlayer.y, class160.Client_plane) - camFollowHeight; // L: 3188 - } else if (oculusOrbState == 1) { // L: 3190 - class391.method7169(); // L: 3191 - short var37 = -1; // L: 3192 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3193 - var37 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3194 - var37 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3195 - if (var37 == 0) { // L: 3196 - var37 = 1792; - } else if (var37 == 1024) { // L: 3197 - var37 = 1280; - } else { - var37 = 1536; // L: 3198 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3200 - if (var37 == 0) { // L: 3201 - var37 = 256; - } else if (var37 == 1024) { // L: 3202 - var37 = 768; - } else { - var37 = 512; // L: 3203 - } - } - - byte var38 = 0; // L: 3205 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3206 - var38 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3207 - var38 = 1; - } - - var6 = 0; // L: 3208 - if (var37 >= 0 || var38 != 0) { // L: 3209 - var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -881862903 * 881911609 : oculusOrbNormalSpeed * -1286782535 * -924814199; // L: 3210 - var6 *= 16; // L: 3211 - field567 = var37; // L: 3212 - field696 = var38; // L: 3213 - } - - if (field566 < var6) { // L: 3215 - field566 += var6 / 8; // L: 3216 - if (field566 > var6) { // L: 3217 - field566 = var6; - } - } else if (field566 > var6) { // L: 3219 - field566 = field566 * 9 / 10; - } - - if (field566 > 0) { // L: 3220 - var7 = field566 / 16; // L: 3221 - if (field567 >= 0) { // L: 3222 - var4 = field567 - MusicPatchNode2.cameraYaw & 2047; // L: 3223 - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3224 - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3225 - Messages.oculusOrbFocalPointX += var7 * var8 / 65536; // L: 3226 - class115.oculusOrbFocalPointY += var7 * var9 / 65536; // L: 3227 - } - - if (field696 != 0) { // L: 3229 - FloorOverlayDefinition.field2136 += var7 * field696; // L: 3230 - if (FloorOverlayDefinition.field2136 > 0) { // L: 3231 - FloorOverlayDefinition.field2136 = 0; - } - } - } else { - field567 = -1; // L: 3235 - field696 = -1; // L: 3236 - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3238 - class291.method5589(); // L: 3239 - } + class135.method2920(); // L: 3454 + if (field754) { // L: 3455 + SpotAnimationDefinition.method3545(); + } else if (isCameraLocked) { // L: 3456 + GrandExchangeOfferOwnWorldComparator.method1128(); } - if (MouseHandler.MouseHandler_currentButton == 4 && UserComparator5.mouseCam) { // L: 3242 - var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3243 - camAngleDX = var4 * 2; // L: 3244 - mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -501791789 * -601944997; // L: 3245 - var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3246 - camAngleDY = var5 * 2; // L: 3247 - mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 1113383001 * -833329175; // L: 3248 - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3251 - camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3252 - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; // L: 3253 - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3254 - camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3255 - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; // L: 3256 - } - - mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3257 - mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3258 + for (var3 = 0; var3 < 5; ++var3) { // L: 3457 + int var10002 = field600[var3]++; } - camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 3260 - camAngleX += camAngleDX / 2; // L: 3261 - if (camAngleX < 128) { // L: 3262 - camAngleX = 128; + class160.varcs.tryWrite(); // L: 3458 + var3 = World.method1677(); // L: 3459 + var4 = KeyHandler.KeyHandler_idleCycles; // L: 3462 + if (var3 > 15000 && var4 > 15000) { // L: 3465 + logoutTimer = 250; // L: 3466 + ClientPacket.method5176(14500); // L: 3467 + var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2979, packetWriter.isaacCipher); // L: 3469 + packetWriter.addNode(var18); // L: 3470 } - if (camAngleX > 383) { // L: 3263 - camAngleX = 383; - } - - if (field739) { // L: 3265 - class291.method5587(); - } else if (isCameraLocked) { // L: 3266 - class147.method3052(); - } - - for (var4 = 0; var4 < 5; ++var4) { // L: 3267 - var10002 = field744[var4]++; - } - - JagexCache.varcs.tryWrite(); // L: 3268 - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3271 - var6 = class18.method294(); // L: 3274 - PacketBufferNode var27; - if (var4 > 15000 && var6 > 15000) { // L: 3275 - logoutTimer = 250; // L: 3276 - ItemComposition.method3764(14500); // L: 3277 - var27 = ItemContainer.getPacketBufferNode(ClientPacket.field2979, packetWriter.isaacCipher); // L: 3279 - packetWriter.addNode(var27); // L: 3280 - } - - class155.friendSystem.processFriendUpdates(); // L: 3282 - ++packetWriter.pendingWrites; // L: 3283 - if (packetWriter.pendingWrites > 50) { // L: 3284 - var27 = ItemContainer.getPacketBufferNode(ClientPacket.field2950, packetWriter.isaacCipher); // L: 3286 - packetWriter.addNode(var27); // L: 3287 + Decimator.friendSystem.processFriendUpdates(); // L: 3472 + ++packetWriter.pendingWrites; // L: 3473 + if (packetWriter.pendingWrites > 50) { // L: 3474 + var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2950, packetWriter.isaacCipher); // L: 3476 + packetWriter.addNode(var18); // L: 3477 } try { - packetWriter.flush(); // L: 3290 - } catch (IOException var28) { // L: 3292 - class9.method64(); // L: 3293 + packetWriter.flush(); // L: 3480 + } catch (IOException var28) { // L: 3482 + ClanChannelMember.method2868(); // L: 3483 } - return; // L: 3295 + return; // L: 3485 } - var46 = var44.widget; // L: 3050 - if (var46.childIndex < 0) { // L: 3051 + var38 = var37.widget; // L: 3340 + if (var38.childIndex < 0) { // L: 3341 break; } - var41 = HorizontalAlignment.getWidget(var46.parentId); // L: 3052 - } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); // L: 3053 + var27 = class127.getWidget(var38.parentId); // L: 3342 + } while(var27 == null || var27.children == null || var38.childIndex >= var27.children.length || var38 != var27.children[var38.childIndex]); // L: 3343 - class1.runScriptEvent(var44); // L: 3057 + ClanSettings.runScriptEvent(var37); // L: 3347 } } - var46 = var44.widget; // L: 3038 - if (var46.childIndex < 0) { // L: 3039 + var38 = var37.widget; // L: 3328 + if (var38.childIndex < 0) { // L: 3329 break; } - var41 = HorizontalAlignment.getWidget(var46.parentId); // L: 3040 - } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); // L: 3041 + var27 = class127.getWidget(var38.parentId); // L: 3330 + } while(var27 == null || var27.children == null || var38.childIndex >= var27.children.length || var38 != var27.children[var38.childIndex]); // L: 3331 - class1.runScriptEvent(var44); // L: 3045 + ClanSettings.runScriptEvent(var37); // L: 3335 } } - var46 = var44.widget; // L: 3026 - if (var46.childIndex < 0) { // L: 3027 + var38 = var37.widget; // L: 3316 + if (var38.childIndex < 0) { // L: 3317 break; } - var41 = HorizontalAlignment.getWidget(var46.parentId); // L: 3028 - } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); // L: 3029 + var27 = class127.getWidget(var38.parentId); // L: 3318 + } while(var27 == null || var27.children == null || var38.childIndex >= var27.children.length || var38 != var27.children[var38.childIndex]); // L: 3319 - class1.runScriptEvent(var44); // L: 3033 + ClanSettings.runScriptEvent(var37); // L: 3323 } } - - var31 = ItemContainer.getPacketBufferNode(ClientPacket.field2914, packetWriter.isaacCipher); // L: 2701 - var31.packetBuffer.writeByte(0); // L: 2702 - var3 = var31.packetBuffer.offset; // L: 2703 - WorldMapAreaData.performReflectionCheck(var31.packetBuffer); // L: 2704 - var31.packetBuffer.method7756(var31.packetBuffer.offset - var3); // L: 2705 - packetWriter.addNode(var31); // L: 2706 } } } - } // L: 2683 + } // L: 3001 3239 - @ObfuscatedName("gm") + @ObfuscatedName("ga") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-70275720" + garbageValue = "-1620064665" ) @Export("resizeJS") void resizeJS() { - int var1 = class4.canvasWidth; // L: 3953 - int var2 = class309.canvasHeight; // L: 3954 - if (super.contentWidth < var1) { // L: 3955 + int var1 = InvDefinition.canvasWidth; // L: 4291 + int var2 = class321.canvasHeight; // L: 4292 + if (super.contentWidth < var1) { // L: 4293 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 3956 + var2 = super.contentHeight; // L: 4294 } - if (Interpreter.clientPreferences != null) { // L: 3957 + if (class131.clientPreferences != null) { // L: 4295 try { - class27.method412(UserComparator10.client, "resize", new Object[]{ReflectionCheck.getWindowedMode()}); // L: 3959 - } catch (Throwable var4) { // L: 3961 + Client var3 = class127.client; // L: 4297 + Object[] var4 = new Object[]{getWindowedMode()}; // L: 4298 + JSObject.getWindow(var3).call("resize", var4); // L: 4301 + } catch (Throwable var5) { // L: 4304 } } - } // L: 3963 + } // L: 4306 - @ObfuscatedName("gt") + @ObfuscatedName("gu") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1155883709" + descriptor = "(S)V", + garbageValue = "-27115" ) @Export("drawLoggedIn") final void drawLoggedIn() { + if (rootInterface != -1) { // L: 4309 + class115.method2680(rootInterface); + } + int var1; - if (rootInterface != -1) { // L: 3966 - var1 = rootInterface; // L: 3967 - if (MusicPatchNode2.loadInterface(var1)) { // L: 3969 - ItemComposition.drawModelComponents(EnumComposition.Widget_interfaceComponents[var1], -1); // L: 3970 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4310 + if (field715[var1]) { // L: 4311 + field716[var1] = true; + } + + field717[var1] = field715[var1]; // L: 4312 + field715[var1] = false; // L: 4313 + } + + field540 = cycle; // L: 4315 + viewportX = -1; // L: 4316 + viewportY = -1; // L: 4317 + GrandExchangeEvent.hoveredItemContainer = null; // L: 4318 + if (rootInterface != -1) { // L: 4319 + rootWidgetCount = 0; // L: 4320 + class131.drawWidgets(rootInterface, 0, 0, InvDefinition.canvasWidth, class321.canvasHeight, 0, 0, -1); // L: 4321 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4323 + if (showMouseCross) { // L: 4324 + if (mouseCrossColor == 1) { // L: 4325 + class11.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4326 + } + + if (mouseCrossColor == 2) { // L: 4328 + class11.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4329 } } - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3973 - if (field564[var1]) { // L: 3974 - field651[var1] = true; - } - - field576[var1] = field564[var1]; // L: 3975 - field564[var1] = false; // L: 3976 - } - - field698 = cycle; // L: 3978 - viewportX = -1; // L: 3979 - viewportY = -1; // L: 3980 - GrandExchangeEvent.hoveredItemContainer = null; // L: 3981 - if (rootInterface != -1) { // L: 3982 - rootWidgetCount = 0; // L: 3983 - class11.drawWidgets(rootInterface, 0, 0, class4.canvasWidth, class309.canvasHeight, 0, 0, -1); // L: 3984 - } - - Rasterizer2D.Rasterizer2D_resetClip(); // L: 3986 - if (showMouseCross) { // L: 3987 - if (mouseCrossColor == 1) { // L: 3988 - crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3989 - } - - if (mouseCrossColor == 2) { // L: 3991 - crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3992 - } - } - - int var2; - int var3; - if (!isMenuOpen) { // L: 3995 - if (viewportX != -1) { // L: 3996 - var1 = viewportX; // L: 3997 - var2 = viewportY; // L: 3998 - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 4000 4001 - var3 = class168.method3324(); // L: 4002 - String var11; - if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 4004 - var11 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { // L: 4005 - var11 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; - } else { - var11 = ReflectionCheck.method637(var3); // L: 4006 - } - - if (menuOptionsCount > 2) { // L: 4007 - var11 = var11 + ChatChannel.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; - } - - FloorOverlayDefinition.fontBold12.drawRandomAlphaAndSpacing(var11, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 4008 - } + if (!isMenuOpen) { // L: 4332 + if (viewportX != -1) { // L: 4333 + UrlRequester.method2537(viewportX, viewportY); } } else { - var1 = class307.menuX; // L: 4013 - var2 = ArchiveDiskActionHandler.menuY; // L: 4014 - var3 = class11.menuWidth; // L: 4015 - int var4 = UrlRequester.menuHeight; // L: 4016 - int var5 = 6116423; // L: 4017 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4018 - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4019 - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4020 - FloorOverlayDefinition.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4021 - int var6 = MouseHandler.MouseHandler_x; // L: 4022 - int var7 = MouseHandler.MouseHandler_y; // L: 4023 - - for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4024 - int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 4025 - int var10 = 16777215; // L: 4026 - if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4027 - var10 = 16776960; - } - - FloorOverlayDefinition.fontBold12.draw(ReflectionCheck.method637(var8), var1 + 3, var9, var10, 0); // L: 4028 - } - - LoginScreenAnimation.method2240(class307.menuX, ArchiveDiskActionHandler.menuY, class11.menuWidth, UrlRequester.menuHeight); // L: 4030 + Coord.method5531(); // L: 4335 } - if (gameDrawingMode == 3) { // L: 4032 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4033 - if (field576[var1]) { // L: 4034 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4035 - } else if (field651[var1]) { // L: 4037 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4038 + if (gameDrawingMode == 3) { // L: 4336 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4337 + if (field717[var1]) { // L: 4338 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4339 + } else if (field716[var1]) { // L: 4341 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4342 } } } - class268.method5232(class160.Client_plane, class19.localPlayer.x, class19.localPlayer.y, field550); // L: 4042 - field550 = 0; // L: 4043 - } // L: 4044 + var1 = class18.Client_plane; // L: 4346 + int var2 = GrandExchangeEvents.localPlayer.x; // L: 4347 + int var3 = GrandExchangeEvents.localPlayer.y; // L: 4348 + int var4 = field556; // L: 4349 - @ObfuscatedName("hh") + for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4351 + if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { // L: 4352 + int var6 = 0; // L: 4353 + if (var2 > var5.maxX) { // L: 4354 + var6 += var2 - var5.maxX; + } else if (var2 < var5.x) { // L: 4355 + var6 += var5.x - var2; + } + + if (var3 > var5.maxY) { // L: 4356 + var6 += var3 - var5.maxY; + } else if (var3 < var5.y) { // L: 4357 + var6 += var5.y - var3; + } + + if (var6 - 64 <= var5.field814 && class131.clientPreferences.method2270() != 0 && var1 == var5.plane) { // L: 4358 + var6 -= 64; // L: 4369 + if (var6 < 0) { // L: 4370 + var6 = 0; + } + + int var7 = (var5.field814 - var6) * class131.clientPreferences.method2270() / var5.field814; // L: 4371 + Object var10000; + if (var5.stream1 == null) { // L: 4372 + if (var5.soundEffectId >= 0) { // L: 4373 + var10000 = null; // L: 4374 + SoundEffect var8 = SoundEffect.readSoundEffect(class182.archive4, var5.soundEffectId, 0); + if (var8 != null) { // L: 4375 + RawSound var9 = var8.toRawSound().resample(WorldMapRectangle.decimator); // L: 4376 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); // L: 4377 + var10.setNumLoops(-1); // L: 4378 + StructComposition.pcmStreamMixer.addSubStream(var10); // L: 4379 + var5.stream1 = var10; // L: 4380 + } + } + } else { + var5.stream1.method929(var7); // L: 4384 + } + + if (var5.stream2 == null) { // L: 4385 + if (var5.soundEffectIds != null && (var5.field821 -= var4) <= 0) { // L: 4386 + int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 4387 + var10000 = null; // L: 4388 + SoundEffect var13 = SoundEffect.readSoundEffect(class182.archive4, var5.soundEffectIds[var12], 0); + if (var13 != null) { // L: 4389 + RawSound var14 = var13.toRawSound().resample(WorldMapRectangle.decimator); // L: 4390 + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 4391 + var11.setNumLoops(0); // L: 4392 + StructComposition.pcmStreamMixer.addSubStream(var11); // L: 4393 + var5.stream2 = var11; // L: 4394 + var5.field821 = var5.field818 + (int)(Math.random() * (double)(var5.field810 - var5.field818)); // L: 4395 + } + } + } else { + var5.stream2.method929(var7); // L: 4400 + if (!var5.stream2.hasNext()) { // L: 4401 + var5.stream2 = null; // L: 4402 + } + } + } else { + if (var5.stream1 != null) { // L: 4359 + StructComposition.pcmStreamMixer.removeSubStream(var5.stream1); // L: 4360 + var5.stream1 = null; // L: 4361 + } + + if (var5.stream2 != null) { // L: 4363 + StructComposition.pcmStreamMixer.removeSubStream(var5.stream2); // L: 4364 + var5.stream2 = null; // L: 4365 + } + } + } + } + + field556 = 0; // L: 4407 + } // L: 4408 + + @ObfuscatedName("hp") @ObfuscatedSignature( - descriptor = "(Lcj;I)Z", - garbageValue = "911154934" + descriptor = "(Lcl;B)Z", + garbageValue = "1" ) - final boolean method1153(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5641 - PacketBuffer var3 = var1.packetBuffer; // L: 5642 - if (var2 == null) { // L: 5643 + final boolean method1158(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5999 + PacketBuffer var3 = var1.packetBuffer; // L: 6000 + if (var2 == null) { // L: 6001 return false; } else { + int var6; String var21; - int var22; try { int var5; - if (var1.serverPacket == null) { // L: 5645 - if (var1.field1328) { // L: 5646 - if (!var2.isAvailable(1)) { // L: 5647 + if (var1.serverPacket == null) { // L: 6003 + if (var1.field1317) { // L: 6004 + if (!var2.isAvailable(1)) { // L: 6005 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5648 - var1.field1326 = 0; // L: 5649 - var1.field1328 = false; // L: 5650 + var2.read(var1.packetBuffer.array, 0, 1); // L: 6006 + var1.field1322 = 0; // L: 6007 + var1.field1317 = false; // L: 6008 } - var3.offset = 0; // L: 5652 - if (var3.method7701()) { // L: 5653 - if (!var2.isAvailable(1)) { // L: 5654 + var3.offset = 0; // L: 6010 + if (var3.method7622()) { // L: 6011 + if (!var2.isAvailable(1)) { // L: 6012 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5655 - var1.field1326 = 0; // L: 5656 + var2.read(var1.packetBuffer.array, 1, 1); // L: 6013 + var1.field1322 = 0; // L: 6014 } - var1.field1328 = true; // L: 5658 - ServerPacket[] var4 = class230.ServerPacket_values(); // L: 5659 - var5 = var3.readSmartByteShortIsaac(); // L: 5660 - if (var5 < 0 || var5 >= var4.length) { // L: 5661 + var1.field1317 = true; // L: 6016 + ServerPacket[] var4 = class82.ServerPacket_values(); // L: 6017 + var5 = var3.readSmartByteShortIsaac(); // L: 6018 + if (var5 < 0 || var5 >= var4.length) { // L: 6019 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5662 - var1.serverPacketLength = var1.serverPacket.length; // L: 5663 + var1.serverPacket = var4[var5]; // L: 6020 + var1.serverPacketLength = var1.serverPacket.length; // L: 6021 } - if (var1.serverPacketLength == -1) { // L: 5665 - if (!var2.isAvailable(1)) { // L: 5666 + if (var1.serverPacketLength == -1) { // L: 6023 + if (!var2.isAvailable(1)) { // L: 6024 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5667 - var1.serverPacketLength = var3.array[0] & 255; // L: 5668 + var1.getSocket().read(var3.array, 0, 1); // L: 6025 + var1.serverPacketLength = var3.array[0] & 255; // L: 6026 } - if (var1.serverPacketLength == -2) { // L: 5670 - if (!var2.isAvailable(2)) { // L: 5671 + if (var1.serverPacketLength == -2) { // L: 6028 + if (!var2.isAvailable(2)) { // L: 6029 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5672 - var3.offset = 0; // L: 5673 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5674 + var1.getSocket().read(var3.array, 0, 2); // L: 6030 + var3.offset = 0; // L: 6031 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 6032 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5676 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6034 return false; } - var3.offset = 0; // L: 5677 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 5678 - var1.field1326 = 0; // L: 5679 - timer.method6594(); // L: 5680 - var1.field1331 = var1.field1329; // L: 5681 - var1.field1329 = var1.field1320; // L: 5682 - var1.field1320 = var1.serverPacket; // L: 5683 - byte var70; - if (ServerPacket.field3043 == var1.serverPacket) { // L: 5684 - RouteStrategy.method3875(); // L: 5685 - var70 = var3.readByte(); // L: 5686 - class131 var83 = new class131(var3); // L: 5687 - ClanSettings var65; - if (var70 >= 0) { // L: 5689 - var65 = currentClanSettings[var70]; - } else { - var65 = class134.guestClanSettings; // L: 5690 - } - - var83.method2851(var65); // L: 5691 - var1.serverPacket = null; // L: 5692 - return true; // L: 5693 + var3.offset = 0; // L: 6035 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 6036 + var1.field1322 = 0; // L: 6037 + timer.method6574(); // L: 6038 + var1.field1313 = var1.field1325; // L: 6039 + var1.field1325 = var1.field1324; // L: 6040 + var1.field1324 = var1.serverPacket; // L: 6041 + if (ServerPacket.field3108 == var1.serverPacket) { // L: 6042 + ClanMate.method6700(class263.field3007); // L: 6043 + var1.serverPacket = null; // L: 6044 + return true; // L: 6045 + } + + if (ServerPacket.field3113 == var1.serverPacket) { // L: 6047 + class431.field4602 = true; // L: 6048 + WorldMapSection1.updateNpcs(false, var3); // L: 6049 + var1.serverPacket = null; // L: 6050 + return true; // L: 6051 } - int var7; int var20; - Widget var56; - if (ServerPacket.field3052 == var1.serverPacket) { // L: 5695 - var20 = var3.method7971(); // L: 5696 - var5 = var3.method7935(); // L: 5697 - var22 = var3.method7935(); // L: 5698 - var7 = var3.method7797(); // L: 5699 - var56 = HorizontalAlignment.getWidget(var7); // L: 5700 - if (var22 != var56.modelAngleX || var5 != var56.modelAngleY || var20 != var56.modelZoom) { // L: 5701 - var56.modelAngleX = var22; // L: 5702 - var56.modelAngleY = var5; // L: 5703 - var56.modelZoom = var20; // L: 5704 - class290.invalidateWidget(var56); // L: 5705 - } - - var1.serverPacket = null; // L: 5707 - return true; // L: 5708 - } - - if (ServerPacket.field3061 == var1.serverPacket) { // L: 5710 - class83.updatePlayers(var3, var1.serverPacketLength); // L: 5711 - class4.method19(); // L: 5712 - var1.serverPacket = null; // L: 5713 - return true; // L: 5714 - } - - Widget var6; - boolean var71; - if (ServerPacket.field3107 == var1.serverPacket) { // L: 5716 - var20 = var3.method7810(); // L: 5717 - var71 = var3.readUnsignedByte() == 1; // L: 5718 - var6 = HorizontalAlignment.getWidget(var20); // L: 5719 - if (var71 != var6.isHidden) { // L: 5720 - var6.isHidden = var71; // L: 5721 - class290.invalidateWidget(var6); // L: 5722 - } - - var1.serverPacket = null; // L: 5724 - return true; // L: 5725 - } - - if (ServerPacket.field3034 == var1.serverPacket) { // L: 5727 - var20 = var3.readUnsignedShort(); // L: 5728 - byte var72 = var3.method7792(); // L: 5729 - Varps.Varps_temp[var20] = var72; // L: 5730 - if (Varps.Varps_main[var20] != var72) { // L: 5731 - Varps.Varps_main[var20] = var72; // L: 5732 - } - - class78.changeGameOptions(var20); // L: 5734 - changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 5735 - var1.serverPacket = null; // L: 5736 - return true; // L: 5737 - } - - String var59; - if (ServerPacket.field3032 == var1.serverPacket) { // L: 5739 - var20 = var3.readUShortSmart(); // L: 5740 - var71 = var3.readUnsignedByte() == 1; // L: 5741 - var59 = ""; // L: 5742 - boolean var66 = false; // L: 5743 - if (var71) { // L: 5744 - var59 = var3.readStringCp1252NullTerminated(); // L: 5745 - if (class155.friendSystem.isIgnored(new Username(var59, class83.loginType))) { // L: 5746 - var66 = true; + if (ServerPacket.field3073 == var1.serverPacket) { // L: 6053 + for (var20 = 0; var20 < VarpDefinition.VarpDefinition_fileCount; ++var20) { // L: 6054 + VarpDefinition var84 = class134.VarpDefinition_get(var20); // L: 6055 + if (var84 != null) { // L: 6056 + Varps.Varps_temp[var20] = 0; // L: 6057 + Varps.Varps_main[var20] = 0; // L: 6058 } } - String var58 = var3.readStringCp1252NullTerminated(); // L: 5748 - if (!var66) { // L: 5749 - Login.addGameMessage(var20, var59, var58); - } - - var1.serverPacket = null; // L: 5750 - return true; // L: 5751 + class143.method3072(); // L: 6061 + changedVarpCount += 32; // L: 6062 + var1.serverPacket = null; // L: 6063 + return true; // L: 6064 } - if (ServerPacket.field3058 == var1.serverPacket) { // L: 5753 - var20 = var3.method7810(); // L: 5754 - var5 = var3.readUnsignedShort(); // L: 5755 - Varps.Varps_temp[var5] = var20; // L: 5756 - if (Varps.Varps_main[var5] != var20) { // L: 5757 - Varps.Varps_main[var5] = var20; // L: 5758 - } - - class78.changeGameOptions(var5); // L: 5760 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 5761 - var1.serverPacket = null; // L: 5762 - return true; // L: 5763 + if (ServerPacket.field3120 == var1.serverPacket) { // L: 6066 + Decimator.friendSystem.method1726(); // L: 6067 + field701 = cycleCntr; // L: 6068 + var1.serverPacket = null; // L: 6069 + return true; // L: 6070 } - if (ServerPacket.field3038 == var1.serverPacket) { // L: 5765 - var20 = var3.method7889(); // L: 5766 - var21 = var3.readStringCp1252NullTerminated(); // L: 5767 - var6 = HorizontalAlignment.getWidget(var20); // L: 5768 - if (!var21.equals(var6.text)) { // L: 5769 - var6.text = var21; // L: 5770 - class290.invalidateWidget(var6); // L: 5771 + if (ServerPacket.field3040 == var1.serverPacket) { // L: 6072 + var20 = var3.readInt(); // L: 6073 + InterfaceParent var82 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6074 + if (var82 != null) { // L: 6075 + Script.closeInterface(var82, true); } - var1.serverPacket = null; // L: 5773 - return true; // L: 5774 + if (meslayerContinueWidget != null) { // L: 6076 + class346.invalidateWidget(meslayerContinueWidget); // L: 6077 + meslayerContinueWidget = null; // L: 6078 + } + + var1.serverPacket = null; // L: 6080 + return true; // L: 6081 } - int var9; - int var10; - int var23; - if (ServerPacket.field3079 == var1.serverPacket) { // L: 5776 - isCameraLocked = true; // L: 5777 - field739 = false; // L: 5778 - class12.field62 = var3.readUnsignedByte(); // L: 5779 - WorldMapSectionType.field2778 = var3.readUnsignedByte(); // L: 5780 - class351.field4157 = var3.readUnsignedShort(); // L: 5781 - ClanChannel.field1660 = var3.readUnsignedByte(); // L: 5782 - JagexCache.field1737 = var3.readUnsignedByte(); // L: 5783 - if (JagexCache.field1737 >= 100) { // L: 5784 - var20 = class12.field62 * 128 + 64; // L: 5785 - var5 = WorldMapSectionType.field2778 * 128 + 64; // L: 5786 - var22 = Archive.getTileHeight(var20, var5, class160.Client_plane) - class351.field4157; // L: 5787 - var7 = var20 - EnumComposition.cameraX; // L: 5788 - var23 = var22 - FriendSystem.cameraY; // L: 5789 - var9 = var5 - CollisionMap.cameraZ; // L: 5790 - var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); // L: 5791 - Language.cameraPitch = (int)(Math.atan2((double)var23, (double)var10) * 325.9490051269531D) & 2047; // L: 5792 - MusicPatchNode2.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 5793 - if (Language.cameraPitch < 128) { // L: 5794 - Language.cameraPitch = 128; - } + Widget var60; + if (ServerPacket.field3071 == var1.serverPacket) { // L: 6083 + var20 = var3.method7714(); // L: 6084 + var5 = var3.method7715(); // L: 6085 + var6 = var3.method7827(); // L: 6086 + var60 = class127.getWidget(var6); // L: 6087 + var60.field3392 = var5 + (var20 << 16); // L: 6088 + var1.serverPacket = null; // L: 6089 + return true; // L: 6090 + } - if (Language.cameraPitch > 383) { // L: 5795 - Language.cameraPitch = 383; + if (ServerPacket.field3090 == var1.serverPacket) { // L: 6092 + ClanMate.method6700(class263.field3011); // L: 6093 + var1.serverPacket = null; // L: 6094 + return true; // L: 6095 + } + + if (ServerPacket.field3055 == var1.serverPacket) { // L: 6097 + class29.field181 = var3.method7875(); // L: 6098 + PlayerComposition.field3307 = var3.method7742(); // L: 6099 + var1.serverPacket = null; // L: 6100 + return true; // L: 6101 + } + + if (ServerPacket.field3024 == var1.serverPacket) { // L: 6103 + var20 = var3.method7837(); // L: 6104 + var5 = var3.readShort(); // L: 6105 + var6 = var3.method7716(); // L: 6106 + var60 = class127.getWidget(var20); // L: 6107 + if (var5 != var60.rawX || var6 != var60.rawY || var60.xAlignment != 0 || var60.yAlignment != 0) { // L: 6108 + var60.rawX = var5; // L: 6109 + var60.rawY = var6; // L: 6110 + var60.xAlignment = 0; // L: 6111 + var60.yAlignment = 0; // L: 6112 + class346.invalidateWidget(var60); // L: 6113 + this.alignWidget(var60); // L: 6114 + if (var60.type == 0) { // L: 6115 + AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var20 >> 16], var60, false); } } - var1.serverPacket = null; // L: 5797 - return true; // L: 5798 + var1.serverPacket = null; // L: 6117 + return true; // L: 6118 } - if (ServerPacket.field3103 == var1.serverPacket) { // L: 5800 - var20 = var3.readInt(); // L: 5801 - var5 = var3.readInt(); // L: 5802 - var22 = NetCache.getGcDuration(); // L: 5803 - PacketBufferNode var84 = ItemContainer.getPacketBufferNode(ClientPacket.field2983, packetWriter.isaacCipher); // L: 5805 - var84.packetBuffer.method7746(var20); // L: 5806 - var84.packetBuffer.method7806(var5); // L: 5807 - var84.packetBuffer.method7788(GameEngine.fps); // L: 5808 - var84.packetBuffer.method7788(var22); // L: 5809 - packetWriter.addNode(var84); // L: 5810 - var1.serverPacket = null; // L: 5811 - return true; // L: 5812 - } - - if (ServerPacket.field3042 == var1.serverPacket) { // L: 5814 - class9.field34 = var3.method7789(); // L: 5815 - FriendSystem.field803 = var3.method7927(); // L: 5816 - - while (var3.offset < var1.serverPacketLength) { // L: 5817 - var20 = var3.readUnsignedByte(); // L: 5818 - class263 var81 = Language.method6134()[var20]; // L: 5819 - class221.method4531(var81); // L: 5820 + if (ServerPacket.field3104 == var1.serverPacket) { // L: 6120 + isCameraLocked = true; // L: 6121 + field754 = false; // L: 6122 + class286.field3274 = var3.readUnsignedByte(); // L: 6123 + class54.field447 = var3.readUnsignedByte(); // L: 6124 + BZip2State.field4662 = var3.readUnsignedShort(); // L: 6125 + Script.field955 = var3.readUnsignedByte(); // L: 6126 + ArchiveDisk.field4309 = var3.readUnsignedByte(); // L: 6127 + if (ArchiveDisk.field4309 >= 100) { // L: 6128 + WorldMapLabelSize.cameraX = class286.field3274 * 128 + 64; // L: 6129 + class154.cameraZ = class54.field447 * 128 + 64; // L: 6130 + ItemContainer.cameraY = WorldMapLabel.getTileHeight(WorldMapLabelSize.cameraX, class154.cameraZ, class18.Client_plane) - BZip2State.field4662; // L: 6131 } - var1.serverPacket = null; // L: 5822 - return true; // L: 5823 + var1.serverPacket = null; // L: 6133 + return true; // L: 6134 } - if (ServerPacket.field3095 == var1.serverPacket) { // L: 5825 - GameEngine.field205 = null; // L: 5826 - var1.serverPacket = null; // L: 5827 - return true; // L: 5828 + if (ServerPacket.field3066 == var1.serverPacket) { // L: 6136 + ClanMate.method6700(class263.field3009); // L: 6137 + var1.serverPacket = null; // L: 6138 + return true; // L: 6139 } - if (ServerPacket.field3040 == var1.serverPacket) { // L: 5830 - class9.field34 = var3.method7789(); // L: 5831 - FriendSystem.field803 = var3.readUnsignedByte(); // L: 5832 + String var52; + if (ServerPacket.field3030 == var1.serverPacket) { // L: 6141 + var52 = var3.readStringCp1252NullTerminated(); // L: 6142 + var21 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(var3))); // L: 6143 + Actor.addGameMessage(6, var52, var21); // L: 6144 + var1.serverPacket = null; // L: 6145 + return true; // L: 6146 + } - for (var20 = FriendSystem.field803; var20 < FriendSystem.field803 + 8; ++var20) { // L: 5833 - for (var5 = class9.field34; var5 < class9.field34 + 8; ++var5) { // L: 5834 - if (groundItems[class160.Client_plane][var20][var5] != null) { // L: 5835 - groundItems[class160.Client_plane][var20][var5] = null; // L: 5836 - class162.updateItemPile(var20, var5); // L: 5837 + if (ServerPacket.field3114 == var1.serverPacket) { // L: 6148 + class29.field181 = var3.method7875(); // L: 6149 + PlayerComposition.field3307 = var3.readUnsignedByte(); // L: 6150 + + for (var20 = PlayerComposition.field3307; var20 < PlayerComposition.field3307 + 8; ++var20) { // L: 6151 + for (var5 = class29.field181; var5 < class29.field181 + 8; ++var5) { // L: 6152 + if (groundItems[class18.Client_plane][var20][var5] != null) { // L: 6153 + groundItems[class18.Client_plane][var20][var5] = null; // L: 6154 + UserComparator3.updateItemPile(var20, var5); // L: 6155 } } } - for (PendingSpawn var54 = (PendingSpawn)pendingSpawns.last(); var54 != null; var54 = (PendingSpawn)pendingSpawns.previous()) { // L: 5841 5842 5844 - if (var54.x >= FriendSystem.field803 && var54.x < FriendSystem.field803 + 8 && var54.y >= class9.field34 && var54.y < class9.field34 + 8 && var54.plane == class160.Client_plane) { // L: 5843 + for (PendingSpawn var54 = (PendingSpawn)pendingSpawns.last(); var54 != null; var54 = (PendingSpawn)pendingSpawns.previous()) { // L: 6159 6160 6162 + if (var54.x >= PlayerComposition.field3307 && var54.x < PlayerComposition.field3307 + 8 && var54.y >= class29.field181 && var54.y < class29.field181 + 8 && var54.plane == class18.Client_plane) { // L: 6161 var54.hitpoints = 0; } } - var1.serverPacket = null; // L: 5846 - return true; // L: 5847 + var1.serverPacket = null; // L: 6164 + return true; // L: 6165 } - if (ServerPacket.field3114 == var1.serverPacket) { // L: 5849 - class221.method4531(class263.field3012); // L: 5850 - var1.serverPacket = null; // L: 5851 - return true; // L: 5852 - } - - long var25; - long var27; - String var32; - String var50; - int var68; - if (ServerPacket.field3048 == var1.serverPacket) { // L: 5854 - var50 = var3.readStringCp1252NullTerminated(); // L: 5855 - var25 = (long)var3.readUnsignedShort(); // L: 5856 - var27 = (long)var3.readMedium(); // L: 5857 - PlayerType var29 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 5858 - long var30 = var27 + (var25 << 32); // L: 5859 - boolean var62 = false; // L: 5860 - - for (var68 = 0; var68 < 100; ++var68) { // L: 5861 - if (var30 == crossWorldMessageIds[var68]) { // L: 5862 - var62 = true; // L: 5863 - break; // L: 5864 - } - } - - if (class155.friendSystem.isIgnored(new Username(var50, class83.loginType))) { // L: 5867 - var62 = true; - } - - if (!var62 && field603 == 0) { // L: 5868 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; // L: 5869 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5870 - var32 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(var3))); // L: 5871 - byte var69; - if (var29.isPrivileged) { // L: 5873 - var69 = 7; - } else { - var69 = 3; // L: 5874 - } - - if (var29.modIcon != -1) { // L: 5875 - Login.addGameMessage(var69, class351.method6579(var29.modIcon) + var50, var32); - } else { - Login.addGameMessage(var69, var50, var32); // L: 5876 - } - } - - var1.serverPacket = null; // L: 5878 - return true; // L: 5879 - } - - int var12; - int var14; - int var15; - int var16; + int var8; + int var11; + int var22; int var61; - if (ServerPacket.field3090 == var1.serverPacket) { // L: 5881 - int var18 = var3.readUnsignedByte(); // L: 5897 - var16 = var3.method7971(); // L: 5898 - var22 = var3.method7805(); // L: 5899 - var20 = var22 >> 16; // L: 5900 - var5 = var22 >> 8 & 255; // L: 5901 - var7 = var20 + (var22 >> 4 & 7); // L: 5902 - var23 = var5 + (var22 & 7); // L: 5903 - byte var63 = var3.readByte(); // L: 5904 - var12 = var3.method7971(); // L: 5905 - var68 = var3.method7789() * 4; // L: 5906 - byte var64 = var3.method7792(); // L: 5907 - var15 = var3.method7798(); // L: 5908 - int var17 = var3.readUnsignedByte(); // L: 5909 - var14 = var3.method7927() * 4; // L: 5910 - var61 = var3.method7769(); // L: 5911 - var9 = var63 + var7; // L: 5912 - var10 = var64 + var23; // L: 5913 - if (var7 >= 0 && var23 >= 0 && var7 < 104 && var23 < 104 && var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var12 != 65535) { // L: 5914 - var7 = var7 * 128 + 64; // L: 5915 - var23 = var23 * 128 + 64; // L: 5916 - var9 = var9 * 128 + 64; // L: 5917 - var10 = var10 * 128 + 64; // L: 5918 - Projectile var19 = new Projectile(var12, class160.Client_plane, var7, var23, Archive.getTileHeight(var7, var23, class160.Client_plane) - var68, var15 + cycle, var16 + cycle, var17, var18, var61, var14); // L: 5919 - var19.setDestination(var9, var10, Archive.getTileHeight(var9, var10, class160.Client_plane) - var14, var15 + cycle); // L: 5920 - projectiles.addFirst(var19); // L: 5921 + int var62; + if (ServerPacket.field3123 == var1.serverPacket) { // L: 6167 + var6 = var3.method7752(); // L: 6176 + var20 = var6 >> 16; // L: 6177 + var5 = var6 >> 8 & 255; // L: 6178 + var22 = var20 + (var6 >> 4 & 7); // L: 6179 + var8 = var5 + (var6 & 7); // L: 6180 + var62 = var3.readUnsignedByte(); // L: 6181 + var11 = var3.readUnsignedShort(); // L: 6182 + var61 = var3.method7715(); // L: 6183 + if (var22 >= 0 && var8 >= 0 && var22 < 104 && var8 < 104) { // L: 6184 + var22 = var22 * 128 + 64; // L: 6185 + var8 = var8 * 128 + 64; // L: 6186 + GraphicsObject var64 = new GraphicsObject(var61, class18.Client_plane, var22, var8, WorldMapLabel.getTileHeight(var22, var8, class18.Client_plane) - var62, var11, cycle); // L: 6187 + graphicsObjects.addFirst(var64); // L: 6188 } - var1.serverPacket = null; // L: 5923 - return true; // L: 5924 - } - - if (ServerPacket.field3051 == var1.serverPacket) { // L: 5926 - isCameraLocked = false; // L: 5927 - - for (var20 = 0; var20 < 5; ++var20) { // L: 5928 - field740[var20] = false; - } - - var1.serverPacket = null; // L: 5929 - return true; // L: 5930 - } - - if (ServerPacket.field3117 == var1.serverPacket) { // L: 5932 - if (class230.friendsChat != null) { // L: 5933 - class230.friendsChat.method6718(var3); // L: 5934 - } - - Strings.method5798(); // L: 5936 - var1.serverPacket = null; // L: 5937 - return true; // L: 5938 - } - - InterfaceParent var82; - if (ServerPacket.field3044 == var1.serverPacket) { // L: 5940 - var20 = var3.method7889(); // L: 5941 - var5 = var3.method7810(); // L: 5942 - InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var20); // L: 5943 - var82 = (InterfaceParent)interfaceParents.get((long)var5); // L: 5944 - if (var82 != null) { // L: 5945 - class20.closeInterface(var82, var60 == null || var82.group != var60.group); - } - - if (var60 != null) { // L: 5946 - var60.remove(); // L: 5947 - interfaceParents.put(var60, (long)var5); // L: 5948 - } - - var56 = HorizontalAlignment.getWidget(var20); // L: 5950 - if (var56 != null) { // L: 5951 - class290.invalidateWidget(var56); - } - - var56 = HorizontalAlignment.getWidget(var5); // L: 5952 - if (var56 != null) { // L: 5953 - class290.invalidateWidget(var56); // L: 5954 - GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var56.id >>> 16], var56, true); // L: 5955 - } - - if (rootInterface != -1) { // L: 5957 - MouseHandler.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 5958 - return true; // L: 5959 - } - - if (ServerPacket.field3100 == var1.serverPacket && isCameraLocked) { // L: 5961 5962 - field739 = true; // L: 5963 - Tiles.field996 = var3.readUnsignedByte(); // L: 5964 - class33.field231 = var3.readUnsignedByte(); // L: 5965 - ClanChannel.field1660 = var3.readUnsignedByte(); // L: 5966 - JagexCache.field1737 = var3.readUnsignedByte(); // L: 5967 - - for (var20 = 0; var20 < 5; ++var20) { // L: 5968 - field740[var20] = false; - } - - var1.serverPacket = null; // L: 5969 - return true; // L: 5970 - } - - if (ServerPacket.field3030 == var1.serverPacket) { // L: 5973 - DynamicObject.updateNpcs(false, var3); // L: 5974 - var1.serverPacket = null; // L: 5975 - return true; // L: 5976 - } - - boolean var87; - if (ServerPacket.field3036 == var1.serverPacket) { // L: 5978 - var87 = var3.readUnsignedByte() == 1; // L: 5979 - if (var87) { // L: 5980 - Varps.field3287 = WorldMapSprite.method4989() - var3.readLong(); // L: 5981 - ReflectionCheck.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 5982 - } else { - ReflectionCheck.grandExchangeEvents = null; // L: 5984 - } - - field572 = cycleCntr; // L: 5985 - var1.serverPacket = null; // L: 5986 - return true; // L: 5987 - } - - if (ServerPacket.field3065 == var1.serverPacket) { // L: 5989 - class221.method4531(class263.field3010); // L: 5990 - var1.serverPacket = null; // L: 5991 - return true; // L: 5992 - } - - if (ServerPacket.field3116 == var1.serverPacket) { // L: 5994 - var20 = var3.readUnsignedByte(); // L: 5995 - var5 = var3.readUnsignedByte(); // L: 5996 - var22 = var3.readUnsignedByte(); // L: 5997 - var7 = var3.readUnsignedByte(); // L: 5998 - field740[var20] = true; // L: 5999 - field482[var20] = var5; // L: 6000 - field549[var20] = var22; // L: 6001 - field766[var20] = var7; // L: 6002 - field744[var20] = 0; // L: 6003 - var1.serverPacket = null; // L: 6004 - return true; // L: 6005 - } - - Widget var80; - if (ServerPacket.field3072 == var1.serverPacket) { // L: 6007 - var20 = var3.method7935(); // L: 6008 - var5 = var3.method7971(); // L: 6009 - var22 = var3.method7810(); // L: 6010 - var80 = HorizontalAlignment.getWidget(var22); // L: 6011 - var80.field3399 = var5 + (var20 << 16); // L: 6012 - var1.serverPacket = null; // L: 6013 - return true; // L: 6014 - } - - if (ServerPacket.field3110 == var1.serverPacket) { // L: 6016 - World var53 = new World(); // L: 6017 - var53.host = var3.readStringCp1252NullTerminated(); // L: 6018 - var53.id = var3.readUnsignedShort(); // L: 6019 - var5 = var3.readInt(); // L: 6020 - var53.properties = var5; // L: 6021 - InterfaceParent.updateGameState(45); // L: 6022 - var2.close(); // L: 6023 - var2 = null; // L: 6024 - ItemContainer.changeWorld(var53); // L: 6025 - var1.serverPacket = null; // L: 6026 - return false; // L: 6027 - } - - if (ServerPacket.field3085 == var1.serverPacket) { // L: 6029 - var3.offset += 28; // L: 6030 - if (var3.checkCrc()) { // L: 6031 - WorldMapRegion.method4798(var3, var3.offset - 28); - } - - var1.serverPacket = null; // L: 6032 - return true; // L: 6033 - } - - if (ServerPacket.field3041 == var1.serverPacket) { // L: 6035 - var20 = var3.method7797(); // L: 6036 - var5 = var3.readShort(); // L: 6037 - var22 = var3.method7769(); // L: 6038 - var80 = HorizontalAlignment.getWidget(var20); // L: 6039 - if (var5 != var80.rawX || var22 != var80.rawY || var80.xAlignment != 0 || var80.yAlignment != 0) { // L: 6040 - var80.rawX = var5; // L: 6041 - var80.rawY = var22; // L: 6042 - var80.xAlignment = 0; // L: 6043 - var80.yAlignment = 0; // L: 6044 - class290.invalidateWidget(var80); // L: 6045 - this.alignWidget(var80); // L: 6046 - if (var80.type == 0) { // L: 6047 - GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var20 >> 16], var80, false); - } - } - - var1.serverPacket = null; // L: 6049 - return true; // L: 6050 - } - - if (ServerPacket.field3033 == var1.serverPacket) { // L: 6052 - var87 = var3.readBoolean(); // L: 6053 - if (var87) { // L: 6054 - if (class340.field4109 == null) { // L: 6055 - class340.field4109 = new class326(); - } - } else { - class340.field4109 = null; // L: 6057 - } - - var1.serverPacket = null; // L: 6058 - return true; // L: 6059 - } - - if (ServerPacket.field3105 == var1.serverPacket) { // L: 6061 - var20 = var3.readUnsignedByte(); // L: 6062 - var5 = var3.readInt(); // L: 6063 - var22 = var3.method7971(); // L: 6064 - var82 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6065 - if (var82 != null) { // L: 6066 - class20.closeInterface(var82, var22 != var82.group); - } - - ServerPacket.method5222(var5, var22, var20); // L: 6067 - var1.serverPacket = null; // L: 6068 - return true; // L: 6069 - } - - if (ServerPacket.field3057 == var1.serverPacket) { // L: 6071 - GameObject.logOut(); // L: 6072 - var1.serverPacket = null; // L: 6073 - return false; // L: 6074 - } - - if (ServerPacket.field3088 == var1.serverPacket) { // L: 6076 - class146.loadRegions(true, var1.packetBuffer); // L: 6077 - var1.serverPacket = null; // L: 6078 - return true; // L: 6079 - } - - if (ServerPacket.field3027 == var1.serverPacket) { // L: 6081 - class221.method4531(class263.field3006); // L: 6082 - var1.serverPacket = null; // L: 6083 - return true; // L: 6084 - } - - if (ServerPacket.field3060 == var1.serverPacket) { // L: 6086 - Varps.privateChatMode = class83.method2124(var3.readUnsignedByte()); // L: 6087 - var1.serverPacket = null; // L: 6088 - return true; // L: 6089 - } - - if (ServerPacket.field3091 == var1.serverPacket) { // L: 6091 - class221.method4531(class263.field3013); // L: 6092 - var1.serverPacket = null; // L: 6093 - return true; // L: 6094 - } - - if (ServerPacket.field3126 == var1.serverPacket) { // L: 6096 - var20 = var3.method7798(); // L: 6097 - var5 = var3.readInt(); // L: 6098 - var22 = var20 >> 10 & 31; // L: 6099 - var7 = var20 >> 5 & 31; // L: 6100 - var23 = var20 & 31; // L: 6101 - var9 = (var7 << 11) + (var22 << 19) + (var23 << 3); // L: 6102 - Widget var86 = HorizontalAlignment.getWidget(var5); // L: 6103 - if (var9 != var86.color) { // L: 6104 - var86.color = var9; // L: 6105 - class290.invalidateWidget(var86); // L: 6106 - } - - var1.serverPacket = null; // L: 6108 - return true; // L: 6109 - } - - long var34; - if (ServerPacket.field3071 == var1.serverPacket) { // L: 6111 - var20 = var3.method7810(); // L: 6112 - var5 = var3.method7798(); // L: 6113 - if (var5 == 65535) { // L: 6114 - var5 = -1; - } - - var22 = var3.method7971(); // L: 6115 - if (var22 == 65535) { // L: 6116 - var22 = -1; - } - - var7 = var3.readInt(); // L: 6117 - - for (var23 = var5; var23 <= var22; ++var23) { // L: 6118 - var34 = (long)var23 + ((long)var7 << 32); // L: 6119 - Node var88 = widgetFlags.get(var34); // L: 6120 - if (var88 != null) { // L: 6121 - var88.remove(); - } - - widgetFlags.put(new IntegerNode(var20), var34); // L: 6122 - } - - var1.serverPacket = null; // L: 6124 - return true; // L: 6125 - } - - if (ServerPacket.field3078 == var1.serverPacket) { // L: 6127 - DynamicObject.updateNpcs(true, var3); // L: 6128 - var1.serverPacket = null; // L: 6129 - return true; // L: 6130 - } - - if (ServerPacket.field3124 == var1.serverPacket) { // L: 6132 - var20 = var3.readInt(); // L: 6133 - var5 = var3.readUnsignedShort(); // L: 6134 - if (var20 < -70000) { // L: 6135 - var5 += 32768; - } - - if (var20 >= 0) { // L: 6137 - var6 = HorizontalAlignment.getWidget(var20); - } else { - var6 = null; // L: 6138 - } - - if (var6 != null) { // L: 6139 - for (var7 = 0; var7 < var6.itemIds.length; ++var7) { // L: 6140 - var6.itemIds[var7] = 0; // L: 6141 - var6.itemQuantities[var7] = 0; // L: 6142 - } - } - - TileItem.clearItemContainer(var5); // L: 6145 - var7 = var3.readUnsignedShort(); // L: 6146 - - for (var23 = 0; var23 < var7; ++var23) { // L: 6147 - var9 = var3.readUnsignedShort(); // L: 6148 - var10 = var3.method7789(); // L: 6149 - if (var10 == 255) { // L: 6150 - var10 = var3.readInt(); - } - - if (var6 != null && var23 < var6.itemIds.length) { // L: 6151 6152 - var6.itemIds[var23] = var9; // L: 6153 - var6.itemQuantities[var23] = var10; // L: 6154 - } - - class29.itemContainerSetItem(var5, var23, var9 - 1, var10); // L: 6157 - } - - if (var6 != null) { // L: 6159 - class290.invalidateWidget(var6); - } - - SceneTilePaint.method4499(); // L: 6160 - changedItemContainers[++field746 - 1 & 31] = var5 & 32767; // L: 6161 - var1.serverPacket = null; // L: 6162 - return true; // L: 6163 - } - - if (ServerPacket.field3086 == var1.serverPacket) { // L: 6165 - var22 = var3.method7877(); // L: 6174 - var20 = var22 >> 16; // L: 6175 - var5 = var22 >> 8 & 255; // L: 6176 - var7 = var20 + (var22 >> 4 & 7); // L: 6177 - var23 = var5 + (var22 & 7); // L: 6178 - var10 = var3.readUnsignedByte(); // L: 6179 - var61 = var3.readUnsignedShort(); // L: 6180 - var9 = var3.method7971(); // L: 6181 - if (var7 >= 0 && var23 >= 0 && var7 < 104 && var23 < 104) { // L: 6182 - var7 = var7 * 128 + 64; // L: 6183 - var23 = var23 * 128 + 64; // L: 6184 - GraphicsObject var89 = new GraphicsObject(var9, class160.Client_plane, var7, var23, Archive.getTileHeight(var7, var23, class160.Client_plane) - var10, var61, cycle); // L: 6185 - graphicsObjects.addFirst(var89); // L: 6186 - } - - var1.serverPacket = null; // L: 6188 - return true; // L: 6189 - } - - if (ServerPacket.field3129 == var1.serverPacket) { // L: 6191 - var20 = var3.readInt(); // L: 6192 - if (var20 != field571) { // L: 6193 - field571 = var20; // L: 6194 - class11.method115(); // L: 6195 - } - - var1.serverPacket = null; // L: 6197 - return true; // L: 6198 - } - - if (ServerPacket.field3064 == var1.serverPacket) { // L: 6200 - class221.method4531(class263.field3009); // L: 6201 - var1.serverPacket = null; // L: 6202 - return true; // L: 6203 - } - - if (ServerPacket.field3025 == var1.serverPacket) { // L: 6205 - byte[] var52 = new byte[var1.serverPacketLength]; // L: 6206 - var3.method7708(var52, 0, var52.length); // L: 6207 - Buffer var79 = new Buffer(var52); // L: 6208 - var59 = var79.readStringCp1252NullTerminated(); // L: 6209 - class11.openURL(var59, true, false); // L: 6210 - var1.serverPacket = null; // L: 6211 - return true; // L: 6212 + var1.serverPacket = null; // L: 6190 + return true; // L: 6191 } Widget var74; - if (ServerPacket.field3035 == var1.serverPacket) { // L: 6214 - var20 = var3.method7797(); // L: 6215 - var74 = HorizontalAlignment.getWidget(var20); // L: 6216 - var74.modelType = 3; // L: 6217 - var74.modelId = class19.localPlayer.appearance.getChatHeadId(); // L: 6218 - class290.invalidateWidget(var74); // L: 6219 - var1.serverPacket = null; // L: 6220 - return true; // L: 6221 + if (ServerPacket.field3052 == var1.serverPacket) { // L: 6193 + var20 = var3.readInt(); // L: 6194 + var5 = var3.method7717(); // L: 6195 + var74 = class127.getWidget(var20); // L: 6196 + if (var5 != var74.sequenceId || var5 == -1) { // L: 6197 + var74.sequenceId = var5; // L: 6198 + var74.modelFrame = 0; // L: 6199 + var74.modelFrameCycle = 0; // L: 6200 + class346.invalidateWidget(var74); // L: 6201 + } + + var1.serverPacket = null; // L: 6203 + return true; // L: 6204 } - if (ServerPacket.field3099 == var1.serverPacket) { // L: 6223 - var20 = var3.readInt(); // L: 6224 - InterfaceParent var78 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6225 - if (var78 != null) { // L: 6226 - class20.closeInterface(var78, true); - } + int var13; + int var15; + int var24; + if (ServerPacket.field3122 == var1.serverPacket) { // L: 6206 + var6 = var3.method7752(); // L: 6217 + var20 = var6 >> 16; // L: 6218 + var5 = var6 >> 8 & 255; // L: 6219 + var22 = var20 + (var6 >> 4 & 7); // L: 6220 + var8 = var5 + (var6 & 7); // L: 6221 + var61 = var3.method7875(); // L: 6222 + var62 = var61 >> 2; // L: 6223 + var11 = var61 & 3; // L: 6224 + var24 = field748[var62]; // L: 6225 + var13 = var3.readUnsignedShort(); // L: 6226 + if (var22 >= 0 && var8 >= 0 && var22 < 103 && var8 < 103) { // L: 6227 + if (var24 == 0) { // L: 6228 + BoundaryObject var69 = ArchiveLoader.scene.method4754(class18.Client_plane, var22, var8); // L: 6229 + if (var69 != null) { // L: 6230 + var15 = FileSystem.Entity_unpackID(var69.tag); // L: 6231 + if (var62 == 2) { // L: 6232 + var69.renderable1 = new DynamicObject(var15, 2, var11 + 4, class18.Client_plane, var22, var8, var13, false, var69.renderable1); // L: 6233 + var69.renderable2 = new DynamicObject(var15, 2, var11 + 1 & 3, class18.Client_plane, var22, var8, var13, false, var69.renderable2); // L: 6234 + } else { + var69.renderable1 = new DynamicObject(var15, var62, var11, class18.Client_plane, var22, var8, var13, false, var69.renderable1); // L: 6236 + } + } + } else if (var24 == 1) { // L: 6239 + WallDecoration var68 = ArchiveLoader.scene.method4860(class18.Client_plane, var22, var8); // L: 6240 + if (var68 != null) { // L: 6241 + var15 = FileSystem.Entity_unpackID(var68.tag); // L: 6242 + if (var62 != 4 && var62 != 5) { // L: 6243 + if (var62 == 6) { // L: 6246 + var68.renderable1 = new DynamicObject(var15, 4, var11 + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6247 + } else if (var62 == 7) { // L: 6249 + var68.renderable1 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6250 + } else if (var62 == 8) { // L: 6252 + var68.renderable1 = new DynamicObject(var15, 4, var11 + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6253 + var68.renderable2 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable2); // L: 6254 + } + } else { + var68.renderable1 = new DynamicObject(var15, 4, var11, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6244 + } + } + } else if (var24 == 2) { // L: 6258 + GameObject var66 = ArchiveLoader.scene.getGameObject(class18.Client_plane, var22, var8); // L: 6259 + if (var62 == 11) { // L: 6260 + var62 = 10; // L: 6261 + } - if (meslayerContinueWidget != null) { // L: 6227 - class290.invalidateWidget(meslayerContinueWidget); // L: 6228 - meslayerContinueWidget = null; // L: 6229 - } - - var1.serverPacket = null; // L: 6231 - return true; // L: 6232 - } - - if (ServerPacket.field3076 == var1.serverPacket) { // L: 6234 - field749 = cycleCntr; // L: 6235 - var70 = var3.readByte(); // L: 6236 - class145 var76 = new class145(var3); // L: 6237 - ClanChannel var57; - if (var70 >= 0) { // L: 6239 - var57 = currentClanChannels[var70]; - } else { - var57 = class83.guestClanChannel; // L: 6240 - } - - var76.method3030(var57); // L: 6241 - var1.serverPacket = null; // L: 6242 - return true; // L: 6243 - } - - if (ServerPacket.field3054 == var1.serverPacket) { // L: 6245 - field749 = cycleCntr; // L: 6246 - var70 = var3.readByte(); // L: 6247 - if (var1.serverPacketLength == 1) { // L: 6248 - if (var70 >= 0) { // L: 6249 - currentClanChannels[var70] = null; - } else { - class83.guestClanChannel = null; // L: 6250 - } - - var1.serverPacket = null; // L: 6251 - return true; // L: 6252 - } - - if (var70 >= 0) { // L: 6254 - currentClanChannels[var70] = new ClanChannel(var3); // L: 6255 - } else { - class83.guestClanChannel = new ClanChannel(var3); // L: 6258 - } - - var1.serverPacket = null; // L: 6260 - return true; // L: 6261 - } - - if (ServerPacket.field3096 == var1.serverPacket) { // L: 6263 - for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { // L: 6264 - if (Varps.Varps_temp[var20] != Varps.Varps_main[var20]) { // L: 6265 - Varps.Varps_main[var20] = Varps.Varps_temp[var20]; // L: 6266 - class78.changeGameOptions(var20); // L: 6267 - changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 6268 + if (var66 != null) { // L: 6263 + var66.renderable = new DynamicObject(FileSystem.Entity_unpackID(var66.tag), var62, var11, class18.Client_plane, var22, var8, var13, false, var66.renderable); // L: 6264 + } + } else if (var24 == 3) { // L: 6267 + FloorDecoration var67 = ArchiveLoader.scene.getFloorDecoration(class18.Client_plane, var22, var8); // L: 6268 + if (var67 != null) { // L: 6269 + var67.renderable = new DynamicObject(FileSystem.Entity_unpackID(var67.tag), 22, var11, class18.Client_plane, var22, var8, var13, false, var67.renderable); // L: 6270 + } } } - var1.serverPacket = null; // L: 6271 - return true; // L: 6272 + var1.serverPacket = null; // L: 6274 + return true; // L: 6275 } - if (ServerPacket.field3045 == var1.serverPacket) { // L: 6274 - RouteStrategy.method3875(); // L: 6275 - var70 = var3.readByte(); // L: 6276 - if (var1.serverPacketLength == 1) { // L: 6277 - if (var70 >= 0) { // L: 6278 - currentClanSettings[var70] = null; - } else { - class134.guestClanSettings = null; // L: 6279 + if (ServerPacket.field3119 == var1.serverPacket) { // L: 6277 + publicChatMode = var3.method7742(); // L: 6278 + tradeChatMode = var3.method7875(); // L: 6279 + var1.serverPacket = null; // L: 6280 + return true; // L: 6281 + } + + if (ServerPacket.field3101 == var1.serverPacket) { // L: 6283 + var20 = var3.readUnsignedByte(); // L: 6284 + Tile.method4603(var20); // L: 6285 + var1.serverPacket = null; // L: 6286 + return true; // L: 6287 + } + + if (ServerPacket.field3051 == var1.serverPacket) { // L: 6289 + for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { // L: 6290 + if (Varps.Varps_main[var20] != Varps.Varps_temp[var20]) { // L: 6291 + Varps.Varps_main[var20] = Varps.Varps_temp[var20]; // L: 6292 + WorldMapLabel.changeGameOptions(var20); // L: 6293 + changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 6294 } - - var1.serverPacket = null; // L: 6280 - return true; // L: 6281 } - if (var70 >= 0) { // L: 6283 - currentClanSettings[var70] = new ClanSettings(var3); // L: 6284 - } else { - class134.guestClanSettings = new ClanSettings(var3); // L: 6287 + var1.serverPacket = null; // L: 6297 + return true; // L: 6298 + } + + if (ServerPacket.field3048 == var1.serverPacket) { // L: 6300 + var20 = var3.method7715(); // L: 6301 + if (var20 == 65535) { // L: 6302 + var20 = -1; } - var1.serverPacket = null; // L: 6289 - return true; // L: 6290 + SoundCache.playSong(var20); // L: 6303 + var1.serverPacket = null; // L: 6304 + return true; // L: 6305 } - if (ServerPacket.field3028 == var1.serverPacket) { // L: 6292 - rebootTimer = var3.readUnsignedShort() * 30; // L: 6293 - field762 = cycleCntr; // L: 6294 - var1.serverPacket = null; // L: 6295 - return true; // L: 6296 - } - - if (ServerPacket.field3118 == var1.serverPacket) { // L: 6298 - var20 = var3.method7971(); // L: 6299 - var5 = var3.method7810(); // L: 6300 - var6 = HorizontalAlignment.getWidget(var5); // L: 6301 - if (var6.modelType != 2 || var20 != var6.modelId) { // L: 6302 - var6.modelType = 2; // L: 6303 - var6.modelId = var20; // L: 6304 - class290.invalidateWidget(var6); // L: 6305 + if (ServerPacket.field3045 == var1.serverPacket) { // L: 6307 + var20 = var3.method7793(); // L: 6308 + var5 = var3.method7715(); // L: 6309 + if (var5 == 65535) { // L: 6310 + var5 = -1; } - var1.serverPacket = null; // L: 6307 - return true; // L: 6308 + Players.method2419(var5, var20); // L: 6311 + var1.serverPacket = null; // L: 6312 + return true; // L: 6313 } - if (ServerPacket.field3121 == var1.serverPacket) { // L: 6310 - var20 = var3.method7797(); // L: 6311 - var5 = var3.readUnsignedShort(); // L: 6312 - var6 = HorizontalAlignment.getWidget(var20); // L: 6313 - if (var6.modelType != 1 || var5 != var6.modelId) { // L: 6314 - var6.modelType = 1; // L: 6315 - var6.modelId = var5; // L: 6316 - class290.invalidateWidget(var6); // L: 6317 + if (ServerPacket.field3094 == var1.serverPacket) { // L: 6315 + HorizontalAlignment.field1885 = null; // L: 6316 + var1.serverPacket = null; // L: 6317 + return true; // L: 6318 + } + + if (ServerPacket.field3031 == var1.serverPacket) { // L: 6320 + var20 = var3.method7827(); // L: 6321 + var5 = var3.readUnsignedShort(); // L: 6322 + Varps.Varps_temp[var5] = var20; // L: 6323 + if (Varps.Varps_main[var5] != var20) { // L: 6324 + Varps.Varps_main[var5] = var20; // L: 6325 } - var1.serverPacket = null; // L: 6319 - return true; // L: 6320 + WorldMapLabel.changeGameOptions(var5); // L: 6327 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6328 + var1.serverPacket = null; // L: 6329 + return true; // L: 6330 } - if (ServerPacket.field3024 == var1.serverPacket) { // L: 6322 - minimapState = var3.readUnsignedByte(); // L: 6323 - var1.serverPacket = null; // L: 6324 - return true; // L: 6325 + if (ServerPacket.field3080 == var1.serverPacket) { // L: 6332 + HorizontalAlignment.field1885 = new class391(DirectByteArrayCopier.HitSplatDefinition_cached); // L: 6333 + var1.serverPacket = null; // L: 6334 + return true; // L: 6335 } - if (ServerPacket.field3075 == var1.serverPacket) { // L: 6327 - var20 = var3.readUnsignedShort(); // L: 6328 - Language.method6136(var20); // L: 6329 - changedItemContainers[++field746 - 1 & 31] = var20 & 32767; // L: 6330 - var1.serverPacket = null; // L: 6331 - return true; // L: 6332 - } - - if (ServerPacket.field3101 == var1.serverPacket) { // L: 6334 - var20 = var3.readUnsignedShort(); // L: 6335 - var5 = var3.readUnsignedByte(); // L: 6336 - var22 = var3.readUnsignedShort(); // L: 6337 - KitDefinition.queueSoundEffect(var20, var5, var22); // L: 6338 + if (ServerPacket.field3036 == var1.serverPacket) { // L: 6337 + ClanMate.method6700(class263.field3012); // L: 6338 var1.serverPacket = null; // L: 6339 return true; // L: 6340 } - if (ServerPacket.field3098 == var1.serverPacket) { // L: 6342 - for (var20 = 0; var20 < players.length; ++var20) { // L: 6343 - if (players[var20] != null) { // L: 6344 - players[var20].sequence = -1; + if (ServerPacket.field3074 == var1.serverPacket) { // L: 6342 + var20 = var3.readInt(); // L: 6343 + var5 = var3.readUnsignedShort(); // L: 6344 + if (var20 < -70000) { // L: 6345 + var5 += 32768; + } + + if (var20 >= 0) { // L: 6347 + var74 = class127.getWidget(var20); + } else { + var74 = null; // L: 6348 + } + + if (var74 != null) { // L: 6349 + for (var22 = 0; var22 < var74.itemIds.length; ++var22) { // L: 6350 + var74.itemIds[var22] = 0; // L: 6351 + var74.itemQuantities[var22] = 0; // L: 6352 } } - for (var20 = 0; var20 < npcs.length; ++var20) { // L: 6346 - if (npcs[var20] != null) { // L: 6347 - npcs[var20].sequence = -1; + WorldMapSection1.clearItemContainer(var5); // L: 6355 + var22 = var3.readUnsignedShort(); // L: 6356 + + for (var8 = 0; var8 < var22; ++var8) { // L: 6357 + var61 = var3.readUnsignedShort(); // L: 6358 + var62 = var3.method7875(); // L: 6359 + if (var62 == 255) { // L: 6360 + var62 = var3.readInt(); } - } - var1.serverPacket = null; // L: 6349 - return true; // L: 6350 - } - - if (ServerPacket.field3102 == var1.serverPacket) { // L: 6352 - var20 = var3.method7935(); // L: 6353 - rootInterface = var20; // L: 6354 - this.resizeRoot(false); // L: 6355 - class127.Widget_resetModelFrames(var20); // L: 6356 - class358.runWidgetOnLoadListener(rootInterface); // L: 6357 - - for (var5 = 0; var5 < 100; ++var5) { // L: 6358 - field564[var5] = true; - } - - var1.serverPacket = null; // L: 6359 - return true; // L: 6360 - } - - if (ServerPacket.field3119 == var1.serverPacket) { // L: 6362 - SceneTilePaint.method4499(); // L: 6363 - var20 = var3.method7927(); // L: 6364 - var5 = var3.method7790(); // L: 6365 - var22 = var3.method7797(); // L: 6366 - experience[var5] = var22; // L: 6367 - currentLevels[var5] = var20; // L: 6368 - levels[var5] = 1; // L: 6369 - - for (var7 = 0; var7 < 98; ++var7) { // L: 6370 - if (var22 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; + if (var74 != null && var8 < var74.itemIds.length) { // L: 6361 6362 + var74.itemIds[var8] = var61; // L: 6363 + var74.itemQuantities[var8] = var62; // L: 6364 } + + ChatChannel.itemContainerSetItem(var5, var8, var61 - 1, var62); // L: 6367 } - changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6371 + if (var74 != null) { // L: 6369 + class346.invalidateWidget(var74); + } + + class143.method3072(); // L: 6370 + changedItemContainers[++field695 - 1 & 31] = var5 & 32767; // L: 6371 var1.serverPacket = null; // L: 6372 return true; // L: 6373 } - if (ServerPacket.field3104 == var1.serverPacket) { // L: 6375 - publicChatMode = var3.method7927(); // L: 6376 - tradeChatMode = var3.method7789(); // L: 6377 - var1.serverPacket = null; // L: 6378 - return true; // L: 6379 - } + if (ServerPacket.field3058 == var1.serverPacket) { // L: 6375 + var52 = var3.readStringCp1252NullTerminated(); // L: 6376 + Object[] var79 = new Object[var52.length() + 1]; // L: 6377 - if (ServerPacket.field3092 == var1.serverPacket) { // L: 6381 - if (rootInterface != -1) { // L: 6382 - MouseHandler.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; // L: 6383 - return true; // L: 6384 - } - - if (ServerPacket.field3106 == var1.serverPacket) { // L: 6386 - SceneTilePaint.method4499(); // L: 6387 - weight = var3.readShort(); // L: 6388 - field762 = cycleCntr; // L: 6389 - var1.serverPacket = null; // L: 6390 - return true; // L: 6391 - } - - long var38; - if (ServerPacket.field3069 == var1.serverPacket) { // L: 6393 - var20 = var3.offset + var1.serverPacketLength; // L: 6394 - var5 = var3.readUnsignedShort(); // L: 6395 - var22 = var3.readUnsignedShort(); // L: 6396 - if (var5 != rootInterface) { // L: 6397 - rootInterface = var5; // L: 6398 - this.resizeRoot(false); // L: 6399 - class127.Widget_resetModelFrames(rootInterface); // L: 6400 - class358.runWidgetOnLoadListener(rootInterface); // L: 6401 - - for (var7 = 0; var7 < 100; ++var7) { // L: 6402 - field564[var7] = true; - } - } - - InterfaceParent var85; - for (; var22-- > 0; var85.field1039 = true) { // L: 6404 6414 - var7 = var3.readInt(); // L: 6405 - var23 = var3.readUnsignedShort(); // L: 6406 - var9 = var3.readUnsignedByte(); // L: 6407 - var85 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6408 - if (var85 != null && var23 != var85.group) { // L: 6409 - class20.closeInterface(var85, true); // L: 6410 - var85 = null; // L: 6411 - } - - if (var85 == null) { // L: 6413 - var85 = ServerPacket.method5222(var7, var23, var9); - } - } - - for (var82 = (InterfaceParent)interfaceParents.first(); var82 != null; var82 = (InterfaceParent)interfaceParents.next()) { // L: 6416 - if (var82.field1039) { // L: 6417 - var82.field1039 = false; + for (var6 = var52.length() - 1; var6 >= 0; --var6) { // L: 6378 + if (var52.charAt(var6) == 's') { // L: 6379 + var79[var6 + 1] = var3.readStringCp1252NullTerminated(); } else { - class20.closeInterface(var82, true); // L: 6419 + var79[var6 + 1] = new Integer(var3.readInt()); // L: 6380 } } - widgetFlags = new NodeHashTable(512); // L: 6422 + var79[0] = new Integer(var3.readInt()); // L: 6382 + ScriptEvent var88 = new ScriptEvent(); // L: 6383 + var88.args = var79; // L: 6384 + ClanSettings.runScriptEvent(var88); // L: 6385 + var1.serverPacket = null; // L: 6386 + return true; // L: 6387 + } - while (var3.offset < var20) { // L: 6423 - var7 = var3.readInt(); // L: 6424 - var23 = var3.readUnsignedShort(); // L: 6425 - var9 = var3.readUnsignedShort(); // L: 6426 - var10 = var3.readInt(); // L: 6427 + if (ServerPacket.field3110 == var1.serverPacket) { // L: 6389 + var20 = var3.method7837(); // L: 6390 + var5 = var3.method7714(); // L: 6391 + var74 = class127.getWidget(var20); // L: 6392 + if (var74 != null && var74.type == 0) { // L: 6393 + if (var5 > var74.scrollHeight - var74.height) { // L: 6394 + var5 = var74.scrollHeight - var74.height; + } - for (var61 = var23; var61 <= var9; ++var61) { // L: 6428 - var38 = ((long)var7 << 32) + (long)var61; // L: 6429 - widgetFlags.put(new IntegerNode(var10), var38); // L: 6430 + if (var5 < 0) { // L: 6395 + var5 = 0; + } + + if (var5 != var74.scrollY) { // L: 6396 + var74.scrollY = var5; // L: 6397 + class346.invalidateWidget(var74); // L: 6398 } } - var1.serverPacket = null; // L: 6433 - return true; // L: 6434 + var1.serverPacket = null; // L: 6401 + return true; // L: 6402 } - if (ServerPacket.field3031 == var1.serverPacket) { // L: 6436 - var50 = var3.readStringCp1252NullTerminated(); // L: 6437 - var21 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(var3))); // L: 6438 - Login.addGameMessage(6, var50, var21); // L: 6439 - var1.serverPacket = null; // L: 6440 - return true; // L: 6441 - } - - if (ServerPacket.field3050 == var1.serverPacket) { // L: 6443 - if (GameEngine.field205 == null) { // L: 6444 - GameEngine.field205 = new class391(FontName.HitSplatDefinition_cached); + if (ServerPacket.field3091 == var1.serverPacket) { // L: 6404 + if (rootInterface != -1) { // L: 6405 + MouseRecorder.runIntfCloseListeners(rootInterface, 0); } - class445 var51 = FontName.HitSplatDefinition_cached.method7173(var3); // L: 6445 - GameEngine.field205.field4376.vmethod7561(var51.field4680, var51.field4681); // L: 6446 - field682[++field683 - 1 & 31] = var51.field4680; // L: 6447 - var1.serverPacket = null; // L: 6448 - return true; // L: 6449 + var1.serverPacket = null; // L: 6406 + return true; // L: 6407 } - if (ServerPacket.field3112 == var1.serverPacket) { // L: 6451 - class9.field34 = var3.method7789(); // L: 6452 - FriendSystem.field803 = var3.method7927(); // L: 6453 - var1.serverPacket = null; // L: 6454 - return true; // L: 6455 + if (ServerPacket.field3061 == var1.serverPacket) { // L: 6409 + class431.field4602 = true; // L: 6410 + WorldMapSection1.updateNpcs(true, var3); // L: 6411 + var1.serverPacket = null; // L: 6412 + return true; // L: 6413 } - if (ServerPacket.field3074 == var1.serverPacket) { // L: 6457 - for (var20 = 0; var20 < VarpDefinition.VarpDefinition_fileCount; ++var20) { // L: 6458 - VarpDefinition var75 = SoundCache.VarpDefinition_get(var20); // L: 6459 - if (var75 != null) { // L: 6460 - Varps.Varps_temp[var20] = 0; // L: 6461 - Varps.Varps_main[var20] = 0; // L: 6462 + if (ServerPacket.field3085 == var1.serverPacket) { // L: 6415 + isCameraLocked = false; // L: 6416 + + for (var20 = 0; var20 < 5; ++var20) { // L: 6417 + field546[var20] = false; + } + + var1.serverPacket = null; // L: 6418 + return true; // L: 6419 + } + + String var23; + boolean var56; + if (ServerPacket.field3062 == var1.serverPacket) { // L: 6421 + var20 = var3.readUShortSmart(); // L: 6422 + var56 = var3.readUnsignedByte() == 1; // L: 6423 + var23 = ""; // L: 6424 + boolean var85 = false; // L: 6425 + if (var56) { // L: 6426 + var23 = var3.readStringCp1252NullTerminated(); // L: 6427 + if (Decimator.friendSystem.isIgnored(new Username(var23, class122.loginType))) { // L: 6428 + var85 = true; } } - SceneTilePaint.method4499(); // L: 6465 - changedVarpCount += 32; // L: 6466 + String var86 = var3.readStringCp1252NullTerminated(); // L: 6430 + if (!var85) { // L: 6431 + Actor.addGameMessage(var20, var23, var86); + } + + var1.serverPacket = null; // L: 6432 + return true; // L: 6433 + } + + if (ServerPacket.field3112 == var1.serverPacket) { // L: 6435 + class119.method2760(var3.readStringCp1252NullTerminated()); // L: 6436 + var1.serverPacket = null; // L: 6437 + return true; // L: 6438 + } + + if (ServerPacket.field3107 == var1.serverPacket) { // L: 6440 + if (var1.serverPacketLength == 0) { // L: 6441 + ClientPacket.friendsChat = null; // L: 6442 + } else { + if (ClientPacket.friendsChat == null) { // L: 6445 + ClientPacket.friendsChat = new FriendsChat(class122.loginType, class127.client); // L: 6446 + } + + ClientPacket.friendsChat.readUpdate(var3); // L: 6448 + } + + SecureRandomCallable.method2050(); // L: 6450 + var1.serverPacket = null; // L: 6451 + return true; // L: 6452 + } + + if (ServerPacket.field3032 == var1.serverPacket) { // L: 6454 + ClanMate.method6700(class263.field3013); // L: 6455 + var1.serverPacket = null; // L: 6456 + return true; // L: 6457 + } + + if (ServerPacket.field3037 == var1.serverPacket) { // L: 6459 + var20 = var3.method7705(); // L: 6460 + var21 = var3.readStringCp1252NullTerminated(); // L: 6461 + var74 = class127.getWidget(var20); // L: 6462 + if (!var21.equals(var74.text)) { // L: 6463 + var74.text = var21; // L: 6464 + class346.invalidateWidget(var74); // L: 6465 + } + var1.serverPacket = null; // L: 6467 return true; // L: 6468 } - String var40; - if (ServerPacket.field3082 == var1.serverPacket) { // L: 6470 - var50 = var3.readStringCp1252NullTerminated(); // L: 6471 - var25 = var3.readLong(); // L: 6472 - var27 = (long)var3.readUnsignedShort(); // L: 6473 - var34 = (long)var3.readMedium(); // L: 6474 - PlayerType var36 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 6475 - var38 = (var27 << 32) + var34; // L: 6476 - boolean var67 = false; // L: 6477 + if (ServerPacket.field3128 == var1.serverPacket) { // L: 6470 + hintArrowType = var3.readUnsignedByte(); // L: 6471 + if (hintArrowType == 1) { // L: 6472 + hintArrowNpcIndex = var3.readUnsignedShort(); + } - for (var15 = 0; var15 < 100; ++var15) { // L: 6478 - if (crossWorldMessageIds[var15] == var38) { // L: 6479 - var67 = true; // L: 6480 - break; // L: 6481 + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6473 + if (hintArrowType == 2) { // L: 6474 + hintArrowSubX = 64; // L: 6475 + hintArrowSubY = 64; // L: 6476 } - } - if (var36.isUser && class155.friendSystem.isIgnored(new Username(var50, class83.loginType))) { // L: 6484 6485 - var67 = true; - } - - if (!var67 && field603 == 0) { // L: 6487 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 6488 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6489 - var40 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(var3))); // L: 6490 - if (var36.modIcon != -1) { // L: 6491 - class6.addChatMessage(9, class351.method6579(var36.modIcon) + var50, var40, UserComparator7.base37DecodeLong(var25)); - } else { - class6.addChatMessage(9, var50, var40, UserComparator7.base37DecodeLong(var25)); // L: 6492 + if (hintArrowType == 3) { // L: 6478 + hintArrowSubX = 0; // L: 6479 + hintArrowSubY = 64; // L: 6480 } + + if (hintArrowType == 4) { // L: 6482 + hintArrowSubX = 128; // L: 6483 + hintArrowSubY = 64; // L: 6484 + } + + if (hintArrowType == 5) { // L: 6486 + hintArrowSubX = 64; // L: 6487 + hintArrowSubY = 0; // L: 6488 + } + + if (hintArrowType == 6) { // L: 6490 + hintArrowSubX = 64; // L: 6491 + hintArrowSubY = 128; // L: 6492 + } + + hintArrowType = 2; // L: 6494 + hintArrowX = var3.readUnsignedShort(); // L: 6495 + hintArrowY = var3.readUnsignedShort(); // L: 6496 + hintArrowHeight = var3.readUnsignedByte(); // L: 6497 } - var1.serverPacket = null; // L: 6494 - return true; // L: 6495 - } + if (hintArrowType == 10) { // L: 6499 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } - if (ServerPacket.field3047 == var1.serverPacket) { // L: 6497 - class155.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6498 - field685 = cycleCntr; // L: 6499 var1.serverPacket = null; // L: 6500 return true; // L: 6501 } - if (ServerPacket.field3122 == var1.serverPacket) { // L: 6503 - SceneTilePaint.method4499(); // L: 6504 - runEnergy = var3.readUnsignedByte(); // L: 6505 - field762 = cycleCntr; // L: 6506 - var1.serverPacket = null; // L: 6507 - return true; // L: 6508 + if (ServerPacket.field3063 == var1.serverPacket) { // L: 6503 + ClanMate.method6700(class263.field3004); // L: 6504 + var1.serverPacket = null; // L: 6505 + return true; // L: 6506 } - if (ServerPacket.field3084 == var1.serverPacket) { // L: 6510 - var20 = var3.readUnsignedByte(); // L: 6511 - var21 = var3.readStringCp1252NullTerminated(); // L: 6512 - var22 = var3.method7789(); // L: 6513 - if (var20 >= 1 && var20 <= 8) { // L: 6514 - if (var21.equalsIgnoreCase("null")) { // L: 6515 + if (ServerPacket.field3057 == var1.serverPacket) { // L: 6508 + World var53 = new World(); // L: 6509 + var53.host = var3.readStringCp1252NullTerminated(); // L: 6510 + var53.id = var3.readUnsignedShort(); // L: 6511 + var5 = var3.readInt(); // L: 6512 + var53.properties = var5; // L: 6513 + Decimator.updateGameState(45); // L: 6514 + var2.close(); // L: 6515 + var2 = null; // L: 6516 + PlatformInfo.changeWorld(var53); // L: 6517 + var1.serverPacket = null; // L: 6518 + return false; // L: 6519 + } + + if (ServerPacket.field3081 == var1.serverPacket) { // L: 6521 + minimapState = var3.readUnsignedByte(); // L: 6522 + var1.serverPacket = null; // L: 6523 + return true; // L: 6524 + } + + if (ServerPacket.field3077 == var1.serverPacket) { // L: 6526 + var20 = var3.readUnsignedByte(); // L: 6527 + var5 = var3.readUnsignedByte(); // L: 6528 + var6 = var3.readUnsignedByte(); // L: 6529 + var22 = var3.readUnsignedByte(); // L: 6530 + field546[var20] = true; // L: 6531 + field756[var20] = var5; // L: 6532 + field636[var20] = var6; // L: 6533 + field674[var20] = var22; // L: 6534 + field600[var20] = 0; // L: 6535 + var1.serverPacket = null; // L: 6536 + return true; // L: 6537 + } + + if (ServerPacket.field3075 == var1.serverPacket) { // L: 6539 + class143.method3072(); // L: 6540 + weight = var3.readShort(); // L: 6541 + field707 = cycleCntr; // L: 6542 + var1.serverPacket = null; // L: 6543 + return true; // L: 6544 + } + + byte var72; + if (ServerPacket.field3043 == var1.serverPacket) { // L: 6546 + field755 = cycleCntr; // L: 6547 + var72 = var3.readByte(); // L: 6548 + class145 var77 = new class145(var3); // L: 6549 + ClanChannel var87; + if (var72 >= 0) { // L: 6551 + var87 = currentClanChannels[var72]; + } else { + var87 = class21.guestClanChannel; // L: 6552 + } + + var77.method3086(var87); // L: 6553 + var1.serverPacket = null; // L: 6554 + return true; // L: 6555 + } + + NPC var57; + if (ServerPacket.field3121 == var1.serverPacket) { // L: 6557 + var6 = var3.method7773(); // L: 6561 + var20 = var3.method7715(); // L: 6562 + var5 = var3.method7714(); // L: 6563 + if (var5 == 65535) { // L: 6564 + var5 = -1; // L: 6565 + } + + var57 = npcs[var20]; // L: 6567 + if (var57 != null) { // L: 6568 + if (var5 == var57.sequence && var5 != -1) { // L: 6569 + var8 = class163.SequenceDefinition_get(var5).field2161; // L: 6570 + if (var8 == 1) { // L: 6571 + var57.sequenceFrame = 0; // L: 6572 + var57.sequenceFrameCycle = 0; // L: 6573 + var57.sequenceDelay = var6; // L: 6574 + var57.field1152 = 0; // L: 6575 + } else if (var8 == 2) { // L: 6577 + var57.field1152 = 0; // L: 6578 + } + } else if (var5 == -1 || var57.sequence == -1 || class163.SequenceDefinition_get(var5).field2155 >= class163.SequenceDefinition_get(var57.sequence).field2155) { // L: 6581 + var57.sequence = var5; // L: 6582 + var57.sequenceFrame = 0; // L: 6583 + var57.sequenceFrameCycle = 0; // L: 6584 + var57.sequenceDelay = var6; // L: 6585 + var57.field1152 = 0; // L: 6586 + var57.field1170 = var57.pathLength; // L: 6587 + } + } + + var1.serverPacket = null; // L: 6591 + return true; // L: 6592 + } + + if (ServerPacket.field3042 == var1.serverPacket) { // L: 6594 + class426.method7546(); // L: 6595 + var72 = var3.readByte(); // L: 6596 + class131 var75 = new class131(var3); // L: 6597 + ClanSettings var83; + if (var72 >= 0) { // L: 6599 + var83 = currentClanSettings[var72]; + } else { + var83 = class154.guestClanSettings; // L: 6600 + } + + var75.method2873(var83); // L: 6601 + var1.serverPacket = null; // L: 6602 + return true; // L: 6603 + } + + if (ServerPacket.field3083 == var1.serverPacket) { // L: 6605 + var20 = var3.readUnsignedByte(); // L: 6606 + var21 = var3.readStringCp1252NullTerminated(); // L: 6607 + var6 = var3.method7875(); // L: 6608 + if (var20 >= 1 && var20 <= 8) { // L: 6609 + if (var21.equalsIgnoreCase("null")) { // L: 6610 var21 = null; } - playerMenuActions[var20 - 1] = var21; // L: 6516 - playerOptionsPriorities[var20 - 1] = var22 == 0; // L: 6517 + playerMenuActions[var20 - 1] = var21; // L: 6611 + playerOptionsPriorities[var20 - 1] = var6 == 0; // L: 6612 } - var1.serverPacket = null; // L: 6519 - return true; // L: 6520 + var1.serverPacket = null; // L: 6614 + return true; // L: 6615 } - if (ServerPacket.field3123 == var1.serverPacket) { // L: 6522 - var22 = var3.method7877(); // L: 6533 - var20 = var22 >> 16; // L: 6534 - var5 = var22 >> 8 & 255; // L: 6535 - var7 = var20 + (var22 >> 4 & 7); // L: 6536 - var23 = var5 + (var22 & 7); // L: 6537 - var9 = var3.method7789(); // L: 6538 - var10 = var9 >> 2; // L: 6539 - var61 = var9 & 3; // L: 6540 - var12 = field711[var10]; // L: 6541 - var68 = var3.readUnsignedShort(); // L: 6542 - if (var7 >= 0 && var23 >= 0 && var7 < 103 && var23 < 103) { // L: 6543 - if (var12 == 0) { // L: 6544 - BoundaryObject var93 = FriendSystem.scene.method4150(class160.Client_plane, var7, var23); // L: 6545 - if (var93 != null) { // L: 6546 - var15 = class121.Entity_unpackID(var93.tag); // L: 6547 - if (var10 == 2) { // L: 6548 - var93.renderable1 = new DynamicObject(var15, 2, var61 + 4, class160.Client_plane, var7, var23, var68, false, var93.renderable1); // L: 6549 - var93.renderable2 = new DynamicObject(var15, 2, var61 + 1 & 3, class160.Client_plane, var7, var23, var68, false, var93.renderable2); // L: 6550 - } else { - var93.renderable1 = new DynamicObject(var15, var10, var61, class160.Client_plane, var7, var23, var68, false, var93.renderable1); // L: 6552 - } - } - } else if (var12 == 1) { // L: 6555 - WallDecoration var92 = FriendSystem.scene.method4224(class160.Client_plane, var7, var23); // L: 6556 - if (var92 != null) { // L: 6557 - var15 = class121.Entity_unpackID(var92.tag); // L: 6558 - if (var10 != 4 && var10 != 5) { // L: 6559 - if (var10 == 6) { // L: 6562 - var92.renderable1 = new DynamicObject(var15, 4, var61 + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6563 - } else if (var10 == 7) { // L: 6565 - var92.renderable1 = new DynamicObject(var15, 4, (var61 + 2 & 3) + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6566 - } else if (var10 == 8) { // L: 6568 - var92.renderable1 = new DynamicObject(var15, 4, var61 + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6569 - var92.renderable2 = new DynamicObject(var15, 4, (var61 + 2 & 3) + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable2); // L: 6570 - } - } else { - var92.renderable1 = new DynamicObject(var15, 4, var61, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6560 - } - } - } else if (var12 == 2) { // L: 6574 - GameObject var90 = FriendSystem.scene.getGameObject(class160.Client_plane, var7, var23); // L: 6575 - if (var10 == 11) { // L: 6576 - var10 = 10; // L: 6577 - } - - if (var90 != null) { // L: 6579 - var90.renderable = new DynamicObject(class121.Entity_unpackID(var90.tag), var10, var61, class160.Client_plane, var7, var23, var68, false, var90.renderable); // L: 6580 - } - } else if (var12 == 3) { // L: 6583 - FloorDecoration var91 = FriendSystem.scene.getFloorDecoration(class160.Client_plane, var7, var23); // L: 6584 - if (var91 != null) { // L: 6585 - var91.renderable = new DynamicObject(class121.Entity_unpackID(var91.tag), 22, var61, class160.Client_plane, var7, var23, var68, false, var91.renderable); // L: 6586 - } - } - } - - var1.serverPacket = null; // L: 6590 - return true; // L: 6591 + if (ServerPacket.field3096 == var1.serverPacket) { // L: 6617 + ClanMate.method6700(class263.field3005); // L: 6618 + var1.serverPacket = null; // L: 6619 + return true; // L: 6620 } - if (ServerPacket.field3046 == var1.serverPacket) { // L: 6593 - var20 = var3.method7797(); // L: 6594 - var74 = HorizontalAlignment.getWidget(var20); // L: 6595 - - for (var22 = 0; var22 < var74.itemIds.length; ++var22) { // L: 6596 - var74.itemIds[var22] = -1; // L: 6597 - var74.itemIds[var22] = 0; // L: 6598 - } - - class290.invalidateWidget(var74); // L: 6600 - var1.serverPacket = null; // L: 6601 - return true; // L: 6602 - } - - if (ServerPacket.field3068 == var1.serverPacket) { // L: 6604 - var70 = var3.readByte(); // L: 6605 - var25 = (long)var3.readUnsignedShort(); // L: 6606 - var27 = (long)var3.readMedium(); // L: 6607 - var34 = (var25 << 32) + var27; // L: 6608 - boolean var11 = false; // L: 6609 - ClanChannel var37 = var70 >= 0 ? currentClanChannels[var70] : class83.guestClanChannel; // L: 6610 - if (var37 == null) { // L: 6611 - var11 = true; + long var26; + long var28; + long var30; + String var32; + int var33; + if (ServerPacket.field3067 == var1.serverPacket) { // L: 6622 + var72 = var3.readByte(); // L: 6623 + var26 = (long)var3.readUnsignedShort(); // L: 6624 + var28 = (long)var3.readMedium(); // L: 6625 + var30 = (var26 << 32) + var28; // L: 6626 + boolean var63 = false; // L: 6627 + ClanChannel var12 = var72 >= 0 ? currentClanChannels[var72] : class21.guestClanChannel; // L: 6628 + if (var12 == null) { // L: 6629 + var63 = true; } else { - for (var68 = 0; var68 < 100; ++var68) { // L: 6613 - if (crossWorldMessageIds[var68] == var34) { // L: 6614 - var11 = true; // L: 6615 - break; // L: 6616 + for (var13 = 0; var13 < 100; ++var13) { // L: 6631 + if (var30 == crossWorldMessageIds[var13]) { // L: 6632 + var63 = true; // L: 6633 + break; // L: 6634 } } } - if (!var11) { // L: 6620 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; // L: 6621 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6622 - var32 = class118.method2737(var3); // L: 6623 - var14 = var70 >= 0 ? 43 : 46; // L: 6624 - class6.addChatMessage(var14, "", var32, var37.name); // L: 6625 + if (!var63) { // L: 6638 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; // L: 6639 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6640 + var32 = class193.method3883(var3); // L: 6641 + var33 = var72 >= 0 ? 43 : 46; // L: 6642 + class301.addChatMessage(var33, "", var32, var12.name); // L: 6643 } - var1.serverPacket = null; // L: 6627 - return true; // L: 6628 + var1.serverPacket = null; // L: 6645 + return true; // L: 6646 } - if (ServerPacket.field3029 == var1.serverPacket) { // L: 6630 - var20 = var3.readUnsignedByte(); // L: 6631 - class19.forceDisconnect(var20); // L: 6632 - var1.serverPacket = null; // L: 6633 - return false; // L: 6634 - } + InterfaceParent var7; + long var35; + if (ServerPacket.field3068 == var1.serverPacket) { // L: 6648 + var20 = var3.offset + var1.serverPacketLength; // L: 6649 + var5 = var3.readUnsignedShort(); // L: 6650 + var6 = var3.readUnsignedShort(); // L: 6651 + if (var5 != rootInterface) { // L: 6652 + rootInterface = var5; // L: 6653 + this.resizeRoot(false); // L: 6654 + class29.Widget_resetModelFrames(rootInterface); // L: 6655 + class145.runWidgetOnLoadListener(rootInterface); // L: 6656 - if (ServerPacket.field3081 == var1.serverPacket) { // L: 6636 - GameEngine.field205 = new class391(FontName.HitSplatDefinition_cached); // L: 6637 - var1.serverPacket = null; // L: 6638 - return true; // L: 6639 - } - - if (ServerPacket.field3083 == var1.serverPacket) { // L: 6641 - destinationX = var3.readUnsignedByte(); // L: 6642 - if (destinationX == 255) { // L: 6643 - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); // L: 6644 - if (destinationY == 255) { // L: 6645 - destinationY = 0; - } - - var1.serverPacket = null; // L: 6646 - return true; // L: 6647 - } - - if (ServerPacket.field3039 == var1.serverPacket) { // L: 6649 - hintArrowType = var3.readUnsignedByte(); // L: 6650 - if (hintArrowType == 1) { // L: 6651 - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6652 - if (hintArrowType == 2) { // L: 6653 - hintArrowSubX = 64; // L: 6654 - hintArrowSubY = 64; // L: 6655 - } - - if (hintArrowType == 3) { // L: 6657 - hintArrowSubX = 0; // L: 6658 - hintArrowSubY = 64; // L: 6659 - } - - if (hintArrowType == 4) { // L: 6661 - hintArrowSubX = 128; // L: 6662 - hintArrowSubY = 64; // L: 6663 - } - - if (hintArrowType == 5) { // L: 6665 - hintArrowSubX = 64; // L: 6666 - hintArrowSubY = 0; // L: 6667 - } - - if (hintArrowType == 6) { // L: 6669 - hintArrowSubX = 64; // L: 6670 - hintArrowSubY = 128; // L: 6671 - } - - hintArrowType = 2; // L: 6673 - hintArrowX = var3.readUnsignedShort(); // L: 6674 - hintArrowY = var3.readUnsignedShort(); // L: 6675 - hintArrowHeight = var3.readUnsignedByte(); // L: 6676 - } - - if (hintArrowType == 10) { // L: 6678 - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; // L: 6679 - return true; // L: 6680 - } - - if (ServerPacket.field3120 == var1.serverPacket) { // L: 6682 - class268.readReflectionCheck(var3, var1.serverPacketLength); // L: 6683 - var1.serverPacket = null; // L: 6684 - return true; // L: 6685 - } - - if (ServerPacket.field3125 == var1.serverPacket) { // L: 6687 - class162.field1768 = true; // L: 6688 - DynamicObject.updateNpcs(false, var3); // L: 6689 - var1.serverPacket = null; // L: 6690 - return true; // L: 6691 - } - - NPC var24; - if (ServerPacket.field3063 == var1.serverPacket) { // L: 6693 - var5 = var3.method7810(); // L: 6698 - var22 = var3.method7935(); // L: 6699 - var20 = var3.method7798(); // L: 6700 - var24 = npcs[var20]; // L: 6701 - if (var24 != null) { // L: 6702 - var24.spotAnimation = var22; // L: 6703 - var24.spotAnimationHeight = var5 >> 16; // L: 6704 - var24.field1173 = (var5 & 65535) + cycle; // L: 6705 - var24.spotAnimationFrame = 0; // L: 6706 - var24.spotAnimationFrameCycle = 0; // L: 6707 - if (var24.field1173 > cycle) { // L: 6708 - var24.spotAnimationFrame = -1; // L: 6709 - } - - if (var24.spotAnimation == 65535) { // L: 6711 - var24.spotAnimation = -1; // L: 6712 + for (var22 = 0; var22 < 100; ++var22) { // L: 6657 + field715[var22] = true; } } - var1.serverPacket = null; // L: 6715 - return true; // L: 6716 - } + InterfaceParent var91; + for (; var6-- > 0; var91.field1028 = true) { // L: 6659 6669 + var22 = var3.readInt(); // L: 6660 + var8 = var3.readUnsignedShort(); // L: 6661 + var61 = var3.readUnsignedByte(); // L: 6662 + var91 = (InterfaceParent)interfaceParents.get((long)var22); // L: 6663 + if (var91 != null && var8 != var91.group) { // L: 6664 + Script.closeInterface(var91, true); // L: 6665 + var91 = null; // L: 6666 + } - if (ServerPacket.field3053 == var1.serverPacket) { // L: 6718 - var20 = var3.readInt(); // L: 6719 - var5 = var3.method7802(); // L: 6720 - var6 = HorizontalAlignment.getWidget(var20); // L: 6721 - if (var5 != var6.sequenceId || var5 == -1) { // L: 6722 - var6.sequenceId = var5; // L: 6723 - var6.modelFrame = 0; // L: 6724 - var6.modelFrameCycle = 0; // L: 6725 - class290.invalidateWidget(var6); // L: 6726 + if (var91 == null) { // L: 6668 + var91 = class4.method16(var22, var8, var61); + } } - var1.serverPacket = null; // L: 6728 - return true; // L: 6729 + for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { // L: 6671 + if (var7.field1028) { // L: 6672 + var7.field1028 = false; + } else { + Script.closeInterface(var7, true); // L: 6674 + } + } + + widgetFlags = new NodeHashTable(512); // L: 6677 + + while (var3.offset < var20) { // L: 6678 + var22 = var3.readInt(); // L: 6679 + var8 = var3.readUnsignedShort(); // L: 6680 + var61 = var3.readUnsignedShort(); // L: 6681 + var62 = var3.readInt(); // L: 6682 + + for (var11 = var8; var11 <= var61; ++var11) { // L: 6683 + var35 = (long)var11 + ((long)var22 << 32); // L: 6684 + widgetFlags.put(new IntegerNode(var62), var35); // L: 6685 + } + } + + var1.serverPacket = null; // L: 6688 + return true; // L: 6689 } - if (ServerPacket.field3094 == var1.serverPacket) { // L: 6731 - class221.method4531(class263.field3005); // L: 6732 + if (ServerPacket.field3025 == var1.serverPacket) { // L: 6691 + GameEngine.privateChatMode = class166.method3343(var3.readUnsignedByte()); // L: 6692 + var1.serverPacket = null; // L: 6693 + return true; // L: 6694 + } + + if (ServerPacket.field3026 == var1.serverPacket) { // L: 6696 + WorldMapSection1.updateNpcs(true, var3); // L: 6697 + var1.serverPacket = null; // L: 6698 + return true; // L: 6699 + } + + Widget var25; + if (ServerPacket.field3097 == var1.serverPacket) { // L: 6701 + var20 = var3.method7705(); // L: 6702 + var5 = var3.method7827(); // L: 6703 + InterfaceParent var81 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6704 + var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6705 + if (var7 != null) { // L: 6706 + Script.closeInterface(var7, var81 == null || var7.group != var81.group); + } + + if (var81 != null) { // L: 6707 + var81.remove(); // L: 6708 + interfaceParents.put(var81, (long)var5); // L: 6709 + } + + var25 = class127.getWidget(var20); // L: 6711 + if (var25 != null) { // L: 6712 + class346.invalidateWidget(var25); + } + + var25 = class127.getWidget(var5); // L: 6713 + if (var25 != null) { // L: 6714 + class346.invalidateWidget(var25); // L: 6715 + AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var25.id >>> 16], var25, true); // L: 6716 + } + + if (rootInterface != -1) { // L: 6718 + MouseRecorder.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6719 + return true; // L: 6720 + } + + if (ServerPacket.field3093 == var1.serverPacket) { // L: 6722 + ClanMate.method6700(class263.field3015); // L: 6723 + var1.serverPacket = null; // L: 6724 + return true; // L: 6725 + } + + if (ServerPacket.field3116 == var1.serverPacket) { // L: 6727 + var20 = var3.readInt(); // L: 6728 + if (var20 != field586) { // L: 6729 + field586 = var20; // L: 6730 + ObjectSound.method1757(); // L: 6731 + } + var1.serverPacket = null; // L: 6733 return true; // L: 6734 } - if (ServerPacket.field3067 == var1.serverPacket) { // L: 6736 - class221.method4531(class263.field3008); // L: 6737 + if (ServerPacket.field3082 == var1.serverPacket) { // L: 6736 + AbstractWorldMapData.readReflectionCheck(var3, var1.serverPacketLength); // L: 6737 var1.serverPacket = null; // L: 6738 return true; // L: 6739 } - if (ServerPacket.field3062 == var1.serverPacket) { // L: 6741 - var20 = var3.method7798(); // L: 6742 - if (var20 == 65535) { // L: 6743 + boolean var78; + if (ServerPacket.field3027 == var1.serverPacket) { // L: 6741 + var78 = var3.readBoolean(); // L: 6742 + if (var78) { // L: 6743 + if (VarcInt.field1841 == null) { // L: 6744 + VarcInt.field1841 = new class326(); + } + } else { + VarcInt.field1841 = null; // L: 6746 + } + + var1.serverPacket = null; // L: 6747 + return true; // L: 6748 + } + + if (ServerPacket.field3054 == var1.serverPacket) { // L: 6750 + var20 = var3.method7713(); // L: 6751 + if (var20 == 65535) { // L: 6752 var20 = -1; } - var5 = var3.method7797(); // L: 6744 - var22 = var3.method7810(); // L: 6745 - var80 = HorizontalAlignment.getWidget(var22); // L: 6746 - ItemComposition var8; - if (!var80.isIf3) { // L: 6747 - if (var20 == -1) { // L: 6748 - var80.modelType = 0; // L: 6749 - var1.serverPacket = null; // L: 6750 - return true; // L: 6751 + var5 = var3.method7837(); // L: 6753 + var6 = var3.method7827(); // L: 6754 + var60 = class127.getWidget(var6); // L: 6755 + ItemComposition var80; + if (!var60.isIf3) { // L: 6756 + if (var20 == -1) { // L: 6757 + var60.modelType = 0; // L: 6758 + var1.serverPacket = null; // L: 6759 + return true; // L: 6760 } - var8 = class67.ItemDefinition_get(var20); // L: 6753 - var80.modelType = 4; // L: 6754 - var80.modelId = var20; // L: 6755 - var80.modelAngleX = var8.xan2d; // L: 6756 - var80.modelAngleY = var8.yan2d; // L: 6757 - var80.modelZoom = var8.zoom2d * 100 / var5; // L: 6758 - class290.invalidateWidget(var80); // L: 6759 + var80 = class19.ItemDefinition_get(var20); // L: 6762 + var60.modelType = 4; // L: 6763 + var60.modelId = var20; // L: 6764 + var60.modelAngleX = var80.xan2d; // L: 6765 + var60.modelAngleY = var80.yan2d; // L: 6766 + var60.modelZoom = var80.zoom2d * 100 / var5; // L: 6767 + class346.invalidateWidget(var60); // L: 6768 } else { - var80.itemId = var20; // L: 6762 - var80.itemQuantity = var5; // L: 6763 - var8 = class67.ItemDefinition_get(var20); // L: 6764 - var80.modelAngleX = var8.xan2d; // L: 6765 - var80.modelAngleY = var8.yan2d; // L: 6766 - var80.modelAngleZ = var8.zan2d; // L: 6767 - var80.modelOffsetX = var8.offsetX2d; // L: 6768 - var80.modelOffsetY = var8.offsetY2d; // L: 6769 - var80.modelZoom = var8.zoom2d; // L: 6770 - if (var8.isStackable == 1) { // L: 6771 - var80.itemQuantityMode = 1; + var60.itemId = var20; // L: 6771 + var60.itemQuantity = var5; // L: 6772 + var80 = class19.ItemDefinition_get(var20); // L: 6773 + var60.modelAngleX = var80.xan2d; // L: 6774 + var60.modelAngleY = var80.yan2d; // L: 6775 + var60.modelAngleZ = var80.zan2d; // L: 6776 + var60.modelOffsetX = var80.offsetX2d; // L: 6777 + var60.modelOffsetY = var80.offsetY2d; // L: 6778 + var60.modelZoom = var80.zoom2d; // L: 6779 + if (var80.isStackable == 1) { // L: 6780 + var60.itemQuantityMode = 1; } else { - var80.itemQuantityMode = 2; // L: 6772 + var60.itemQuantityMode = 2; // L: 6781 } - if (var80.field3398 > 0) { // L: 6773 - var80.modelZoom = var80.modelZoom * 32 / var80.field3398; - } else if (var80.rawWidth > 0) { // L: 6774 - var80.modelZoom = var80.modelZoom * 32 / var80.rawWidth; + if (var60.field3467 > 0) { // L: 6782 + var60.modelZoom = var60.modelZoom * 32 / var60.field3467; + } else if (var60.rawWidth > 0) { // L: 6783 + var60.modelZoom = var60.modelZoom * 32 / var60.rawWidth; } - class290.invalidateWidget(var80); // L: 6775 + class346.invalidateWidget(var60); // L: 6784 } - var1.serverPacket = null; // L: 6777 - return true; // L: 6778 + var1.serverPacket = null; // L: 6786 + return true; // L: 6787 } - if (ServerPacket.field3111 == var1.serverPacket) { // L: 6780 - var20 = var3.method7797(); // L: 6781 - var5 = var3.method7935(); // L: 6782 - var6 = HorizontalAlignment.getWidget(var20); // L: 6783 - if (var6 != null && var6.type == 0) { // L: 6784 - if (var5 > var6.scrollHeight - var6.height) { // L: 6785 - var5 = var6.scrollHeight - var6.height; - } + if (ServerPacket.field3102 == var1.serverPacket) { // L: 6789 + var20 = var3.readInt(); // L: 6790 + var5 = var3.readInt(); // L: 6791 + var6 = Tile.getGcDuration(); // L: 6792 + PacketBufferNode var59 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2983, packetWriter.isaacCipher); // L: 6794 + var59.packetBuffer.method7723(var20); // L: 6795 + var59.packetBuffer.method7721(var5); // L: 6796 + var59.packetBuffer.method7703(GameEngine.fps); // L: 6797 + var59.packetBuffer.method7703(var6); // L: 6798 + packetWriter.addNode(var59); // L: 6799 + var1.serverPacket = null; // L: 6800 + return true; // L: 6801 + } - if (var5 < 0) { // L: 6786 - var5 = 0; - } + Widget var73; + if (ServerPacket.field3086 == var1.serverPacket) { // L: 6803 + var20 = var3.method7837(); // L: 6804 + var73 = class127.getWidget(var20); // L: 6805 - if (var5 != var6.scrollY) { // L: 6787 - var6.scrollY = var5; // L: 6788 - class290.invalidateWidget(var6); // L: 6789 - } + for (var6 = 0; var6 < var73.itemIds.length; ++var6) { // L: 6806 + var73.itemIds[var6] = -1; // L: 6807 + var73.itemIds[var6] = 0; // L: 6808 } - var1.serverPacket = null; // L: 6792 - return true; // L: 6793 + class346.invalidateWidget(var73); // L: 6810 + var1.serverPacket = null; // L: 6811 + return true; // L: 6812 } - if (ServerPacket.field3109 == var1.serverPacket) { // L: 6795 - var5 = var3.readUnsignedShort(); // L: 6800 - var22 = var3.method7889(); // L: 6801 - var20 = var3.readUnsignedShort(); // L: 6802 - Player var77; - if (var20 == localPlayerIndex) { // L: 6803 - var77 = class19.localPlayer; // L: 6804 - } else { - var77 = players[var20]; // L: 6807 - } - - if (var77 != null) { // L: 6809 - var77.spotAnimation = var5; // L: 6810 - var77.spotAnimationHeight = var22 >> 16; // L: 6811 - var77.field1173 = (var22 & 65535) + cycle; // L: 6812 - var77.spotAnimationFrame = 0; // L: 6813 - var77.spotAnimationFrameCycle = 0; // L: 6814 - if (var77.field1173 > cycle) { // L: 6815 - var77.spotAnimationFrame = -1; // L: 6816 - } - - if (var77.spotAnimation == 65535) { // L: 6818 - var77.spotAnimation = -1; // L: 6819 - } - } - - var1.serverPacket = null; // L: 6822 - return true; // L: 6823 - } - - if (ServerPacket.field3089 == var1.serverPacket) { // L: 6825 - var50 = var3.readStringCp1252NullTerminated(); // L: 6826 - Object[] var73 = new Object[var50.length() + 1]; // L: 6827 - - for (var22 = var50.length() - 1; var22 >= 0; --var22) { // L: 6828 - if (var50.charAt(var22) == 's') { // L: 6829 - var73[var22 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var73[var22 + 1] = new Integer(var3.readInt()); // L: 6830 - } - } - - var73[0] = new Integer(var3.readInt()); // L: 6832 - ScriptEvent var55 = new ScriptEvent(); // L: 6833 - var55.args = var73; // L: 6834 - class1.runScriptEvent(var55); // L: 6835 - var1.serverPacket = null; // L: 6836 - return true; // L: 6837 - } - - if (ServerPacket.field3066 == var1.serverPacket) { // L: 6839 - var20 = var3.readUnsignedByte(); // L: 6840 - class82.method2123(var20); // L: 6841 - var1.serverPacket = null; // L: 6842 - return true; // L: 6843 - } - - if (ServerPacket.field3097 == var1.serverPacket) { // L: 6845 - isCameraLocked = true; // L: 6846 - field739 = false; // L: 6847 - PcmPlayer.field302 = var3.readUnsignedByte(); // L: 6848 - DevicePcmPlayerProvider.field146 = var3.readUnsignedByte(); // L: 6849 - ClanSettings.field1608 = var3.readUnsignedShort(); // L: 6850 - Tiles.field996 = var3.readUnsignedByte(); // L: 6851 - class33.field231 = var3.readUnsignedByte(); // L: 6852 - if (class33.field231 >= 100) { // L: 6853 - EnumComposition.cameraX = PcmPlayer.field302 * 128 + 64; // L: 6854 - CollisionMap.cameraZ = DevicePcmPlayerProvider.field146 * 128 + 64; // L: 6855 - FriendSystem.cameraY = Archive.getTileHeight(EnumComposition.cameraX, CollisionMap.cameraZ, class160.Client_plane) - ClanSettings.field1608; // L: 6856 - } - - var1.serverPacket = null; // L: 6858 - return true; // L: 6859 - } - - if (ServerPacket.field3037 == var1.serverPacket) { // L: 6861 - class221.method4531(class263.field3011); // L: 6862 - var1.serverPacket = null; // L: 6863 - return true; // L: 6864 - } - - if (ServerPacket.field3059 == var1.serverPacket) { // L: 6866 - var22 = var3.method7790(); // L: 6870 - var20 = var3.method7971(); // L: 6871 - var5 = var3.method7935(); // L: 6872 - if (var5 == 65535) { // L: 6873 - var5 = -1; // L: 6874 - } - - var24 = npcs[var20]; // L: 6876 - if (var24 != null) { // L: 6877 - if (var5 == var24.sequence && var5 != -1) { // L: 6878 - var23 = ItemContainer.SequenceDefinition_get(var5).field2172; // L: 6879 - if (var23 == 1) { // L: 6880 - var24.sequenceFrame = 0; // L: 6881 - var24.sequenceFrameCycle = 0; // L: 6882 - var24.sequenceDelay = var22; // L: 6883 - var24.field1169 = 0; // L: 6884 - } else if (var23 == 2) { // L: 6886 - var24.field1169 = 0; // L: 6887 - } - } else if (var5 == -1 || var24.sequence == -1 || ItemContainer.SequenceDefinition_get(var5).field2166 >= ItemContainer.SequenceDefinition_get(var24.sequence).field2166) { // L: 6890 - var24.sequence = var5; // L: 6891 - var24.sequenceFrame = 0; // L: 6892 - var24.sequenceFrameCycle = 0; // L: 6893 - var24.sequenceDelay = var22; // L: 6894 - var24.field1169 = 0; // L: 6895 - var24.field1134 = var24.pathLength; // L: 6896 - } - } - - var1.serverPacket = null; // L: 6900 - return true; // L: 6901 - } - - if (ServerPacket.field3070 == var1.serverPacket) { // L: 6903 - class221.method4531(class263.field3007); // L: 6904 - var1.serverPacket = null; // L: 6905 - return true; // L: 6906 - } - - if (ServerPacket.field3080 == var1.serverPacket) { // L: 6908 - var20 = var3.readInt(); // L: 6909 - var5 = var3.readUnsignedShort(); // L: 6910 - if (var20 < -70000) { // L: 6911 + if (ServerPacket.field3044 == var1.serverPacket) { // L: 6814 + var20 = var3.readInt(); // L: 6815 + var5 = var3.readUnsignedShort(); // L: 6816 + if (var20 < -70000) { // L: 6817 var5 += 32768; } - if (var20 >= 0) { // L: 6913 - var6 = HorizontalAlignment.getWidget(var20); + if (var20 >= 0) { // L: 6819 + var74 = class127.getWidget(var20); } else { - var6 = null; // L: 6914 + var74 = null; // L: 6820 } - for (; var3.offset < var1.serverPacketLength; class29.itemContainerSetItem(var5, var7, var23 - 1, var9)) { // L: 6915 6929 - var7 = var3.readUShortSmart(); // L: 6916 - var23 = var3.readUnsignedShort(); // L: 6917 - var9 = 0; // L: 6918 - if (var23 != 0) { // L: 6919 - var9 = var3.readUnsignedByte(); // L: 6920 - if (var9 == 255) { // L: 6921 - var9 = var3.readInt(); + for (; var3.offset < var1.serverPacketLength; ChatChannel.itemContainerSetItem(var5, var22, var8 - 1, var61)) { // L: 6821 6835 + var22 = var3.readUShortSmart(); // L: 6822 + var8 = var3.readUnsignedShort(); // L: 6823 + var61 = 0; // L: 6824 + if (var8 != 0) { // L: 6825 + var61 = var3.readUnsignedByte(); // L: 6826 + if (var61 == 255) { // L: 6827 + var61 = var3.readInt(); } } - if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { // L: 6923 6924 - var6.itemIds[var7] = var23; // L: 6925 - var6.itemQuantities[var7] = var9; // L: 6926 + if (var74 != null && var22 >= 0 && var22 < var74.itemIds.length) { // L: 6829 6830 + var74.itemIds[var22] = var8; // L: 6831 + var74.itemQuantities[var22] = var61; // L: 6832 } } - if (var6 != null) { // L: 6931 - class290.invalidateWidget(var6); + if (var74 != null) { // L: 6837 + class346.invalidateWidget(var74); } - SceneTilePaint.method4499(); // L: 6932 - changedItemContainers[++field746 - 1 & 31] = var5 & 32767; // L: 6933 - var1.serverPacket = null; // L: 6934 - return true; // L: 6935 + class143.method3072(); // L: 6838 + changedItemContainers[++field695 - 1 & 31] = var5 & 32767; // L: 6839 + var1.serverPacket = null; // L: 6840 + return true; // L: 6841 } - if (ServerPacket.field3049 == var1.serverPacket) { // L: 6937 - var20 = var3.method7971(); // L: 6938 - if (var20 == 65535) { // L: 6939 - var20 = -1; + if (ServerPacket.field3095 == var1.serverPacket) { // L: 6843 + var20 = var3.method7837(); // L: 6844 + var73 = class127.getWidget(var20); // L: 6845 + var73.modelType = 3; // L: 6846 + var73.modelId = GrandExchangeEvents.localPlayer.appearance.getChatHeadId(); // L: 6847 + class346.invalidateWidget(var73); // L: 6848 + var1.serverPacket = null; // L: 6849 + return true; // L: 6850 + } + + if (ServerPacket.field3092 == var1.serverPacket) { // L: 6852 + var52 = var3.readStringCp1252NullTerminated(); // L: 6853 + var26 = (long)var3.readUnsignedShort(); // L: 6854 + var28 = (long)var3.readMedium(); // L: 6855 + PlayerType var37 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var3.readUnsignedByte()); // L: 6856 + long var38 = (var26 << 32) + var28; // L: 6857 + boolean var76 = false; // L: 6858 + + for (var13 = 0; var13 < 100; ++var13) { // L: 6859 + if (var38 == crossWorldMessageIds[var13]) { // L: 6860 + var76 = true; // L: 6861 + break; // L: 6862 + } } - class401.playSong(var20); // L: 6940 + if (Decimator.friendSystem.isIgnored(new Username(var52, class122.loginType))) { // L: 6865 + var76 = true; + } + + if (!var76 && field618 == 0) { // L: 6866 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 6867 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6868 + var32 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(var3))); // L: 6869 + byte var92; + if (var37.isPrivileged) { // L: 6871 + var92 = 7; + } else { + var92 = 3; // L: 6872 + } + + if (var37.modIcon != -1) { // L: 6873 + Actor.addGameMessage(var92, Script.method1990(var37.modIcon) + var52, var32); + } else { + Actor.addGameMessage(var92, var52, var32); // L: 6874 + } + } + + var1.serverPacket = null; // L: 6876 + return true; // L: 6877 + } + + if (ServerPacket.field3117 == var1.serverPacket) { // L: 6879 + var20 = var3.method7715(); // L: 6880 + var5 = var3.method7827(); // L: 6881 + var74 = class127.getWidget(var5); // L: 6882 + if (var74.modelType != 2 || var20 != var74.modelId) { // L: 6883 + var74.modelType = 2; // L: 6884 + var74.modelId = var20; // L: 6885 + class346.invalidateWidget(var74); // L: 6886 + } + + var1.serverPacket = null; // L: 6888 + return true; // L: 6889 + } + + if (ServerPacket.field3070 == var1.serverPacket) { // L: 6891 + var20 = var3.method7827(); // L: 6892 + var5 = var3.method7713(); // L: 6893 + if (var5 == 65535) { // L: 6894 + var5 = -1; + } + + var6 = var3.method7715(); // L: 6895 + if (var6 == 65535) { // L: 6896 + var6 = -1; + } + + var22 = var3.readInt(); // L: 6897 + + for (var8 = var5; var8 <= var6; ++var8) { // L: 6898 + var30 = ((long)var22 << 32) + (long)var8; // L: 6899 + Node var93 = widgetFlags.get(var30); // L: 6900 + if (var93 != null) { // L: 6901 + var93.remove(); + } + + widgetFlags.put(new IntegerNode(var20), var30); // L: 6902 + } + + var1.serverPacket = null; // L: 6904 + return true; // L: 6905 + } + + if (ServerPacket.field3041 == var1.serverPacket) { // L: 6907 + class29.field181 = var3.method7875(); // L: 6908 + PlayerComposition.field3307 = var3.method7742(); // L: 6909 + + while (var3.offset < var1.serverPacketLength) { // L: 6910 + var20 = var3.readUnsignedByte(); // L: 6911 + class263 var71 = class114.method2662()[var20]; // L: 6912 + ClanMate.method6700(var71); // L: 6913 + } + + var1.serverPacket = null; // L: 6915 + return true; // L: 6916 + } + + if (ServerPacket.field3109 == var1.serverPacket) { // L: 6918 + class426.method7546(); // L: 6919 + var72 = var3.readByte(); // L: 6920 + if (var1.serverPacketLength == 1) { // L: 6921 + if (var72 >= 0) { // L: 6922 + currentClanSettings[var72] = null; + } else { + class154.guestClanSettings = null; // L: 6923 + } + + var1.serverPacket = null; // L: 6924 + return true; // L: 6925 + } + + if (var72 >= 0) { // L: 6927 + currentClanSettings[var72] = new ClanSettings(var3); // L: 6928 + } else { + class154.guestClanSettings = new ClanSettings(var3); // L: 6931 + } + + var1.serverPacket = null; // L: 6933 + return true; // L: 6934 + } + + if (ServerPacket.field3089 == var1.serverPacket) { // L: 6936 + if (ClientPacket.friendsChat != null) { // L: 6937 + ClientPacket.friendsChat.method6661(var3); // L: 6938 + } + + SecureRandomCallable.method2050(); // L: 6940 var1.serverPacket = null; // L: 6941 return true; // L: 6942 } - if (ServerPacket.field3093 == var1.serverPacket) { // L: 6944 - var20 = var3.method7805(); // L: 6945 - var5 = var3.method7971(); // L: 6946 - if (var5 == 65535) { // L: 6947 - var5 = -1; + if (ServerPacket.field3046 == var1.serverPacket) { // L: 6944 + ClanMate.method6700(class263.field3008); // L: 6945 + var1.serverPacket = null; // L: 6946 + return true; // L: 6947 + } + + if (ServerPacket.field3069 == var1.serverPacket) { // L: 6949 + Decimator.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6950 + field701 = cycleCntr; // L: 6951 + var1.serverPacket = null; // L: 6952 + return true; // L: 6953 + } + + if (ServerPacket.field3098 == var1.serverPacket) { // L: 6955 + var20 = var3.method7837(); // L: 6956 + var5 = var3.readUnsignedShort(); // L: 6957 + var74 = class127.getWidget(var20); // L: 6958 + if (var74.modelType != 1 || var5 != var74.modelId) { // L: 6959 + var74.modelType = 1; // L: 6960 + var74.modelId = var5; // L: 6961 + class346.invalidateWidget(var74); // L: 6962 } - class145.method3032(var5, var20); // L: 6948 - var1.serverPacket = null; // L: 6949 - return true; // L: 6950 - } - - if (ServerPacket.field3113 == var1.serverPacket) { // L: 6952 - FillMode.method8155(var3.readStringCp1252NullTerminated()); // L: 6953 - var1.serverPacket = null; // L: 6954 - return true; // L: 6955 - } - - if (ServerPacket.field3026 == var1.serverPacket) { // L: 6957 - class221.method4531(class263.field3004); // L: 6958 - var1.serverPacket = null; // L: 6959 - return true; // L: 6960 - } - - if (ServerPacket.field3127 == var1.serverPacket) { // L: 6962 - class146.loadRegions(false, var1.packetBuffer); // L: 6963 var1.serverPacket = null; // L: 6964 return true; // L: 6965 } - if (ServerPacket.field3055 == var1.serverPacket) { // L: 6967 - class155.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6968 - ObjectComposition.FriendSystem_invalidateIgnoreds(); // L: 6969 - field685 = cycleCntr; // L: 6970 - var1.serverPacket = null; // L: 6971 - return true; // L: 6972 - } + if (ServerPacket.field3034 == var1.serverPacket) { // L: 6967 + var20 = var3.method7714(); // L: 6968 + rootInterface = var20; // L: 6969 + this.resizeRoot(false); // L: 6970 + class29.Widget_resetModelFrames(var20); // L: 6971 + class145.runWidgetOnLoadListener(rootInterface); // L: 6972 - if (ServerPacket.field3087 == var1.serverPacket) { // L: 6974 - class162.field1768 = true; // L: 6975 - DynamicObject.updateNpcs(true, var3); // L: 6976 - var1.serverPacket = null; // L: 6977 - return true; // L: 6978 - } - - if (ServerPacket.field3073 == var1.serverPacket) { // L: 6980 - class155.friendSystem.method1687(); // L: 6981 - field685 = cycleCntr; // L: 6982 - var1.serverPacket = null; // L: 6983 - return true; // L: 6984 - } - - if (ServerPacket.field3108 == var1.serverPacket) { // L: 6986 - if (var1.serverPacketLength == 0) { // L: 6987 - class230.friendsChat = null; // L: 6988 - } else { - if (class230.friendsChat == null) { // L: 6991 - class230.friendsChat = new FriendsChat(class83.loginType, UserComparator10.client); // L: 6992 - } - - class230.friendsChat.readUpdate(var3); // L: 6994 + for (var5 = 0; var5 < 100; ++var5) { // L: 6973 + field715[var5] = true; } - Strings.method5798(); // L: 6996 - var1.serverPacket = null; // L: 6997 - return true; // L: 6998 + var1.serverPacket = null; // L: 6974 + return true; // L: 6975 } - if (ServerPacket.field3115 == var1.serverPacket) { // L: 7000 - var70 = var3.readByte(); // L: 7001 - var21 = var3.readStringCp1252NullTerminated(); // L: 7002 - long var42 = (long)var3.readUnsignedShort(); // L: 7003 - long var44 = (long)var3.readMedium(); // L: 7004 - PlayerType var33 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 7005 - long var46 = (var42 << 32) + var44; // L: 7006 - boolean var13 = false; // L: 7007 - ClanChannel var41 = null; // L: 7008 - var41 = var70 >= 0 ? currentClanChannels[var70] : class83.guestClanChannel; // L: 7010 - if (var41 == null) { // L: 7011 - var13 = true; // L: 7012 + if (ServerPacket.field3060 == var1.serverPacket) { // L: 6977 + Projectile.updatePlayers(var3, var1.serverPacketLength); // L: 6978 + class115.method2684(); // L: 6979 + var1.serverPacket = null; // L: 6980 + return true; // L: 6981 + } + + String var41; + if (ServerPacket.field3111 == var1.serverPacket) { // L: 6983 + var52 = var3.readStringCp1252NullTerminated(); // L: 6984 + var26 = var3.readLong(); // L: 6985 + var28 = (long)var3.readUnsignedShort(); // L: 6986 + var30 = (long)var3.readMedium(); // L: 6987 + PlayerType var40 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var3.readUnsignedByte()); // L: 6988 + var35 = (var28 << 32) + var30; // L: 6989 + boolean var89 = false; // L: 6990 + + for (var15 = 0; var15 < 100; ++var15) { // L: 6991 + if (crossWorldMessageIds[var15] == var35) { // L: 6992 + var89 = true; // L: 6993 + break; // L: 6994 + } + } + + if (var40.isUser && Decimator.friendSystem.isIgnored(new Username(var52, class122.loginType))) { // L: 6997 6998 + var89 = true; + } + + if (!var89 && field618 == 0) { // L: 7000 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var35; // L: 7001 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7002 + var41 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(var3))); // L: 7003 + if (var40.modIcon != -1) { // L: 7004 + class301.addChatMessage(9, Script.method1990(var40.modIcon) + var52, var41, class82.base37DecodeLong(var26)); + } else { + class301.addChatMessage(9, var52, var41, class82.base37DecodeLong(var26)); // L: 7005 + } + } + + var1.serverPacket = null; // L: 7007 + return true; // L: 7008 + } + + if (ServerPacket.field3047 == var1.serverPacket) { // L: 7010 + var20 = var3.method7715(); // L: 7011 + var5 = var3.method7714(); // L: 7012 + var6 = var3.method7714(); // L: 7013 + var22 = var3.method7837(); // L: 7014 + var25 = class127.getWidget(var22); // L: 7015 + if (var6 != var25.modelAngleX || var5 != var25.modelAngleY || var20 != var25.modelZoom) { // L: 7016 + var25.modelAngleX = var6; // L: 7017 + var25.modelAngleY = var5; // L: 7018 + var25.modelZoom = var20; // L: 7019 + class346.invalidateWidget(var25); // L: 7020 + } + + var1.serverPacket = null; // L: 7022 + return true; // L: 7023 + } + + if (ServerPacket.field3050 == var1.serverPacket) { // L: 7025 + class143.method3072(); // L: 7026 + runEnergy = var3.readUnsignedByte(); // L: 7027 + field707 = cycleCntr; // L: 7028 + var1.serverPacket = null; // L: 7029 + return true; // L: 7030 + } + + if (ServerPacket.field3105 == var1.serverPacket) { // L: 7032 + for (var20 = 0; var20 < players.length; ++var20) { // L: 7033 + if (players[var20] != null) { // L: 7034 + players[var20].sequence = -1; + } + } + + for (var20 = 0; var20 < npcs.length; ++var20) { // L: 7036 + if (npcs[var20] != null) { // L: 7037 + npcs[var20].sequence = -1; + } + } + + var1.serverPacket = null; // L: 7039 + return true; // L: 7040 + } + + if (ServerPacket.field3038 == var1.serverPacket) { // L: 7042 + rebootTimer = var3.readUnsignedShort() * 30; // L: 7043 + field707 = cycleCntr; // L: 7044 + var1.serverPacket = null; // L: 7045 + return true; // L: 7046 + } + + if (ServerPacket.field3023 == var1.serverPacket) { // L: 7048 + Decimator.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 7049 + KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 7050 + field701 = cycleCntr; // L: 7051 + var1.serverPacket = null; // L: 7052 + return true; // L: 7053 + } + + if (ServerPacket.field3078 == var1.serverPacket) { // L: 7055 + isCameraLocked = true; // L: 7056 + field754 = false; // L: 7057 + class154.field1691 = var3.readUnsignedByte(); // L: 7058 + class67.field881 = var3.readUnsignedByte(); // L: 7059 + DevicePcmPlayerProvider.field154 = var3.readUnsignedShort(); // L: 7060 + NetFileRequest.field3960 = var3.readUnsignedByte(); // L: 7061 + class386.field4337 = var3.readUnsignedByte(); // L: 7062 + if (class386.field4337 >= 100) { // L: 7063 + var20 = class154.field1691 * 128 + 64; // L: 7064 + var5 = class67.field881 * 128 + 64; // L: 7065 + var6 = WorldMapLabel.getTileHeight(var20, var5, class18.Client_plane) - DevicePcmPlayerProvider.field154; // L: 7066 + var22 = var20 - WorldMapLabelSize.cameraX; // L: 7067 + var8 = var6 - ItemContainer.cameraY; // L: 7068 + var61 = var5 - class154.cameraZ; // L: 7069 + var62 = (int)Math.sqrt((double)(var22 * var22 + var61 * var61)); // L: 7070 + class147.cameraPitch = (int)(Math.atan2((double)var8, (double)var62) * 325.9490051269531D) & 2047; // L: 7071 + class21.cameraYaw = (int)(Math.atan2((double)var22, (double)var61) * -325.9490051269531D) & 2047; // L: 7072 + if (class147.cameraPitch < 128) { // L: 7073 + class147.cameraPitch = 128; + } + + if (class147.cameraPitch > 383) { // L: 7074 + class147.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 7076 + return true; // L: 7077 + } + + if (ServerPacket.field3028 == var1.serverPacket) { // L: 7079 + var20 = var3.readUnsignedByte(); // L: 7080 + class16.forceDisconnect(var20); // L: 7081 + var1.serverPacket = null; // L: 7082 + return false; // L: 7083 + } + + if (ServerPacket.field3035 == var1.serverPacket) { // L: 7085 + var78 = var3.readUnsignedByte() == 1; // L: 7086 + if (var78) { // L: 7087 + WorldMapID.field2388 = class136.method2931() - var3.readLong(); // L: 7088 + class83.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 7089 + } else { + class83.grandExchangeEvents = null; // L: 7091 + } + + field706 = cycleCntr; // L: 7092 + var1.serverPacket = null; // L: 7093 + return true; // L: 7094 + } + + if (ServerPacket.field3033 == var1.serverPacket) { // L: 7096 + StudioGame.loadRegions(false, var1.packetBuffer); // L: 7097 + var1.serverPacket = null; // L: 7098 + return true; // L: 7099 + } + + if (ServerPacket.field3100 == var1.serverPacket) { // L: 7101 + var20 = var3.readUnsignedShort(); // L: 7102 + var5 = var3.readUnsignedByte(); // L: 7103 + var6 = var3.readUnsignedShort(); // L: 7104 + Actor.queueSoundEffect(var20, var5, var6); // L: 7105 + var1.serverPacket = null; // L: 7106 + return true; // L: 7107 + } + + if (ServerPacket.field3088 == var1.serverPacket) { // L: 7109 + var20 = var3.method7713(); // L: 7110 + var5 = var3.readInt(); // L: 7111 + var6 = var20 >> 10 & 31; // L: 7112 + var22 = var20 >> 5 & 31; // L: 7113 + var8 = var20 & 31; // L: 7114 + var61 = (var22 << 11) + (var6 << 19) + (var8 << 3); // L: 7115 + Widget var90 = class127.getWidget(var5); // L: 7116 + if (var61 != var90.color) { // L: 7117 + var90.color = var61; // L: 7118 + class346.invalidateWidget(var90); // L: 7119 + } + + var1.serverPacket = null; // L: 7121 + return true; // L: 7122 + } + + if (ServerPacket.field3076 == var1.serverPacket) { // L: 7124 + var20 = var3.readUnsignedByte(); // L: 7125 + if (var3.readUnsignedByte() == 0) { // L: 7126 + grandExchangeOffers[var20] = new GrandExchangeOffer(); // L: 7127 + var3.offset += 18; // L: 7128 + } else { + --var3.offset; // L: 7131 + grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); // L: 7132 + } + + field705 = cycleCntr; // L: 7134 + var1.serverPacket = null; // L: 7135 + return true; // L: 7136 + } + + if (ServerPacket.field3079 == var1.serverPacket) { // L: 7138 + var20 = var3.readUnsignedShort(); // L: 7139 + class78.method2081(var20); // L: 7140 + changedItemContainers[++field695 - 1 & 31] = var20 & 32767; // L: 7141 + var1.serverPacket = null; // L: 7142 + return true; // L: 7143 + } + + if (ServerPacket.field3106 == var1.serverPacket) { // L: 7145 + var20 = var3.method7827(); // L: 7146 + var56 = var3.readUnsignedByte() == 1; // L: 7147 + var74 = class127.getWidget(var20); // L: 7148 + if (var56 != var74.isHidden) { // L: 7149 + var74.isHidden = var56; // L: 7150 + class346.invalidateWidget(var74); // L: 7151 + } + + var1.serverPacket = null; // L: 7153 + return true; // L: 7154 + } + + if (ServerPacket.field3064 == var1.serverPacket) { // L: 7156 + ClanMate.method6700(class263.field3006); // L: 7157 + var1.serverPacket = null; // L: 7158 + return true; // L: 7159 + } + + if (ServerPacket.field3087 == var1.serverPacket) { // L: 7161 + StudioGame.loadRegions(true, var1.packetBuffer); // L: 7162 + var1.serverPacket = null; // L: 7163 + return true; // L: 7164 + } + + if (ServerPacket.field3053 == var1.serverPacket) { // L: 7166 + byte[] var51 = new byte[var1.serverPacketLength]; // L: 7167 + var3.method7624(var51, 0, var51.length); // L: 7168 + Buffer var70 = new Buffer(var51); // L: 7169 + var23 = var70.readStringCp1252NullTerminated(); // L: 7170 + class391.openURL(var23, true, false); // L: 7171 + var1.serverPacket = null; // L: 7172 + return true; // L: 7173 + } + + if (ServerPacket.field3125 == var1.serverPacket) { // L: 7175 + var5 = var3.readUnsignedShort(); // L: 7180 + var6 = var3.method7705(); // L: 7181 + var20 = var3.readUnsignedShort(); // L: 7182 + Player var58; + if (var20 == localPlayerIndex) { // L: 7183 + var58 = GrandExchangeEvents.localPlayer; // L: 7184 + } else { + var58 = players[var20]; // L: 7187 + } + + if (var58 != null) { // L: 7189 + var58.spotAnimation = var5; // L: 7190 + var58.spotAnimationHeight = var6 >> 16; // L: 7191 + var58.field1134 = (var6 & 65535) + cycle; // L: 7192 + var58.spotAnimationFrame = 0; // L: 7193 + var58.spotAnimationFrameCycle = 0; // L: 7194 + if (var58.field1134 > cycle) { // L: 7195 + var58.spotAnimationFrame = -1; // L: 7196 + } + + if (var58.spotAnimation == 65535) { // L: 7198 + var58.spotAnimation = -1; // L: 7199 + } + } + + var1.serverPacket = null; // L: 7202 + return true; // L: 7203 + } + + int var16; + if (ServerPacket.field3039 == var1.serverPacket) { // L: 7205 + var72 = var3.readByte(); // L: 7206 + var21 = var3.readStringCp1252NullTerminated(); // L: 7207 + long var42 = (long)var3.readUnsignedShort(); // L: 7208 + long var44 = (long)var3.readMedium(); // L: 7209 + PlayerType var34 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var3.readUnsignedByte()); // L: 7210 + long var46 = (var42 << 32) + var44; // L: 7211 + boolean var65 = false; // L: 7212 + ClanChannel var14 = null; // L: 7213 + var14 = var72 >= 0 ? currentClanChannels[var72] : class21.guestClanChannel; // L: 7215 + if (var14 == null) { // L: 7216 + var65 = true; // L: 7217 } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var33.isUser && class155.friendSystem.isIgnored(new Username(var21, class83.loginType))) { // L: 7021 7022 - var13 = true; + if (var34.isUser && Decimator.friendSystem.isIgnored(new Username(var21, class122.loginType))) { // L: 7226 7227 + var65 = true; } break; } - if (crossWorldMessageIds[var15] == var46) { // L: 7016 - var13 = true; // L: 7017 - break; // L: 7018 + if (crossWorldMessageIds[var15] == var46) { // L: 7221 + var65 = true; // L: 7222 + break; // L: 7223 } - ++var15; // L: 7015 + ++var15; // L: 7220 } } - if (!var13) { // L: 7025 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; // L: 7026 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7027 - var40 = AbstractFont.escapeBrackets(class118.method2737(var3)); // L: 7028 - var16 = var70 >= 0 ? 41 : 44; // L: 7029 - if (var33.modIcon != -1) { // L: 7030 - class6.addChatMessage(var16, class351.method6579(var33.modIcon) + var21, var40, var41.name); + if (!var65) { // L: 7230 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; // L: 7231 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7232 + var41 = AbstractFont.escapeBrackets(class193.method3883(var3)); // L: 7233 + var16 = var72 >= 0 ? 41 : 44; // L: 7234 + if (var34.modIcon != -1) { // L: 7235 + class301.addChatMessage(var16, Script.method1990(var34.modIcon) + var21, var41, var14.name); } else { - class6.addChatMessage(var16, var21, var40, var41.name); // L: 7031 + class301.addChatMessage(var16, var21, var41, var14.name); // L: 7236 } } - var1.serverPacket = null; // L: 7033 - return true; // L: 7034 + var1.serverPacket = null; // L: 7238 + return true; // L: 7239 } - if (ServerPacket.field3077 == var1.serverPacket) { // L: 7036 - var20 = var3.readUnsignedByte(); // L: 7037 - if (var3.readUnsignedByte() == 0) { // L: 7038 - grandExchangeOffers[var20] = new GrandExchangeOffer(); // L: 7039 - var3.offset += 18; // L: 7040 - } else { - --var3.offset; // L: 7043 - grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); // L: 7044 + if (ServerPacket.field3056 == var1.serverPacket) { // L: 7241 + ItemLayer.logOut(); // L: 7242 + var1.serverPacket = null; // L: 7243 + return false; // L: 7244 + } + + if (ServerPacket.field3029 == var1.serverPacket) { // L: 7246 + field755 = cycleCntr; // L: 7247 + var72 = var3.readByte(); // L: 7248 + if (var1.serverPacketLength == 1) { // L: 7249 + if (var72 >= 0) { // L: 7250 + currentClanChannels[var72] = null; + } else { + class21.guestClanChannel = null; // L: 7251 + } + + var1.serverPacket = null; // L: 7252 + return true; // L: 7253 } - field689 = cycleCntr; // L: 7046 - var1.serverPacket = null; // L: 7047 - return true; // L: 7048 + if (var72 >= 0) { // L: 7255 + currentClanChannels[var72] = new ClanChannel(var3); // L: 7256 + } else { + class21.guestClanChannel = new ClanChannel(var3); // L: 7259 + } + + var1.serverPacket = null; // L: 7261 + return true; // L: 7262 } - class301.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -805983233 * -998616065 : -1) + "," + (var1.field1329 != null ? var1.field1329.id * -805983233 * -998616065 : -1) + "," + (var1.field1331 != null ? var1.field1331.id * -805983233 * -998616065 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7050 - GameObject.logOut(); // L: 7051 - } catch (IOException var48) { // L: 7053 - class9.method64(); // L: 7054 + if (ServerPacket.field3049 == var1.serverPacket) { // L: 7264 + if (HorizontalAlignment.field1885 == null) { // L: 7265 + HorizontalAlignment.field1885 = new class391(DirectByteArrayCopier.HitSplatDefinition_cached); + } + + class445 var50 = DirectByteArrayCopier.HitSplatDefinition_cached.method7115(var3); // L: 7266 + HorizontalAlignment.field1885.field4373.vmethod7464(var50.field4683, var50.field4681); // L: 7267 + field698[++field699 - 1 & 31] = var50.field4683; // L: 7268 + var1.serverPacket = null; // L: 7269 + return true; // L: 7270 + } + + if (ServerPacket.field3072 == var1.serverPacket) { // L: 7272 + var20 = var3.readUnsignedShort(); // L: 7273 + byte var55 = var3.method7707(); // L: 7274 + Varps.Varps_temp[var20] = var55; // L: 7275 + if (Varps.Varps_main[var20] != var55) { // L: 7276 + Varps.Varps_main[var20] = var55; // L: 7277 + } + + WorldMapLabel.changeGameOptions(var20); // L: 7279 + changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 7280 + var1.serverPacket = null; // L: 7281 + return true; // L: 7282 + } + + if (ServerPacket.field3124 == var1.serverPacket) { // L: 7284 + var5 = var3.method7827(); // L: 7289 + var6 = var3.method7714(); // L: 7290 + var20 = var3.method7713(); // L: 7291 + var57 = npcs[var20]; // L: 7292 + if (var57 != null) { // L: 7293 + var57.spotAnimation = var6; // L: 7294 + var57.spotAnimationHeight = var5 >> 16; // L: 7295 + var57.field1134 = (var5 & 65535) + cycle; // L: 7296 + var57.spotAnimationFrame = 0; // L: 7297 + var57.spotAnimationFrameCycle = 0; // L: 7298 + if (var57.field1134 > cycle) { // L: 7299 + var57.spotAnimationFrame = -1; // L: 7300 + } + + if (var57.spotAnimation == 65535) { // L: 7302 + var57.spotAnimation = -1; // L: 7303 + } + } + + var1.serverPacket = null; // L: 7306 + return true; // L: 7307 + } + + if (ServerPacket.field3084 == var1.serverPacket) { // L: 7309 + var3.offset += 28; // L: 7310 + if (var3.checkCrc()) { // L: 7311 + DefaultsGroup.method6936(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 7312 + return true; // L: 7313 + } + + if (ServerPacket.field3099 == var1.serverPacket) { // L: 7315 + WorldMapSection1.updateNpcs(false, var3); // L: 7316 + var1.serverPacket = null; // L: 7317 + return true; // L: 7318 + } + + if (ServerPacket.field3126 == var1.serverPacket) { // L: 7320 + int var18 = var3.readUnsignedByte(); // L: 7336 + var16 = var3.method7715(); // L: 7337 + var6 = var3.method7793(); // L: 7338 + var20 = var6 >> 16; // L: 7339 + var5 = var6 >> 8 & 255; // L: 7340 + var22 = var20 + (var6 >> 4 & 7); // L: 7341 + var8 = var5 + (var6 & 7); // L: 7342 + byte var9 = var3.readByte(); // L: 7343 + var24 = var3.method7715(); // L: 7344 + var13 = var3.method7875() * 4; // L: 7345 + byte var10 = var3.method7707(); // L: 7346 + var15 = var3.method7713(); // L: 7347 + int var17 = var3.readUnsignedByte(); // L: 7348 + var33 = var3.method7742() * 4; // L: 7349 + var11 = var3.method7716(); // L: 7350 + var61 = var9 + var22; // L: 7351 + var62 = var10 + var8; // L: 7352 + if (var22 >= 0 && var8 >= 0 && var22 < 104 && var8 < 104 && var61 >= 0 && var62 >= 0 && var61 < 104 && var62 < 104 && var24 != 65535) { // L: 7353 + var22 = var22 * 128 + 64; // L: 7354 + var8 = var8 * 128 + 64; // L: 7355 + var61 = var61 * 128 + 64; // L: 7356 + var62 = var62 * 128 + 64; // L: 7357 + Projectile var19 = new Projectile(var24, class18.Client_plane, var22, var8, WorldMapLabel.getTileHeight(var22, var8, class18.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var11, var33); // L: 7358 + var19.setDestination(var61, var62, WorldMapLabel.getTileHeight(var61, var62, class18.Client_plane) - var33, var15 + cycle); // L: 7359 + projectiles.addFirst(var19); // L: 7360 + } + + var1.serverPacket = null; // L: 7362 + return true; // L: 7363 + } + + if (ServerPacket.field3118 == var1.serverPacket) { // L: 7365 + class143.method3072(); // L: 7366 + var20 = var3.method7742(); // L: 7367 + var5 = var3.method7773(); // L: 7368 + var6 = var3.method7837(); // L: 7369 + experience[var5] = var6; // L: 7370 + currentLevels[var5] = var20; // L: 7371 + levels[var5] = 1; // L: 7372 + + for (var22 = 0; var22 < 98; ++var22) { // L: 7373 + if (var6 >= Skills.Skills_experienceTable[var22]) { + levels[var5] = var22 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 7374 + var1.serverPacket = null; // L: 7375 + return true; // L: 7376 + } + + if (ServerPacket.field3059 == var1.serverPacket && isCameraLocked) { // L: 7378 7379 + field754 = true; // L: 7380 + Script.field955 = var3.readUnsignedByte(); // L: 7381 + ArchiveDisk.field4309 = var3.readUnsignedByte(); // L: 7382 + NetFileRequest.field3960 = var3.readUnsignedByte(); // L: 7383 + class386.field4337 = var3.readUnsignedByte(); // L: 7384 + + for (var20 = 0; var20 < 5; ++var20) { // L: 7385 + field546[var20] = false; + } + + var1.serverPacket = null; // L: 7386 + return true; // L: 7387 + } + + if (ServerPacket.field3103 == var1.serverPacket) { // L: 7390 + var20 = var3.readUnsignedByte(); // L: 7391 + var5 = var3.readInt(); // L: 7392 + var6 = var3.method7715(); // L: 7393 + var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 7394 + if (var7 != null) { // L: 7395 + Script.closeInterface(var7, var6 != var7.group); + } + + class4.method16(var5, var6, var20); // L: 7396 + var1.serverPacket = null; // L: 7397 + return true; // L: 7398 + } + + if (ServerPacket.field3115 == var1.serverPacket) { // L: 7400 + destinationX = var3.readUnsignedByte(); // L: 7401 + if (destinationX == 255) { // L: 7402 + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); // L: 7403 + if (destinationY == 255) { // L: 7404 + destinationY = 0; + } + + var1.serverPacket = null; // L: 7405 + return true; // L: 7406 + } + + Widget.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1948146481 * 766304815 : -1) + "," + (var1.field1325 != null ? var1.field1325.id * -1948146481 * 766304815 : -1) + "," + (var1.field1313 != null ? var1.field1313.id * -1948146481 * 766304815 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7408 + ItemLayer.logOut(); // L: 7409 + } catch (IOException var48) { // L: 7411 + ClanChannelMember.method2868(); // L: 7412 } catch (Exception var49) { - var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -805983233 * -998616065 : -1) + "," + (var1.field1329 != null ? var1.field1329.id * -805983233 * -998616065 : -1) + "," + (var1.field1331 != null ? var1.field1331.id * -805983233 * -998616065 : -1) + "," + var1.serverPacketLength + "," + (class19.localPlayer.pathX[0] + ApproximateRouteStrategy.baseX) + "," + (class19.localPlayer.pathY[0] + class250.baseY) + ","; // L: 7057 + var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1948146481 * 766304815 : -1) + "," + (var1.field1325 != null ? var1.field1325.id * -1948146481 * 766304815 : -1) + "," + (var1.field1313 != null ? var1.field1313.id * -1948146481 * 766304815 : -1) + "," + var1.serverPacketLength + "," + (GrandExchangeEvents.localPlayer.pathX[0] + GrandExchangeOfferOwnWorldComparator.baseX) + "," + (GrandExchangeEvents.localPlayer.pathY[0] + VarcInt.baseY) + ","; // L: 7415 - for (var22 = 0; var22 < var1.serverPacketLength && var22 < 50; ++var22) { // L: 7058 - var21 = var21 + var3.array[var22] + ","; + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7416 + var21 = var21 + var3.array[var6] + ","; } - class301.RunException_sendStackTrace(var21, var49); // L: 7059 - GameObject.logOut(); // L: 7060 + Widget.RunException_sendStackTrace(var21, var49); // L: 7417 + ItemLayer.logOut(); // L: 7418 } - return true; // L: 7062 + return true; // L: 7420 } } - @ObfuscatedName("ia") + @ObfuscatedName("ic") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-6" + garbageValue = "117" ) @Export("menu") final void menu() { - class21.incrementMenuEntries(); // L: 8038 - if (FloorDecoration.dragInventoryWidget == null) { // L: 8039 - if (clickedWidget == null) { // L: 8040 + GrandExchangeOfferTotalQuantityComparator.incrementMenuEntries(); // L: 8667 + if (class142.dragInventoryWidget == null) { // L: 8668 + if (clickedWidget == null) { // L: 8669 + int var1 = MouseHandler.MouseHandler_lastButton; // L: 8670 int var2; + int var3; int var4; int var5; - label281: { - int var1 = MouseHandler.MouseHandler_lastButton; // L: 8041 - int var3; - int var8; - int var14; - if (isMenuOpen) { // L: 8042 - int var18; - if (var1 != 1 && (UserComparator5.mouseCam || var1 != 4)) { // L: 8043 - var2 = MouseHandler.MouseHandler_x; // L: 8044 - var3 = MouseHandler.MouseHandler_y; // L: 8045 - if (var2 < class307.menuX - 10 || var2 > class307.menuX + class11.menuWidth + 10 || var3 < ArchiveDiskActionHandler.menuY - 10 || var3 > ArchiveDiskActionHandler.menuY + UrlRequester.menuHeight + 10) { // L: 8046 - isMenuOpen = false; // L: 8047 - var4 = class307.menuX; // L: 8048 - var5 = ArchiveDiskActionHandler.menuY; // L: 8049 - var14 = class11.menuWidth; // L: 8050 - var18 = UrlRequester.menuHeight; // L: 8051 - - for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 8053 - if (rootWidgetXs[var8] + rootWidgetWidths[var8] > var4 && rootWidgetXs[var8] < var14 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var18 + var5) { // L: 8054 - field564[var8] = true; - } - } - } - } - - if (var1 == 1 || !UserComparator5.mouseCam && var1 == 4) { // L: 8059 - var2 = class307.menuX; // L: 8060 - var3 = ArchiveDiskActionHandler.menuY; // L: 8061 - var4 = class11.menuWidth; // L: 8062 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8063 - var14 = MouseHandler.MouseHandler_lastPressedY; // L: 8064 - var18 = -1; // L: 8065 - - int var9; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8066 - var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 8067 - if (var5 > var2 && var5 < var4 + var2 && var14 > var9 - 13 && var14 < var9 + 3) { // L: 8068 - var18 = var8; - } - } - - int var10; - int var11; - if (var18 != -1 && var18 >= 0) { // L: 8070 8071 - var8 = menuArguments1[var18]; // L: 8072 - var9 = menuArguments2[var18]; // L: 8073 - var10 = menuOpcodes[var18]; // L: 8074 - var11 = menuIdentifiers[var18]; // L: 8075 - String var12 = menuActions[var18]; // L: 8076 - String var13 = menuTargets[var18]; // L: 8077 - SoundCache.menuAction(var8, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8078 - } - - isMenuOpen = false; // L: 8080 - var8 = class307.menuX; // L: 8081 - var9 = ArchiveDiskActionHandler.menuY; // L: 8082 - var10 = class11.menuWidth; // L: 8083 - var11 = UrlRequester.menuHeight; // L: 8084 - - for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 8086 - if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var8 && rootWidgetXs[var17] < var8 + var10 && rootWidgetYs[var17] + rootWidgetHeights[var17] > var9 && rootWidgetYs[var17] < var11 + var9) { // L: 8087 - field564[var17] = true; - } - } - } - } else { - var2 = class168.method3324(); // L: 8093 - if ((var1 == 1 || !UserComparator5.mouseCam && var1 == 4) && var2 >= 0) { // L: 8094 - var3 = menuOpcodes[var2]; // L: 8095 - if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 8096 - var4 = menuArguments1[var2]; // L: 8097 - var5 = menuArguments2[var2]; // L: 8098 - Widget var6 = HorizontalAlignment.getWidget(var5); // L: 8099 - var8 = WorldMapSection2.getWidgetFlags(var6); // L: 8101 - boolean var7 = (var8 >> 28 & 1) != 0; // L: 8103 - if (var7) { // L: 8105 - break label281; - } - - Object var10000 = null; - if (class239.method4998(WorldMapSection2.getWidgetFlags(var6))) { - break label281; - } - } - } - - if ((var1 == 1 || !UserComparator5.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8131 8132 - var1 = 2; // L: 8133 - } - - if ((var1 == 1 || !UserComparator5.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 8136 8138 - var3 = menuArguments1[var2]; // L: 8139 - var4 = menuArguments2[var2]; // L: 8140 - var5 = menuOpcodes[var2]; // L: 8141 - var14 = menuIdentifiers[var2]; // L: 8142 - String var15 = menuActions[var2]; // L: 8143 - String var16 = menuTargets[var2]; // L: 8144 - SoundCache.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8145 - } - - if (var1 == 2 && menuOptionsCount > 0) { // L: 8148 - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + int var14; + if (isMenuOpen) { // L: 8671 + if (var1 != 1 && (GameBuild.mouseCam || var1 != 4)) { // L: 8672 + var2 = MouseHandler.MouseHandler_x; // L: 8673 + var3 = MouseHandler.MouseHandler_y; // L: 8674 + if (var2 < class138.menuX - 10 || var2 > class138.menuX + ItemComposition.menuWidth + 10 || var3 < class1.menuY - 10 || var3 > class1.menuY + ByteArrayPool.menuHeight + 10) { // L: 8675 + isMenuOpen = false; // L: 8676 + HealthBar.method2330(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8677 } } - return; // L: 8150 + if (var1 == 1 || !GameBuild.mouseCam && var1 == 4) { // L: 8680 + var2 = class138.menuX; // L: 8681 + var3 = class1.menuY; // L: 8682 + var4 = ItemComposition.menuWidth; // L: 8683 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8684 + var14 = MouseHandler.MouseHandler_lastPressedY; // L: 8685 + int var15 = -1; // L: 8686 + + int var9; + int var16; + for (var16 = 0; var16 < menuOptionsCount; ++var16) { // L: 8687 + var9 = (menuOptionsCount - 1 - var16) * 15 + var3 + 31; // L: 8688 + if (var5 > var2 && var5 < var4 + var2 && var14 > var9 - 13 && var14 < var9 + 3) { // L: 8689 + var15 = var16; + } + } + + if (var15 != -1 && var15 >= 0) { // L: 8691 8692 + var16 = menuArguments1[var15]; // L: 8693 + var9 = menuArguments2[var15]; // L: 8694 + int var10 = menuOpcodes[var15]; // L: 8695 + int var11 = menuIdentifiers[var15]; // L: 8696 + String var12 = menuActions[var15]; // L: 8697 + String var13 = menuTargets[var15]; // L: 8698 + class9.menuAction(var16, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8699 + } + + isMenuOpen = false; // L: 8701 + HealthBar.method2330(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8702 + } + } else { + var2 = GameBuild.method5773(); // L: 8706 + if ((var1 == 1 || !GameBuild.mouseCam && var1 == 4) && var2 >= 0) { // L: 8707 + var3 = menuOpcodes[var2]; // L: 8708 + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 8709 + var4 = menuArguments1[var2]; // L: 8710 + var5 = menuArguments2[var2]; // L: 8711 + Widget var6 = class127.getWidget(var5); // L: 8712 + if (FriendSystem.method1698(class326.getWidgetFlags(var6)) || ReflectionCheck.method1079(class326.getWidgetFlags(var6))) { // L: 8713 + if (class142.dragInventoryWidget != null && !field767 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8714 8715 + UrlRequest.method2551(draggedWidgetX, draggedWidgetY); // L: 8716 + } + + field767 = false; // L: 8719 + itemDragDuration = 0; // L: 8720 + if (class142.dragInventoryWidget != null) { // L: 8721 + class346.invalidateWidget(class142.dragInventoryWidget); + } + + class142.dragInventoryWidget = class127.getWidget(var5); // L: 8722 + dragItemSlotSource = var4; // L: 8723 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8724 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8725 + if (var2 >= 0) { // L: 8726 + Interpreter.tempMenuAction = new MenuAction(); // L: 8727 + Interpreter.tempMenuAction.param0 = menuArguments1[var2]; // L: 8728 + Interpreter.tempMenuAction.param1 = menuArguments2[var2]; // L: 8729 + Interpreter.tempMenuAction.opcode = menuOpcodes[var2]; // L: 8730 + Interpreter.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 8731 + Interpreter.tempMenuAction.action = menuActions[var2]; // L: 8732 + } + + class346.invalidateWidget(class142.dragInventoryWidget); // L: 8734 + return; // L: 8735 + } + } + } + + if ((var1 == 1 || !GameBuild.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8739 8740 + var1 = 2; // L: 8741 + } + + if ((var1 == 1 || !GameBuild.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 8744 8746 + var3 = menuArguments1[var2]; // L: 8747 + var4 = menuArguments2[var2]; // L: 8748 + var5 = menuOpcodes[var2]; // L: 8749 + var14 = menuIdentifiers[var2]; // L: 8750 + String var7 = menuActions[var2]; // L: 8751 + String var8 = menuTargets[var2]; // L: 8752 + class9.menuAction(var3, var4, var5, var14, var7, var8, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8753 + } + + if (var1 == 2 && menuOptionsCount > 0) { // L: 8756 + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - if (FloorDecoration.dragInventoryWidget != null && !field601 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8106 8107 - UserComparator8.method2576(draggedWidgetX, draggedWidgetY); // L: 8108 - } - - field601 = false; // L: 8111 - itemDragDuration = 0; // L: 8112 - if (FloorDecoration.dragInventoryWidget != null) { // L: 8113 - class290.invalidateWidget(FloorDecoration.dragInventoryWidget); - } - - FloorDecoration.dragInventoryWidget = HorizontalAlignment.getWidget(var5); // L: 8114 - dragItemSlotSource = var4; // L: 8115 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8116 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8117 - if (var2 >= 0) { // L: 8118 - PacketWriter.tempMenuAction = new MenuAction(); // L: 8119 - PacketWriter.tempMenuAction.param0 = menuArguments1[var2]; // L: 8120 - PacketWriter.tempMenuAction.param1 = menuArguments2[var2]; // L: 8121 - PacketWriter.tempMenuAction.opcode = menuOpcodes[var2]; // L: 8122 - PacketWriter.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 8123 - PacketWriter.tempMenuAction.action = menuActions[var2]; // L: 8124 - } - - class290.invalidateWidget(FloorDecoration.dragInventoryWidget); // L: 8126 } } - } // L: 8127 + } // L: 8758 - @ObfuscatedName("id") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1137783125" + descriptor = "(B)Z", + garbageValue = "26" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = class168.method3324(); // L: 8153 - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || ArchiveLoader.method2071(var1)) && !menuShiftClick[var1]; // L: 8154 + int var1 = GameBuild.method5773(); // L: 8761 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || SoundCache.method781(var1)) && !menuShiftClick[var1]; // L: 8762 } - @ObfuscatedName("im") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1232643092" + descriptor = "(IIB)V", + garbageValue = "39" ) @Export("openMenu") final void openMenu(int var1, int var2) { - int var3 = FloorOverlayDefinition.fontBold12.stringWidth("Choose Option"); // L: 8159 + int var3 = RouteStrategy.fontBold12.stringWidth("Choose Option"); // L: 8767 int var4; int var5; - for (var4 = 0; var4 < menuOptionsCount; ++var4) { // L: 8160 - var5 = FloorOverlayDefinition.fontBold12.stringWidth(ReflectionCheck.method637(var4)); // L: 8161 - if (var5 > var3) { // L: 8162 + for (var4 = 0; var4 < menuOptionsCount; ++var4) { // L: 8768 + var5 = RouteStrategy.fontBold12.stringWidth(AbstractUserComparator.method6736(var4)); // L: 8769 + if (var5 > var3) { // L: 8770 var3 = var5; } } - var3 += 8; // L: 8164 - var4 = menuOptionsCount * 15 + 22; // L: 8165 - var5 = var1 - var3 / 2; // L: 8166 - if (var3 + var5 > class4.canvasWidth) { // L: 8167 - var5 = class4.canvasWidth - var3; + var3 += 8; // L: 8772 + var4 = menuOptionsCount * 15 + 22; // L: 8773 + var5 = var1 - var3 / 2; // L: 8774 + if (var5 + var3 > InvDefinition.canvasWidth) { // L: 8775 + var5 = InvDefinition.canvasWidth - var3; } - if (var5 < 0) { // L: 8168 + if (var5 < 0) { // L: 8776 var5 = 0; } - int var6 = var2; // L: 8169 - if (var4 + var2 > class309.canvasHeight) { // L: 8170 - var6 = class309.canvasHeight - var4; + int var6 = var2; // L: 8777 + if (var4 + var2 > class321.canvasHeight) { // L: 8778 + var6 = class321.canvasHeight - var4; } - if (var6 < 0) { // L: 8171 + if (var6 < 0) { // L: 8779 var6 = 0; } - class307.menuX = var5; // L: 8172 - ArchiveDiskActionHandler.menuY = var6; // L: 8173 - class11.menuWidth = var3; // L: 8174 - UrlRequester.menuHeight = menuOptionsCount * 15 + 22; // L: 8175 - var1 -= viewportOffsetX; // L: 8177 - var2 -= viewportOffsetY; // L: 8178 - FriendSystem.scene.menuOpen(class160.Client_plane, var1, var2, false); // L: 8179 - isMenuOpen = true; // L: 8180 - } // L: 8181 + class138.menuX = var5; // L: 8780 + class1.menuY = var6; // L: 8781 + ItemComposition.menuWidth = var3; // L: 8782 + ByteArrayPool.menuHeight = menuOptionsCount * 15 + 22; // L: 8783 + var1 -= viewportOffsetX; // L: 8785 + var2 -= viewportOffsetY; // L: 8786 + ArchiveLoader.scene.menuOpen(class18.Client_plane, var1, var2, false); // L: 8787 + isMenuOpen = true; // L: 8788 + } // L: 8789 - @ObfuscatedName("ji") + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "112" + descriptor = "(ZI)V", + garbageValue = "982244774" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - DynamicObject.method1982(rootInterface, class4.canvasWidth, class309.canvasHeight, var1); // L: 10129 - } // L: 10130 + int var2 = rootInterface; // L: 10763 + int var3 = InvDefinition.canvasWidth; // L: 10764 + int var4 = class321.canvasHeight; // L: 10765 + if (class155.loadInterface(var2)) { // L: 10767 + ModelData0.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 10768 + } - @ObfuscatedName("jt") + } // L: 10770 + + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1069729591" + descriptor = "(Lky;I)V", + garbageValue = "-2147483648" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : HorizontalAlignment.getWidget(var1.parentId); // L: 10133 + Widget var2 = var1.parentId == -1 ? null : class127.getWidget(var1.parentId); // L: 10773 int var3; int var4; - if (var2 == null) { // L: 10136 - var3 = class4.canvasWidth; // L: 10137 - var4 = class309.canvasHeight; // L: 10138 + if (var2 == null) { // L: 10776 + var3 = InvDefinition.canvasWidth; // L: 10777 + var4 = class321.canvasHeight; // L: 10778 } else { - var3 = var2.width; // L: 10141 - var4 = var2.height; // L: 10142 + var3 = var2.width; // L: 10781 + var4 = var2.height; // L: 10782 } - class116.alignWidgetSize(var1, var3, var4, false); // L: 10144 - class162.alignWidgetPosition(var1, var3, var4); // L: 10145 - } // L: 10146 + ApproximateRouteStrategy.alignWidgetSize(var1, var3, var4, false); // L: 10784 + HealthBarUpdate.alignWidgetPosition(var1, var3, var4); // L: 10785 + } // L: 10786 - @ObfuscatedName("jc") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "976912886" + descriptor = "(B)V", + garbageValue = "-20" ) - final void method1159() { - class290.invalidateWidget(clickedWidget); // L: 11169 - ++class136.widgetDragDuration; // L: 11170 - if (field671 && field668) { // L: 11171 - int var1 = MouseHandler.MouseHandler_x; // L: 11177 - int var2 = MouseHandler.MouseHandler_y; // L: 11178 - var1 -= widgetClickX; // L: 11179 - var2 -= widgetClickY; // L: 11180 - if (var1 < field669) { // L: 11181 - var1 = field669; + final void method1164() { + class346.invalidateWidget(clickedWidget); // L: 11773 + ++class124.widgetDragDuration; // L: 11774 + if (field687 && field696) { // L: 11775 + int var1 = MouseHandler.MouseHandler_x; // L: 11784 + int var2 = MouseHandler.MouseHandler_y; // L: 11785 + var1 -= widgetClickX; // L: 11786 + var2 -= widgetClickY; // L: 11787 + if (var1 < field773) { // L: 11788 + var1 = field773; } - if (var1 + clickedWidget.width > field669 + clickedWidgetParent.width) { // L: 11182 - var1 = field669 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field773 + clickedWidgetParent.width) { // L: 11789 + var1 = field773 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field628) { // L: 11183 - var2 = field628; + if (var2 < field686) { // L: 11790 + var2 = field686; } - if (var2 + clickedWidget.height > field628 + clickedWidgetParent.height) { // L: 11184 - var2 = field628 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field686 + clickedWidgetParent.height) { // L: 11791 + var2 = field686 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field596; // L: 11185 - int var4 = var2 - field673; // L: 11186 - int var5 = clickedWidget.dragZoneSize; // L: 11187 - if (class136.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11188 11189 - isDraggingWidget = true; // L: 11190 + int var3 = var1 - field688; // L: 11792 + int var4 = var2 - field757; // L: 11793 + int var5 = clickedWidget.dragZoneSize; // L: 11794 + if (class124.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11795 11796 + isDraggingWidget = true; // L: 11797 } - int var6 = var1 - field669 + clickedWidgetParent.scrollX; // L: 11193 - int var7 = var2 - field628 + clickedWidgetParent.scrollY; // L: 11194 + int var6 = var1 - field773 + clickedWidgetParent.scrollX; // L: 11800 + int var7 = var2 - field686 + clickedWidgetParent.scrollY; // L: 11801 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11195 - var8 = new ScriptEvent(); // L: 11196 - var8.widget = clickedWidget; // L: 11197 - var8.mouseX = var6; // L: 11198 - var8.mouseY = var7; // L: 11199 - var8.args = clickedWidget.onDrag; // L: 11200 - class1.runScriptEvent(var8); // L: 11201 + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11802 + var8 = new ScriptEvent(); // L: 11803 + var8.widget = clickedWidget; // L: 11804 + var8.mouseX = var6; // L: 11805 + var8.mouseY = var7; // L: 11806 + var8.args = clickedWidget.onDrag; // L: 11807 + ClanSettings.runScriptEvent(var8); // L: 11808 } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11203 - if (isDraggingWidget) { // L: 11204 - if (clickedWidget.onDragComplete != null) { // L: 11205 - var8 = new ScriptEvent(); // L: 11206 - var8.widget = clickedWidget; // L: 11207 - var8.mouseX = var6; // L: 11208 - var8.mouseY = var7; // L: 11209 - var8.dragTarget = draggedOnWidget; // L: 11210 - var8.args = clickedWidget.onDragComplete; // L: 11211 - class1.runScriptEvent(var8); // L: 11212 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11810 + if (isDraggingWidget) { // L: 11811 + if (clickedWidget.onDragComplete != null) { // L: 11812 + var8 = new ScriptEvent(); // L: 11813 + var8.widget = clickedWidget; // L: 11814 + var8.mouseX = var6; // L: 11815 + var8.mouseY = var7; // L: 11816 + var8.dragTarget = draggedOnWidget; // L: 11817 + var8.args = clickedWidget.onDragComplete; // L: 11818 + ClanSettings.runScriptEvent(var8); // L: 11819 } - if (draggedOnWidget != null && UserComparator3.method2601(clickedWidget) != null) { // L: 11214 - PacketBufferNode var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2919, packetWriter.isaacCipher); // L: 11216 - var9.packetBuffer.method7746(clickedWidget.id); // L: 11217 - var9.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11218 - var9.packetBuffer.method7796(clickedWidget.itemId); // L: 11219 - var9.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11220 - var9.packetBuffer.method7791(draggedOnWidget.itemId); // L: 11221 - var9.packetBuffer.method7746(draggedOnWidget.id); // L: 11222 - packetWriter.addNode(var9); // L: 11223 + if (draggedOnWidget != null) { // L: 11821 + Widget var9 = clickedWidget; // L: 11823 + int var10 = Players.method2420(class326.getWidgetFlags(var9)); // L: 11825 + Widget var13; + if (var10 == 0) { // L: 11826 + var13 = null; // L: 11827 + } else { + int var11 = 0; + + while (true) { + if (var11 >= var10) { + var13 = var9; // L: 11837 + break; + } + + var9 = class127.getWidget(var9.parentId); // L: 11831 + if (var9 == null) { // L: 11832 + var13 = null; // L: 11833 + break; // L: 11834 + } + + ++var11; // L: 11830 + } + } + + if (var13 != null) { // L: 11839 + PacketBufferNode var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2919, packetWriter.isaacCipher); // L: 11841 + var12.packetBuffer.method7723(clickedWidget.id); // L: 11842 + var12.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11843 + var12.packetBuffer.method7711(clickedWidget.itemId); // L: 11844 + var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11845 + var12.packetBuffer.method7712(draggedOnWidget.itemId); // L: 11846 + var12.packetBuffer.method7723(draggedOnWidget.id); // L: 11847 + packetWriter.addNode(var12); // L: 11848 + } } - } else if (this.shouldLeftClickOpenMenu()) { // L: 11227 - this.openMenu(widgetClickX + field596, widgetClickY + field673); // L: 11228 - } else if (menuOptionsCount > 0) { // L: 11230 - UserComparator8.method2576(field596 + widgetClickX, widgetClickY + field673); // L: 11231 + } else if (this.shouldLeftClickOpenMenu()) { // L: 11853 + this.openMenu(widgetClickX + field688, widgetClickY + field757); // L: 11854 + } else if (menuOptionsCount > 0) { // L: 11856 + UrlRequest.method2551(widgetClickX + field688, widgetClickY + field757); // L: 11857 } - clickedWidget = null; // L: 11234 + clickedWidget = null; // L: 11860 } } else { - if (class136.widgetDragDuration > 1) { // L: 11172 - clickedWidget = null; // L: 11173 + if (class124.widgetDragDuration > 1) { // L: 11776 + if (!isDraggingWidget && menuOptionsCount > 0) { // L: 11777 + UrlRequest.method2551(widgetClickX + field688, field757 + widgetClickY); // L: 11778 + } + + clickedWidget = null; // L: 11780 } } - } // L: 11175 11236 + } // L: 11782 11862 - @ObfuscatedName("lr") + @ObfuscatedName("la") @ObfuscatedSignature( - descriptor = "(B)Lqy;", - garbageValue = "4" + descriptor = "(I)Lqb;", + garbageValue = "529633925" ) @Export("username") public Username username() { - return class19.localPlayer != null ? class19.localPlayer.username : null; // L: 11888 - } - - @ObfuscatedSignature( - descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" - ) - public void setOtlTokenRequester(OtlTokenRequester var1) { - if (var1 != null) { // L: 884 - this.field544 = var1; // L: 887 - class150.method3089(10); // L: 888 - } - } // L: 885 889 - - public boolean isOnLoginScreen() { - return gameState == 10; // L: 894 - } - - public long getAccountHash() { - return this.field658; // L: 899 + return GrandExchangeEvents.localPlayer != null ? GrandExchangeEvents.localPlayer.username : null; // L: 12585 } public final void init() { try { if (this.checkHost()) { // L: 674 - int var4; for (int var1 = 0; var1 <= 27; ++var1) { // L: 675 String var2 = this.getParameter(Integer.toString(var1)); // L: 676 if (var2 != null) { // L: 677 switch(var1) { // L: 678 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 744 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 691 case 2: case 13: case 16: @@ -5956,288 +6047,126 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 763 + if (var2.equalsIgnoreCase("true")) { // L: 721 isMembersWorld = true; } else { - isMembersWorld = false; // L: 764 + isMembersWorld = false; // L: 722 } break; case 4: - if (clientType == -1) { // L: 691 - clientType = Integer.parseInt(var2); // L: 692 + if (clientType == -1) { // L: 727 + clientType = Integer.parseInt(var2); // L: 728 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 681 - break; // L: 682 + worldProperties = Integer.parseInt(var2); // L: 757 + break; // L: 758 case 6: - var4 = Integer.parseInt(var2); // L: 750 - Language var20; - if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 752 - var20 = Language.Language_valuesOrdered[var4]; // L: 756 - } else { - var20 = null; // L: 753 - } - - FriendSystem.clientLanguage = var20; // L: 758 - break; // L: 759 + Skills.clientLanguage = Language.method6077(Integer.parseInt(var2)); // L: 686 + break; // L: 687 case 7: - var4 = Integer.parseInt(var2); // L: 704 - GameBuild[] var5 = new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.WIP, GameBuild.LIVE}; // L: 709 - GameBuild[] var6 = var5; // L: 711 - int var7 = 0; - - GameBuild var3; - while (true) { - if (var7 >= var6.length) { - var3 = null; // L: 722 - break; - } - - GameBuild var8 = var6[var7]; // L: 713 - if (var4 == var8.buildId) { // L: 715 - var3 = var8; // L: 716 - break; // L: 717 - } - - ++var7; // L: 712 - } - - field509 = var3; // L: 724 - break; // L: 725 + class301.field3545 = KeyHandler.method332(Integer.parseInt(var2)); // L: 711 + break; // L: 712 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 791 + if (var2.equalsIgnoreCase("true")) { // L: 734 } break; case 9: - class429.field4593 = var2; // L: 686 - break; // L: 687 + class65.field868 = var2; // L: 706 + break; // L: 707 case 10: - Login.field917 = (StudioGame)ChatChannel.findEnumerated(ArchiveLoader.method2076(), Integer.parseInt(var2)); // L: 774 - if (StudioGame.oldscape == Login.field917) { // L: 775 - class83.loginType = LoginType.oldscape; + Messages.field1305 = (StudioGame)MusicPatchPcmStream.findEnumerated(Message.method1116(), Integer.parseInt(var2)); // L: 740 + if (StudioGame.oldscape == Messages.field1305) { // L: 741 + class122.loginType = LoginType.oldscape; } else { - class83.loginType = LoginType.field4559; // L: 776 + class122.loginType = LoginType.field4555; // L: 742 } break; case 11: - class124.field1518 = var2; // L: 734 - break; // L: 735 + class113.field1372 = var2; // L: 716 + break; // L: 717 case 12: - worldId = Integer.parseInt(var2); // L: 786 - break; // L: 787 + worldId = Integer.parseInt(var2); // L: 681 + break; // L: 682 case 14: - class7.field27 = Integer.parseInt(var2); // L: 698 - break; // L: 699 + GrandExchangeOfferOwnWorldComparator.field483 = Integer.parseInt(var2); // L: 752 + break; // L: 753 case 15: - gameBuild = Integer.parseInt(var2); // L: 729 - break; // L: 730 + gameBuild = Integer.parseInt(var2); // L: 701 + break; // L: 702 case 17: - class152.field1686 = var2; // L: 739 - break; // L: 740 + WorldMapElement.field1836 = var2; // L: 762 + break; case 21: - field484 = Integer.parseInt(var2); // L: 781 - break; // L: 782 + field617 = Integer.parseInt(var2); // L: 747 + break; // L: 748 case 22: - field753 = Integer.parseInt(var2) != 0; // L: 769 + field553 = Integer.parseInt(var2) != 0; // L: 696 } } } - class299.method5767(); // L: 798 - GrandExchangeOfferOwnWorldComparator.worldHost = this.getCodeBase().getHost(); // L: 799 - String var9 = field509.name; // L: 800 - byte var10 = 0; // L: 801 + Scene.Scene_isLowDetail = false; // L: 769 + isLowDetail = false; // L: 770 + class17.worldHost = this.getCodeBase().getHost(); // L: 772 + String var4 = class301.field3545.name; // L: 773 + byte var5 = 0; // L: 774 try { - JagexCache.idxCount = 21; // L: 804 - SecureRandomFuture.cacheGamebuild = var10; // L: 805 - - try { - ReflectionCheck.operatingSystemName = System.getProperty("os.name"); // L: 807 - } catch (Exception var17) { // L: 809 - ReflectionCheck.operatingSystemName = "Unknown"; // L: 810 - } - - Buffer.formattedOperatingSystemName = ReflectionCheck.operatingSystemName.toLowerCase(); // L: 812 - - try { - class230.userHomeDirectory = System.getProperty("user.home"); // L: 814 - if (class230.userHomeDirectory != null) { // L: 815 - class230.userHomeDirectory = class230.userHomeDirectory + "/"; - } - } catch (Exception var16) { // L: 817 - } - - try { - if (Buffer.formattedOperatingSystemName.startsWith("win")) { // L: 819 - if (class230.userHomeDirectory == null) { // L: 820 - class230.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (class230.userHomeDirectory == null) { // L: 823 - class230.userHomeDirectory = System.getenv("HOME"); - } - - if (class230.userHomeDirectory != null) { // L: 825 - class230.userHomeDirectory = class230.userHomeDirectory + "/"; - } - } catch (Exception var15) { // L: 827 - } - - if (class230.userHomeDirectory == null) { // L: 828 - class230.userHomeDirectory = "~/"; - } - - PendingSpawn.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class230.userHomeDirectory, "/tmp/", ""}; // L: 829 - WorldMapSection1.cacheSubPaths = new String[]{".jagex_cache_" + SecureRandomFuture.cacheGamebuild, ".file_store_" + SecureRandomFuture.cacheGamebuild}; // L: 830 - - label148: - for (int var11 = 0; var11 < 4; ++var11) { // L: 831 - VertexNormal.cacheDir = class29.method431("oldschool", var9, var11); // L: 832 - if (!VertexNormal.cacheDir.exists()) { // L: 833 - VertexNormal.cacheDir.mkdirs(); - } - - File[] var12 = VertexNormal.cacheDir.listFiles(); // L: 834 - if (var12 == null) { // L: 835 - break; - } - - File[] var22 = var12; // L: 837 - int var13 = 0; - - while (true) { - if (var13 >= var22.length) { - break label148; - } - - File var14 = var22[var13]; // L: 839 - if (!SecureRandomCallable.method2069(var14, false)) { // L: 841 - break; - } - - ++var13; // L: 838 - } - } - - File var21 = VertexNormal.cacheDir; // L: 848 - class17.FileSystem_cacheDir = var21; // L: 850 - if (!class17.FileSystem_cacheDir.exists()) { // L: 851 - throw new RuntimeException(""); - } - - FileSystem.FileSystem_hasPermissions = true; // L: 852 - ClanChannel.method3068(); // L: 854 - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Varcs.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 855 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Varcs.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 856 - class194.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 857 - - for (var4 = 0; var4 < JagexCache.idxCount; ++var4) { // L: 858 - class194.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(Varcs.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); // L: 859 - } - } catch (Exception var18) { // L: 863 - class301.RunException_sendStackTrace((String)null, var18); // L: 864 + FloorOverlayDefinition.method3788("oldschool", var4, var5, 21); // L: 776 + } catch (Exception var6) { // L: 778 + Widget.RunException_sendStackTrace((String)null, var6); // L: 779 } - UserComparator10.client = this; // L: 866 - RunException.clientType = clientType; // L: 867 - if (field486 == -1) { // L: 868 - field486 = 0; // L: 869 + class127.client = this; // L: 781 + WorldMapRegion.clientType = clientType; // L: 782 + if (field498 == -1) { // L: 783 + field498 = 0; // L: 784 } - AbstractWorldMapData.field2796 = System.getenv("JX_ACCESS_TOKEN"); // L: 871 - System.getenv("JX_REFRESH_TOKEN"); // L: 872 - this.startThread(765, 503, 204); // L: 873 + class360.field4209 = System.getenv("JX_ACCESS_TOKEN"); // L: 786 + System.getenv("JX_REFRESH_TOKEN"); // L: 787 + this.startThread(765, 503, 204); // L: 788 } - } catch (RuntimeException var19) { - throw KitDefinition.newRunException(var19, "client.init(" + ')'); + } catch (RuntimeException var7) { + throw MilliClock.newRunException(var7, "client.init(" + ')'); } - } // L: 874 + } // L: 789 - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "10" - ) - static final boolean method1198() { - return ViewportMouse.ViewportMouse_isInViewport; // L: 91 + public boolean isOnLoginScreen() { + return gameState == 10; // L: 802 } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1767968807" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3422 == null) { // L: 1020 - throw new RuntimeException(); // L: 1021 - } else { - if (var0.field3406 == null) { // L: 1023 - var0.field3406 = new int[var0.field3422.length]; // L: 1024 - } + public long getAccountHash() { + return this.field542; // L: 807 + } - var0.field3406[var1] = Integer.MAX_VALUE; // L: 1026 - } - } // L: 1027 - - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "16" + descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" ) - static int method1606(int var0, Script var1, boolean var2) { - Widget var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1341 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1342 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1343 - return 1; // L: 1344 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1346 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1347 - return 1; // L: 1348 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1350 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.text; // L: 1351 - return 1; // L: 1352 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1354 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1355 - return 1; // L: 1356 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1358 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1359 - return 1; // L: 1360 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1362 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1363 - return 1; // L: 1364 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1366 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1367 - return 1; // L: 1368 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1370 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1371 - return 1; // L: 1372 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1374 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1375 - return 1; // L: 1376 - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1378 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1379 - return 1; // L: 1380 - } else if (var0 == 2610) { // L: 1382 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1383 - return 1; // L: 1384 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1386 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color; // L: 1387 - return 1; // L: 1388 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1390 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color2; // L: 1391 - return 1; // L: 1392 - } else if (var0 == 2613) { // L: 1394 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1395 - return 1; // L: 1396 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1398 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1399 - return 1; // L: 1400 - } else if (var0 != 2615 && var0 != 2616) { // L: 1402 - return 2; // L: 1406 - } else { - ++class295.Interpreter_intStackSize; // L: 1403 - return 1; // L: 1404 + public void setOtlTokenRequester(OtlTokenRequester var1) { + if (var1 != null) { // L: 793 + this.field536 = var1; // L: 796 + Ignored.method6828(10); // L: 797 } + } // L: 794 798 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)[Lkr;", + garbageValue = "1" + ) + public static class309[] method1633() { + return new class309[]{class309.field3913, class309.field3911, class309.field3914, class309.field3915}; // L: 15 + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "37" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return isResizable ? 2 : 1; // L: 4259 } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 108b56d7f3..0c7d46b405 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,669 +4,699 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jl") @Implements("ClientPacket") public class ClientPacket implements class261 { + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "Lns;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2974; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2894; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2940; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2993; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - static final ClientPacket field2959; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2938; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2899; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2900; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2901; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2902; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2903; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2990; + public static final ClientPacket field2922; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2905; - @ObfuscatedName("j") + public static final ClientPacket field2977; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2995; - @ObfuscatedName("p") + public static final ClientPacket field2929; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2907; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2908; + public static final ClientPacket field2896; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2931; - @ObfuscatedName("w") + static final ClientPacket field2934; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2963; - @ObfuscatedName("a") + public static final ClientPacket field2893; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2911; - @ObfuscatedName("m") + public static final ClientPacket field2899; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2923; + public static final ClientPacket field2955; @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" + ) + public static final ClientPacket field2901; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2902; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2931; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2907; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2905; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2906; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2916; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2908; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2958; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2910; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2911; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2912; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Ljl;" ) public static final ClientPacket field2913; @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2978; - @ObfuscatedName("z") + public static final ClientPacket field2914; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) public static final ClientPacket field2915; @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2916; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2929; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2918; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2919; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2912; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2921; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2909; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2898; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2942; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2925; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2986; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2927; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2928; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) public static final ClientPacket field2924; - @ObfuscatedName("aj") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2985; - @ObfuscatedName("as") + public static final ClientPacket field2917; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2926; - @ObfuscatedName("ao") + public static final ClientPacket field2997; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2932; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2971; + public static final ClientPacket field2919; @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2976; - @ObfuscatedName("an") + public static final ClientPacket field2974; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2935; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2998; + public static final ClientPacket field2909; @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2937; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2895; + public static final ClientPacket field2920; @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" + ) + public static final ClientPacket field2923; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ljl;" ) public static final ClientPacket field2904; - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2893; - @ObfuscatedName("ag") + public static final ClientPacket field2925; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2941; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) public static final ClientPacket field3000; - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2970; - @ObfuscatedName("ai") + public static final ClientPacket field2927; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2944; - @ObfuscatedName("bk") + public static final ClientPacket field2918; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2945; - @ObfuscatedName("bz") + public static final ClientPacket field2898; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - static final ClientPacket field2946; - @ObfuscatedName("bl") + public static final ClientPacket field2930; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2947; - @ObfuscatedName("be") + public static final ClientPacket field2928; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2948; - @ObfuscatedName("bt") + public static final ClientPacket field2894; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2949; - @ObfuscatedName("ba") + public static final ClientPacket field2933; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2950; - @ObfuscatedName("bg") + public static final ClientPacket field2993; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2951; - @ObfuscatedName("bq") + public static final ClientPacket field2935; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2952; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2953; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - static final ClientPacket field2966; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2955; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2910; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2957; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2943; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2984; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2960; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2961; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2962; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2914; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2964; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2965; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) public static final ClientPacket field2980; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2897; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2938; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2939; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2940; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2941; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2942; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2943; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2944; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2945; @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2967; - @ObfuscatedName("bn") + static final ClientPacket field2946; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - static final ClientPacket field2968; - @ObfuscatedName("bw") + public static final ClientPacket field2995; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2969; + public static final ClientPacket field2954; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2949; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2950; @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" + ) + public static final ClientPacket field2951; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2900; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2953; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + static final ClientPacket field2947; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2976; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2992; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2957; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2952; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2959; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2960; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2961; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2962; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2963; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2964; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2965; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2966; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2967; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + static final ClientPacket field2968; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2969; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2970; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2971; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2972; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2973; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2926; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2990; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2999; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2895; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2978; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2979; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2937; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2981; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2982; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2983; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2984; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2956; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2986; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2987; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2988; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2989; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + static final ClientPacket field2903; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2991; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2948; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Ljl;" ) public static final ClientPacket field2936; @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2954; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2972; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2973; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2956; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2975; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2917; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2977; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2897; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2979; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2939; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2981; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2982; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2983; - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2896; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2933; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2930; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2987; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2988; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2989; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - static final ClientPacket field2906; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2991; - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2992; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2958; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) public static final ClientPacket field2994; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2922; - @ObfuscatedName("ce") + public static final ClientPacket field2921; + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) public static final ClientPacket field2996; + @ObfuscatedName("dr") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2985; + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "Ljl;" + ) + public static final ClientPacket field2998; @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) - public static final ClientPacket field2997; - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Ljn;" + public static final ClientPacket field2975; + @ObfuscatedName("jw") + @ObfuscatedGetter( + intValue = -2097783973 ) - public static final ClientPacket field3002; - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static final ClientPacket field2999; + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = 1609985935 + intValue = -31948183 ) @Export("id") final int id; - @ObfuscatedName("dj") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = -997084167 + intValue = 824174823 ) @Export("length") final int length; static { - field2974 = new ClientPacket(0, 8); // L: 5 - field2894 = new ClientPacket(1, 15); // L: 6 - field2940 = new ClientPacket(2, 9); // L: 7 - field2993 = new ClientPacket(3, 8); // L: 8 - field2959 = new ClientPacket(4, 7); // L: 9 - field2938 = new ClientPacket(5, 4); // L: 10 + field2922 = new ClientPacket(0, 8); // L: 5 + field2977 = new ClientPacket(1, 15); // L: 6 + field2929 = new ClientPacket(2, 9); // L: 7 + field2896 = new ClientPacket(3, 8); // L: 8 + field2934 = new ClientPacket(4, 7); // L: 9 + field2893 = new ClientPacket(5, 4); // L: 10 field2899 = new ClientPacket(6, -2); // L: 11 - field2900 = new ClientPacket(7, 15); // L: 12 + field2955 = new ClientPacket(7, 15); // L: 12 field2901 = new ClientPacket(8, 7); // L: 13 field2902 = new ClientPacket(9, 3); // L: 14 - field2903 = new ClientPacket(10, 3); // L: 15 - field2990 = new ClientPacket(11, -2); // L: 16 + field2931 = new ClientPacket(10, 3); // L: 15 + field2907 = new ClientPacket(11, -2); // L: 16 field2905 = new ClientPacket(12, 0); // L: 17 - field2995 = new ClientPacket(13, 8); // L: 18 - field2907 = new ClientPacket(14, 3); // L: 19 + field2906 = new ClientPacket(13, 8); // L: 18 + field2916 = new ClientPacket(14, 3); // L: 19 field2908 = new ClientPacket(15, 8); // L: 20 - field2931 = new ClientPacket(16, 8); // L: 21 - field2963 = new ClientPacket(17, -1); // L: 22 + field2958 = new ClientPacket(16, 8); // L: 21 + field2910 = new ClientPacket(17, -1); // L: 22 field2911 = new ClientPacket(18, -1); // L: 23 - field2923 = new ClientPacket(19, -1); // L: 24 + field2912 = new ClientPacket(19, -1); // L: 24 field2913 = new ClientPacket(20, 3); // L: 25 - field2978 = new ClientPacket(21, 7); // L: 26 + field2914 = new ClientPacket(21, 7); // L: 26 field2915 = new ClientPacket(22, 7); // L: 27 - field2916 = new ClientPacket(23, 3); // L: 28 - field2929 = new ClientPacket(24, 8); // L: 29 - field2918 = new ClientPacket(25, 8); // L: 30 + field2924 = new ClientPacket(23, 3); // L: 28 + field2917 = new ClientPacket(24, 8); // L: 29 + field2997 = new ClientPacket(25, 8); // L: 30 field2919 = new ClientPacket(26, 16); // L: 31 - field2912 = new ClientPacket(27, 3); // L: 32 - field2921 = new ClientPacket(28, -1); // L: 33 - field2909 = new ClientPacket(29, 7); // L: 34 - field2898 = new ClientPacket(30, 3); // L: 35 - field2942 = new ClientPacket(31, 15); // L: 36 + field2974 = new ClientPacket(27, 3); // L: 32 + field2909 = new ClientPacket(28, -1); // L: 33 + field2920 = new ClientPacket(29, 7); // L: 34 + field2923 = new ClientPacket(30, 3); // L: 35 + field2904 = new ClientPacket(31, 15); // L: 36 field2925 = new ClientPacket(32, 3); // L: 37 - field2986 = new ClientPacket(33, 5); // L: 38 + field3000 = new ClientPacket(33, 5); // L: 38 field2927 = new ClientPacket(34, 7); // L: 39 - field2928 = new ClientPacket(35, -1); // L: 40 - field2924 = new ClientPacket(36, -1); // L: 41 - field2985 = new ClientPacket(37, 11); // L: 42 - field2926 = new ClientPacket(38, -1); // L: 43 - field2932 = new ClientPacket(39, 16); // L: 44 - field2971 = new ClientPacket(40, 7); // L: 45 - field2976 = new ClientPacket(41, 7); // L: 46 + field2918 = new ClientPacket(35, -1); // L: 40 + field2898 = new ClientPacket(36, -1); // L: 41 + field2930 = new ClientPacket(37, 11); // L: 42 + field2928 = new ClientPacket(38, -1); // L: 43 + field2894 = new ClientPacket(39, 16); // L: 44 + field2933 = new ClientPacket(40, 7); // L: 45 + field2993 = new ClientPacket(41, 7); // L: 46 field2935 = new ClientPacket(42, -1); // L: 47 - field2998 = new ClientPacket(43, -1); // L: 48 - field2937 = new ClientPacket(44, 4); // L: 49 - field2895 = new ClientPacket(45, 8); // L: 50 - field2904 = new ClientPacket(46, 3); // L: 51 - field2893 = new ClientPacket(47, 3); // L: 52 + field2980 = new ClientPacket(43, -1); // L: 48 + field2897 = new ClientPacket(44, 4); // L: 49 + field2938 = new ClientPacket(45, 8); // L: 50 + field2939 = new ClientPacket(46, 3); // L: 51 + field2940 = new ClientPacket(47, 3); // L: 52 field2941 = new ClientPacket(48, 8); // L: 53 - field3000 = new ClientPacket(49, 7); // L: 54 - field2970 = new ClientPacket(50, 8); // L: 55 + field2942 = new ClientPacket(49, 7); // L: 54 + field2943 = new ClientPacket(50, 8); // L: 55 field2944 = new ClientPacket(51, 8); // L: 56 field2945 = new ClientPacket(52, 8); // L: 57 field2946 = new ClientPacket(53, -1); // L: 58 - field2947 = new ClientPacket(54, 11); // L: 59 - field2948 = new ClientPacket(55, 8); // L: 60 + field2995 = new ClientPacket(54, 11); // L: 59 + field2954 = new ClientPacket(55, 8); // L: 60 field2949 = new ClientPacket(56, 2); // L: 61 field2950 = new ClientPacket(57, 0); // L: 62 - field2951 = new ClientPacket(58, 7); // L: 63 - field2952 = new ClientPacket(59, -1); // L: 64 + field2951 = new ClientPacket(58, 7); + field2900 = new ClientPacket(59, -1); field2953 = new ClientPacket(60, -1); // L: 65 - field2966 = new ClientPacket(61, -1); // L: 66 - field2955 = new ClientPacket(62, 6); // L: 67 - field2910 = new ClientPacket(63, -1); // L: 68 + field2947 = new ClientPacket(61, -1); // L: 66 + field2976 = new ClientPacket(62, 6); // L: 67 + field2992 = new ClientPacket(63, -1); // L: 68 field2957 = new ClientPacket(64, 3); // L: 69 - field2943 = new ClientPacket(65, 6); // L: 70 - field2984 = new ClientPacket(66, 14); // L: 71 + field2952 = new ClientPacket(65, 6); // L: 70 + field2959 = new ClientPacket(66, 14); // L: 71 field2960 = new ClientPacket(67, 8); // L: 72 field2961 = new ClientPacket(68, -1); // L: 73 field2962 = new ClientPacket(69, 2); // L: 74 - field2914 = new ClientPacket(70, -1); // L: 75 + field2963 = new ClientPacket(70, -1); // L: 75 field2964 = new ClientPacket(71, 3); // L: 76 field2965 = new ClientPacket(72, -1); // L: 77 - field2980 = new ClientPacket(73, 8); // L: 78 + field2966 = new ClientPacket(73, 8); // L: 78 field2967 = new ClientPacket(74, -1); // L: 79 field2968 = new ClientPacket(75, -1); // L: 80 field2969 = new ClientPacket(76, 8); // L: 81 - field2936 = new ClientPacket(77, -1); // L: 82 - field2954 = new ClientPacket(78, 16); // L: 83 + field2970 = new ClientPacket(77, -1); // L: 82 + field2971 = new ClientPacket(78, 16); // L: 83 field2972 = new ClientPacket(79, 3); // L: 84 field2973 = new ClientPacket(80, 0); // L: 85 - field2956 = new ClientPacket(81, -2); // L: 86 - field2975 = new ClientPacket(82, 4); // L: 87 - field2917 = new ClientPacket(83, 11); // L: 88 - field2977 = new ClientPacket(84, 7); // L: 89 - field2897 = new ClientPacket(85, 1); // L: 90 + field2926 = new ClientPacket(81, -2); // L: 86 + field2990 = new ClientPacket(82, 4); // L: 87 + field2999 = new ClientPacket(83, 11); // L: 88 + field2895 = new ClientPacket(84, 7); // L: 89 + field2978 = new ClientPacket(85, 1); // L: 90 field2979 = new ClientPacket(86, 0); // L: 91 - field2939 = new ClientPacket(87, 4); // L: 92 + field2937 = new ClientPacket(87, 4); // L: 92 field2981 = new ClientPacket(88, 3); // L: 93 field2982 = new ClientPacket(89, 8); // L: 94 field2983 = new ClientPacket(90, 10); // L: 95 - field2896 = new ClientPacket(91, 13); // L: 96 - field2933 = new ClientPacket(92, 11); // L: 97 - field2930 = new ClientPacket(93, -1); // L: 98 + field2984 = new ClientPacket(91, 13); // L: 96 + field2956 = new ClientPacket(92, 11); // L: 97 + field2986 = new ClientPacket(93, -1); // L: 98 field2987 = new ClientPacket(94, -1); // L: 99 field2988 = new ClientPacket(95, 2); // L: 100 field2989 = new ClientPacket(96, 0); // L: 101 - field2906 = new ClientPacket(97, 2); // L: 102 + field2903 = new ClientPacket(97, 2); // L: 102 field2991 = new ClientPacket(98, -1); // L: 103 - field2992 = new ClientPacket(99, 4); // L: 104 - field2958 = new ClientPacket(100, 2); // L: 105 + field2948 = new ClientPacket(99, 4); // L: 104 + field2936 = new ClientPacket(100, 2); // L: 105 field2994 = new ClientPacket(101, 15); // L: 106 - field2922 = new ClientPacket(102, 8); // L: 107 + field2921 = new ClientPacket(102, 8); // L: 107 field2996 = new ClientPacket(103, 9); // L: 108 - field2997 = new ClientPacket(104, 8); // L: 109 - field3002 = new ClientPacket(105, 8); // L: 110 - field2999 = new ClientPacket(106, 22); // L: 111 + field2985 = new ClientPacket(104, 8); // L: 109 + field2998 = new ClientPacket(105, 8); // L: 110 + field2975 = new ClientPacket(106, 22); // L: 111 } ClientPacket(int var1, int var2) { this.id = var1; // L: 116 this.length = var2; // L: 117 } // L: 118 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1708925611" + ) + public static void method5176(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; // L: 63 + } // L: 64 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "296193861" + ) + static int method5175(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field845 - 7.0D) * 256.0D); // L: 3841 + } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 7f4bdcd56c..93ab8cf652 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,68 +7,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("ca") @Implements("ClientPreferences") public class ClientPreferences { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1137490275 + intValue = -587272659 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("titleMusicDisabled") boolean titleMusicDisabled; @ObfuscatedName("n") @Export("displayFps") boolean displayFps; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1182748365 + intValue = 1845230803 ) - int field1237; - @ObfuscatedName("f") + int field1218; + @ObfuscatedName("l") @Export("brightness") double brightness; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1977621949 + intValue = 1402013239 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 949756333 + intValue = -2075315825 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -925299259 + intValue = 1548024689 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2046216957 + intValue = -1754436801 ) - int field1245; - @ObfuscatedName("c") + int field1215; + @ObfuscatedName("w") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1653018799 + intValue = -2110885389 ) @Export("windowMode") int windowMode; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("parameters") LinkedHashMap parameters; @@ -83,15 +83,15 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1245 = -1; + this.field1215 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); - this.method2252(true); // L: 28 + this.method2226(true); // L: 28 } // L: 29 @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) ClientPreferences(Buffer var1) { this.hideUsername = false; // L: 14 @@ -100,14 +100,14 @@ public class ClientPreferences { this.musicVolume = 127; // L: 19 this.soundEffectsVolume = 127; // L: 20 this.areaSoundEffectsVolume = 127; // L: 21 - this.field1245 = -1; // L: 22 + this.field1215 = -1; // L: 22 this.rememberedUsername = null; // L: 23 this.windowMode = 1; // L: 24 this.parameters = new LinkedHashMap(); // L: 25 - if (var1 != null && var1.array != null) { // L: 32 - int var2 = var1.readUnsignedByte(); // L: 36 - if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 37 - if (var1.readUnsignedByte() == 1) { // L: 41 + if (var1 != null && var1.array != null) { + int var2 = var1.readUnsignedByte(); + if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { + if (var1.readUnsignedByte() == 1) { this.roofsHidden = true; // L: 42 } @@ -145,7 +145,7 @@ public class ClientPreferences { } if (var2 > 7) { // L: 70 - this.field1245 = var1.readUnsignedByte(); // L: 71 + this.field1215 = var1.readUnsignedByte(); // L: 71 } if (var2 > 8) { // L: 73 @@ -153,29 +153,29 @@ public class ClientPreferences { } if (var2 > 9) { // L: 76 - this.field1237 = var1.readInt(); // L: 77 + this.field1218 = var1.readInt(); // L: 77 } } else { - this.method2252(true); // L: 38 + this.method2226(true); } } else { - this.method2252(true); // L: 33 + this.method2226(true); } } // L: 81 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "330632498" + descriptor = "(ZB)V", + garbageValue = "-37" ) - void method2252(boolean var1) { + void method2226(boolean var1) { } // L: 83 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lpd;", - garbageValue = "-96" + descriptor = "(I)Lpi;", + garbageValue = "-779178440" ) @Export("toBuffer") Buffer toBuffer() { @@ -195,319 +195,307 @@ public class ClientPreferences { var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 99 var1.writeBoolean(this.hideUsername); // L: 100 - var1.writeByte((int)(100.0D * this.brightness)); // L: 101 + var1.writeByte((int)(this.brightness * 100.0D)); // L: 101 var1.writeByte(this.musicVolume); // L: 102 var1.writeByte(this.soundEffectsVolume); // L: 103 var1.writeByte(this.areaSoundEffectsVolume); // L: 104 - var1.writeByte(this.field1245); // L: 105 + var1.writeByte(this.field1215); // L: 105 var1.writeByte(this.displayFps ? 1 : 0); // L: 106 - var1.writeInt(this.field1237); // L: 107 + var1.writeInt(this.field1218); // L: 107 return var1; // L: 108 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "80137453" + garbageValue = "1690911744" ) - void method2254(boolean var1) { + void method2246(boolean var1) { this.roofsHidden = var1; // L: 150 - class307.savePreferences(); // L: 151 + GameEngine.savePreferences(); // L: 151 } // L: 152 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2146516502" + garbageValue = "-51084929" ) - boolean method2255() { + boolean method2263() { return this.roofsHidden; // L: 155 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-100" + descriptor = "(ZI)V", + garbageValue = "-1567835423" ) - void method2256(boolean var1) { + void method2230(boolean var1) { this.hideUsername = var1; // L: 159 - class307.savePreferences(); // L: 160 + GameEngine.savePreferences(); // L: 160 } // L: 161 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-98" + descriptor = "(I)Z", + garbageValue = "266836426" ) - boolean method2257() { + boolean method2317() { return this.hideUsername; // L: 164 } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "-12968" + descriptor = "(ZI)V", + garbageValue = "944518633" ) - void method2258(boolean var1) { - this.titleMusicDisabled = var1; - class307.savePreferences(); + void method2237(boolean var1) { + this.titleMusicDisabled = var1; // L: 168 + GameEngine.savePreferences(); // L: 169 + } // L: 170 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "6" + ) + boolean method2279() { + return this.titleMusicDisabled; // L: 173 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1326801022" + descriptor = "(ZI)V", + garbageValue = "618524190" ) - boolean method2259() { - return this.titleMusicDisabled; + void method2234(boolean var1) { + this.displayFps = var1; + GameEngine.savePreferences(); // L: 178 + } // L: 179 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "82" + ) + void method2302() { + this.method2234(!this.displayFps); // L: 182 + } // L: 183 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-509682647" + ) + boolean method2236() { + return this.displayFps; // L: 186 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "20" + descriptor = "(II)V", + garbageValue = "-1989585984" ) - void method2265(boolean var1) { - this.displayFps = var1; - class307.savePreferences(); + void method2260(int var1) { + this.field1218 = var1; // L: 190 + GameEngine.savePreferences(); // L: 191 + } // L: 192 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "117" + ) + int method2238() { + return this.field1218; // L: 195 + } + + @ObfuscatedName("m") + void method2239(double var1) { + this.brightness = var1; // L: 199 + GameEngine.savePreferences(); // L: 200 + } // L: 201 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)D", + garbageValue = "23" + ) + double method2240() { + return this.brightness; // L: 204 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-14" + ) + void method2241(int var1) { + this.musicVolume = var1; // L: 208 + GameEngine.savePreferences(); // L: 209 + } // L: 210 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1354418976" + ) + int method2321() { + return this.musicVolume; // L: 213 } @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-20" - ) - void method2271() { - this.method2265(!this.displayFps); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-122640703" - ) - boolean method2251() { - return this.displayFps; - } - - @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "30" - ) - void method2263(int var1) { - this.field1237 = var1; - class307.savePreferences(); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1736696043" - ) - int method2275() { - return this.field1237; - } - - @ObfuscatedName("s") - void method2260(double var1) { - this.brightness = var1; - class307.savePreferences(); // L: 200 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)D", - garbageValue = "429450872" - ) - double method2266() { - return this.brightness; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "272350050" - ) - void method2326(int var1) { - this.musicVolume = var1; // L: 208 - class307.savePreferences(); - } // L: 210 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1605095826" - ) - int method2288() { - return this.musicVolume; // L: 213 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-50" + garbageValue = "15" ) @Export("updateSoundEffectVolume") void updateSoundEffectVolume(int var1) { this.soundEffectsVolume = var1; // L: 217 - class307.savePreferences(); // L: 218 + GameEngine.savePreferences(); // L: 218 } // L: 219 - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "0" + garbageValue = "38" ) - int method2269() { + int method2243() { return this.soundEffectsVolume; // L: 222 } @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "128" + descriptor = "(II)V", + garbageValue = "-1931510599" ) - void method2270(int var1) { + void method2244(int var1) { this.areaSoundEffectsVolume = var1; // L: 226 - class307.savePreferences(); // L: 227 + GameEngine.savePreferences(); // L: 227 } // L: 228 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-18" + descriptor = "(I)I", + garbageValue = "681521036" ) - int method2286() { + int method2270() { return this.areaSoundEffectsVolume; // L: 231 } @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1115049469" + garbageValue = "2038280864" ) - void method2316(String var1) { + void method2286(String var1) { this.rememberedUsername = var1; // L: 235 - class307.savePreferences(); // L: 236 + GameEngine.savePreferences(); // L: 236 } // L: 237 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "85" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "7053" ) - String method2273() { + String method2247() { return this.rememberedUsername; // L: 240 } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "63" + garbageValue = "-91" ) - void method2274(int var1) { - this.field1245 = var1; // L: 244 - class307.savePreferences(); // L: 245 + void method2248(int var1) { + this.field1215 = var1; // L: 244 + GameEngine.savePreferences(); // L: 245 } // L: 246 - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - int method2268() { - return this.field1245; // L: 249 - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-837481548" - ) - void method2276(int var1) { - this.windowMode = var1; // L: 253 - class307.savePreferences(); // L: 254 - } // L: 255 - - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1919757284" + garbageValue = "-858252444" ) - int method2317() { + int method2249() { + return this.field1215; // L: 249 + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1789378363" + ) + void method2250(int var1) { + this.windowMode = var1; // L: 253 + GameEngine.savePreferences(); // L: 254 + } // L: 255 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "114" + ) + int method2251() { return this.windowMode; // L: 258 } - @ObfuscatedName("s") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "960216537" + descriptor = "(II)Lfh;", + garbageValue = "-2074828092" ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 168 - var1.offset = var0.length - 2; // L: 169 - class451.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 170 - class451.SpriteBuffer_xOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 171 - class451.SpriteBuffer_yOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 172 - class451.SpriteBuffer_spriteWidths = new int[class451.SpriteBuffer_spriteCount]; // L: 173 - class451.SpriteBuffer_spriteHeights = new int[class451.SpriteBuffer_spriteCount]; // L: 174 - class460.SpriteBuffer_pixels = new byte[class451.SpriteBuffer_spriteCount][]; // L: 175 - var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8; // L: 176 - class451.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 177 - class451.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 178 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 179 + @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); // L: 34 + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - int var3; - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 180 - class451.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 } + } - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 181 - class451.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1889189967" + ) + static void method2259() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.stream1 != null) { // L: 31 + StructComposition.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 + var0.stream1 = null; // L: 33 + } - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 182 - class451.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 183 - class451.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 184 - GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette = new int[var2]; // L: 185 - - for (var3 = 1; var3 < var2; ++var3) { // L: 186 - GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 187 - if (GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var3] == 0) { // L: 188 - GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var3] = 1; + if (var0.stream2 != null) { // L: 35 + StructComposition.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 + var0.stream2 = null; // L: 37 } } - var1.offset = 0; // L: 190 + ObjectSound.objectSounds.clear(); // L: 40 + } // L: 41 - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 191 - int var4 = class451.SpriteBuffer_spriteWidths[var3]; // L: 192 - int var5 = class451.SpriteBuffer_spriteHeights[var3]; // L: 193 - int var6 = var5 * var4; // L: 194 - byte[] var7 = new byte[var6]; // L: 195 - class460.SpriteBuffer_pixels[var3] = var7; // L: 196 - int var8 = var1.readUnsignedByte(); // L: 197 - int var9; - if (var8 == 0) { // L: 198 - for (var9 = 0; var9 < var6; ++var9) { // L: 199 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 201 - for (var9 = 0; var9 < var4; ++var9) { // L: 202 - for (int var10 = 0; var10 < var5; ++var10) { // L: 203 - var7[var9 + var4 * var10] = var1.readByte(); // L: 204 - } - } - } + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "441769737" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 175 + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; // L: 176 + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 177 } - - } // L: 209 + } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index ac20c07e04..95c49a7eed 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fr") @Implements("Clock") public abstract class Clock { Clock() { @@ -12,57 +12,38 @@ public abstract class Clock { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "947451014" + garbageValue = "1350330504" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-932830121" + garbageValue = "2026134141" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIIIB)I", - garbageValue = "-102" + descriptor = "(IB)Lgc;", + garbageValue = "1" ) - public static int method3322(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 22 - int var6 = var3; // L: 23 - var3 = var4; // L: 24 - var4 = var6; // L: 25 - } - - var2 &= 3; // L: 27 - if (var2 == 0) { // L: 28 + public static FloorOverlayDefinition method3349(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 return var1; - } else if (var2 == 1) { // L: 29 - return 7 - var0 - (var3 - 1); } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 30 - } - } + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 + var1 = new FloorOverlayDefinition(); // L: 29 + if (var2 != null) { // L: 30 + var1.decode(new Buffer(var2), var0); + } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Lqx;", - garbageValue = "-183389771" - ) - static IndexedSprite method3323() { - IndexedSprite var0 = new IndexedSprite(); // L: 105 - var0.width = class451.SpriteBuffer_spriteWidth; // L: 106 - var0.height = class451.SpriteBuffer_spriteHeight; // L: 107 - var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 108 - var0.yOffset = class451.SpriteBuffer_yOffsets[0]; // L: 109 - var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 110 - var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 111 - var0.palette = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette; // L: 112 - var0.pixels = class460.SpriteBuffer_pixels[0]; // L: 113 - RouteStrategy.method3872(); // L: 114 - return var0; // L: 115 + var1.postDecode(); // L: 31 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 + } } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 146765a129..e210c19aed 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,44 +1,37 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gv") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("in") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 446364801 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = 982444573 + intValue = -2036334399 ) @Export("xInset") - int xInset; - @ObfuscatedName("ab") + public int xInset; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1784818161 + intValue = 248145697 ) @Export("yInset") - int yInset; - @ObfuscatedName("aa") + public int yInset; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -170149503 + intValue = -1443603637 ) @Export("xSize") int xSize; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1782324325 + intValue = -322616853 ) @Export("ySize") int ySize; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("flags") public int[][] flags; @@ -53,8 +46,8 @@ public class CollisionMap { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-633194876" + descriptor = "(B)V", + garbageValue = "41" ) @Export("clear") public void clear() { @@ -70,12 +63,12 @@ public class CollisionMap { } // L: 59 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "1" + descriptor = "(IIIIZI)V", + garbageValue = "41761614" ) - public void method3838(int var1, int var2, int var3, int var4, boolean var5) { + public void method3872(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 62 var2 -= this.yInset; // L: 63 if (var3 == 0) { // L: 64 @@ -150,9 +143,9 @@ public class CollisionMap { if (var5) { // L: 122 if (var3 == 0) { // L: 123 - if (var4 == 0) { - this.setFlag(var1, var2, 65536); - this.setFlag(var1 - 1, var2, 4096); + if (var4 == 0) { // L: 124 + this.setFlag(var1, var2, 65536); // L: 125 + this.setFlag(var1 - 1, var2, 4096); // L: 126 } if (var4 == 1) { // L: 128 @@ -222,10 +215,10 @@ public class CollisionMap { } // L: 182 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-283720745" + descriptor = "(IIIIZB)V", + garbageValue = "-49" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -249,10 +242,10 @@ public class CollisionMap { } // L: 196 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "31" + garbageValue = "122" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -262,10 +255,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "229046415" + garbageValue = "577213527" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -277,8 +270,8 @@ public class CollisionMap { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-848797449" + descriptor = "(IIIB)V", + garbageValue = "-85" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -286,12 +279,12 @@ public class CollisionMap { var10000[var2] |= var3; } // L: 212 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "1529819557" + garbageValue = "-1937676600" ) - public void method3843(int var1, int var2, int var3, int var4, boolean var5) { + public void method3853(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 215 var2 -= this.yInset; // L: 216 if (var3 == 0) { // L: 217 @@ -438,10 +431,10 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIIZB)V", - garbageValue = "-77" + descriptor = "(IIIIIZI)V", + garbageValue = "1357982372" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -471,10 +464,10 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1782689060" + descriptor = "(IIIB)V", + garbageValue = "-35" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -482,44 +475,15 @@ public class CollisionMap { var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1241992272" + descriptor = "(IIB)V", + garbageValue = "-18" ) - public void method3846(int var1, int var2) { + public void method3847(int var1, int var2) { var1 -= this.xInset; // L: 361 var2 -= this.yInset; // L: 362 int[] var10000 = this.flags[var1]; // L: 363 var10000[var2] &= -262145; } // L: 364 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1691642668" - ) - static void method3852(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 124 - var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 125 - KeyHandler.field124 = -1; // L: 126 - } // L: 127 - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(Lkn;IIIB)V", - garbageValue = "69" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 11642 - if (var4 != null) { // L: 11643 - if (Client.minimapState < 3) { // L: 11644 - class14.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11645 - } - - } - } // L: 11646 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 3ba8561552..0afdb65bd2 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,30 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("ks") @Implements("Coord") public class Coord { + @ObfuscatedName("w") + public static boolean field3289; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 804450447 + intValue = 1984638055 ) @Export("plane") public int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1572580879 + intValue = -1078309335 ) @Export("x") public int x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1382298695 + intValue = -585894477 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lko;)V" + descriptor = "(Lks;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -54,53 +56,84 @@ public class Coord { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1281851616" + descriptor = "(B)I", + garbageValue = "-78" ) @Export("packed") public int packed() { - return UrlRequest.method2545(this.plane, this.x, this.y); // L: 30 + return class341.method6280(this.plane, this.x, this.y); // L: 30 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lko;B)Z", - garbageValue = "0" + descriptor = "(Lks;B)Z", + garbageValue = "53" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { // L: 45 + if (this.plane != var1.plane) { // L: 44 return false; - } else if (this.x != var1.x) { // L: 46 + } else if (this.x != var1.x) { // L: 45 return false; } else { - return this.y == var1.y; // L: 47 + return this.y == var1.y; // L: 46 } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-950389284" + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "74" ) @Export("toString") String toString(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 61 + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 59 } public boolean equals(Object var1) { - if (this == var1) { // L: 39 + if (this == var1) { // L: 38 return true; } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 40 41 + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 39 40 } } public int hashCode() { - return this.packed(); // L: 53 + return this.packed(); // L: 51 } public String toString() { - return this.toString(","); // L: 57 + return this.toString(","); // L: 55 } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static final void method5531() { + int var0 = class138.menuX; // L: 8630 + int var1 = class1.menuY; // L: 8631 + int var2 = ItemComposition.menuWidth; // L: 8632 + int var3 = ByteArrayPool.menuHeight; // L: 8633 + int var4 = 6116423; // L: 8634 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8635 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8636 + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8637 + RouteStrategy.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8638 + int var5 = MouseHandler.MouseHandler_x; // L: 8639 + int var6 = MouseHandler.MouseHandler_y; // L: 8640 + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8641 + int var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; // L: 8642 + int var9 = 16777215; // L: 8643 + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8644 + var9 = 16776960; + } + + RouteStrategy.fontBold12.draw(AbstractUserComparator.method6736(var7), var0 + 3, var8, var9, 0); // L: 8645 + } + + ScriptEvent.method2092(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8647 + } // L: 8648 } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 62502ca74d..05c0557fcb 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,18 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("as") @Implements("Decimator") public class Decimator { - @ObfuscatedName("g") + @ObfuscatedName("ur") + @ObfuscatedSignature( + descriptor = "Lbw;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "Lny;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = -1316029473 + intValue = 1220605689 + ) + static int field397; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1215193119 ) @Export("inputRate") int inputRate; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1494583119 + intValue = -871732017 ) @Export("outputRate") int outputRate; @@ -46,7 +69,7 @@ public class Decimator { for (int var7 = 0; var7 < var1; ++var7) { // L: 37 int[] var8 = this.table[var7]; // L: 38 - double var9 = 6.0D + (double)var7 / (double)var1; // L: 39 + double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39 int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 if (var11 < 0) { // L: 41 var11 = 0; @@ -58,14 +81,14 @@ public class Decimator { } for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 - double var15 = ((double)var11 - var9) * 3.141592653589793D; // L: 46 + double var15 = 3.141592653589793D * ((double)var11 - var9); // L: 46 double var17 = var13; // L: 47 if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 var17 = var13 * (Math.sin(var15) / var15); } - var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); // L: 49 - var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D); // L: 50 + var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49 + var8[var11] = (int)Math.floor(0.5D + 65536.0D * var17); // L: 50 } } @@ -75,7 +98,7 @@ public class Decimator { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "1351283209" + garbageValue = "-84367819" ) @Export("resample") byte[] resample(byte[] var1) { @@ -92,7 +115,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { // L: 64 - var3[var4 + var9] += var7 * var8[var9]; + var3[var9 + var4] += var8[var9] * var7; } var5 += this.outputRate; // L: 65 @@ -118,24 +141,24 @@ public class Decimator { return var1; // L: 78 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "0" + garbageValue = "25" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); // L: 82 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); // L: 82 } return var1; // L: 83 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-66" + descriptor = "(II)I", + garbageValue = "1943827297" ) @Export("scalePosition") int scalePosition(int var1) { @@ -145,4 +168,61 @@ public class Decimator { return var1; // L: 88 } + + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-13" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1075 + if (Client.gameState == 0) { // L: 1076 + class127.client.method520(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1077 + ModeWhere.method6099(0); // L: 1078 + Client.field528 = 0; // L: 1079 + Client.field661 = 0; // L: 1080 + Client.timer.method6563(var0); // L: 1081 + if (var0 != 20) { // L: 1082 + class302.method5766(false); + } + } + + if (var0 != 20 && var0 != 40 && ModeWhere.field4073 != null) { // L: 1084 1085 + ModeWhere.field4073.close(); // L: 1086 + ModeWhere.field4073 = null; // L: 1087 + } + + if (Client.gameState == 25) { // L: 1090 + Client.field560 = 0; // L: 1091 + Client.field747 = 0; // L: 1092 + Client.field608 = 1; // L: 1093 + Client.field558 = 0; // L: 1094 + Client.field758 = 1; // L: 1095 + } + + int var1; + if (var0 != 5 && var0 != 10) { // L: 1097 + if (var0 == 20) { // L: 1101 + var1 = Client.gameState == 11 ? 4 : 0; // L: 1102 + class144.method3080(JagexCache.archive10, class145.archive8, false, var1); // L: 1103 + } else if (var0 == 11) { // L: 1105 + class144.method3080(JagexCache.archive10, class145.archive8, false, 4); // L: 1106 + } else if (var0 == 50) { // L: 1108 + class4.setLoginResponseString("", "Updating date of birth...", ""); // L: 1109 + class144.method3080(JagexCache.archive10, class145.archive8, false, 7); // L: 1110 + } else { + WorldMapSprite.method4351(); // L: 1112 + } + } else { + var1 = BufferedSource.method6889() ? 0 : 12; // L: 1098 + class144.method3080(JagexCache.archive10, class145.archive8, true, var1); // L: 1099 + } + + Client.gameState = var0; // L: 1113 + } + } // L: 1114 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 345ecca812..7d41dcf372 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,26 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") +@ObfuscatedName("nu") @Implements("DefaultsGroup") public class DefaultsGroup { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnu;" ) - static final DefaultsGroup field4313; - @ObfuscatedName("o") + static final DefaultsGroup field4311; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1008905745 + intValue = -1482438781 ) @Export("group") final int group; static { - field4313 = new DefaultsGroup(3); // L: 4 + field4311 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { this.group = var1; // L: 8 } // L: 9 + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(Lpi;II)V", + garbageValue = "1715985756" + ) + static void method6936(Buffer var0, int var1) { + UserComparator6.method2646(var0.array, var1); // L: 12572 + if (JagexCache.JagexCache_randomDat != null) { // L: 12574 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 12576 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12577 + } catch (Exception var3) { // L: 12579 + } + } + + } // L: 12582 } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 161ac0b294..bf7c962893 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("ii") +@ObfuscatedName("ie") @Implements("DemotingHashTable") public final class DemotingHashTable { @ObfuscatedName("v") @Export("capacity") int capacity; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("remaining") int remaining; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmr;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lih;" + descriptor = "Lii;" ) - class253 field2874; + class253 field2877; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 @@ -77,16 +77,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 this.removeWrapper(var3); // L: 53 } // L: 54 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lin;)V" + descriptor = "(Liz;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ public final class DemotingHashTable { } // L: 62 - @ObfuscatedName("g") - public void method5145(Object var1, long var2) { + @ObfuscatedName("f") + public void method5124(Object var1, long var2) { this.put(var1, var2, 1); // L: 65 } // L: 66 - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { // L: 69 @@ -122,8 +122,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); // L: 78 - if (this.field2874 != null) { // L: 79 - this.field2874.method5139(var5.get()); // L: 80 + if (this.field2877 != null) { // L: 79 + this.field2877.method5114(var5.get()); // L: 80 } } @@ -155,7 +155,7 @@ public final class DemotingHashTable { } // L: 109 - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("clear") public void clear() { this.queue.clear(); // L: 112 diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 8de80a1523..5ee2e58894 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,209 +4,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ow") +@ObfuscatedName("od") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1948340117 + intValue = 175576615 ) int field4413; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1586202977 + intValue = 551847099 ) - int field4416; + int field4412; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2071888753 + intValue = -212427447 ) - int field4415; + int field4416; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Lov;", - garbageValue = "0" + descriptor = "(I)Loj;", + garbageValue = "2004856383" ) @Export("get") public PlatformInfo get() { byte var1; - if (Buffer.formattedOperatingSystemName.startsWith("win")) { // L: 16 + if (class128.formattedOperatingSystemName.startsWith("win")) { // L: 15 var1 = 1; - } else if (Buffer.formattedOperatingSystemName.startsWith("mac")) { // L: 17 + } else if (class128.formattedOperatingSystemName.startsWith("mac")) { // L: 16 var1 = 2; - } else if (Buffer.formattedOperatingSystemName.startsWith("linux")) { // L: 18 + } else if (class128.formattedOperatingSystemName.startsWith("linux")) { // L: 17 var1 = 3; } else { - var1 = 4; // L: 19 + var1 = 4; // L: 18 } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); // L: 23 - } catch (Exception var30) { // L: 25 - var2 = ""; // L: 26 + var2 = System.getProperty("os.arch").toLowerCase(); // L: 22 + } catch (Exception var27) { // L: 24 + var2 = ""; // L: 25 } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); // L: 29 - } catch (Exception var29) { // L: 31 - var3 = ""; // L: 32 + var3 = System.getProperty("os.version").toLowerCase(); // L: 28 + } catch (Exception var26) { // L: 30 + var3 = ""; // L: 31 } - String var4 = "Unknown"; // L: 34 - String var5 = "1.1"; // L: 35 + String var4 = "Unknown"; // L: 33 + String var5 = "1.1"; // L: 34 try { - var4 = System.getProperty("java.vendor"); // L: 37 - var5 = System.getProperty("java.version"); // L: 38 - } catch (Exception var28) { // L: 40 + var4 = System.getProperty("java.vendor"); // L: 36 + var5 = System.getProperty("java.version"); // L: 37 + } catch (Exception var25) { // L: 39 } - boolean var27; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 42 - var27 = false; // L: 43 + boolean var24; + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41 + var24 = false; // L: 42 } else { - var27 = true; + var24 = true; } - byte var7 = 0; // L: 44 - if (var1 == 1) { // L: 45 - if (var3.indexOf("4.0") != -1) { // L: 46 + byte var7 = 0; // L: 43 + if (var1 == 1) { // L: 44 + if (var3.indexOf("4.0") != -1) { // L: 45 var7 = 1; - } else if (var3.indexOf("4.1") != -1) { // L: 47 + } else if (var3.indexOf("4.1") != -1) { // L: 46 var7 = 2; - } else if (var3.indexOf("4.9") != -1) { // L: 48 + } else if (var3.indexOf("4.9") != -1) { // L: 47 var7 = 3; - } else if (var3.indexOf("5.0") != -1) { // L: 49 + } else if (var3.indexOf("5.0") != -1) { // L: 48 var7 = 4; - } else if (var3.indexOf("5.1") != -1) { // L: 50 + } else if (var3.indexOf("5.1") != -1) { // L: 49 var7 = 5; - } else if (var3.indexOf("5.2") != -1) { // L: 51 + } else if (var3.indexOf("5.2") != -1) { // L: 50 var7 = 8; - } else if (var3.indexOf("6.0") != -1) { // L: 52 + } else if (var3.indexOf("6.0") != -1) { // L: 51 var7 = 6; - } else if (var3.indexOf("6.1") != -1) { // L: 53 + } else if (var3.indexOf("6.1") != -1) { // L: 52 var7 = 7; - } else if (var3.indexOf("6.2") != -1) { // L: 54 + } else if (var3.indexOf("6.2") != -1) { // L: 53 var7 = 9; - } else if (var3.indexOf("6.3") != -1) { // L: 55 + } else if (var3.indexOf("6.3") != -1) { // L: 54 var7 = 10; - } else if (var3.indexOf("10.0") != -1) { // L: 56 + } else if (var3.indexOf("10.0") != -1) { // L: 55 var7 = 11; } - } else if (var1 == 2) { // L: 58 - if (var3.indexOf("10.4") != -1) { // L: 59 + } else if (var1 == 2) { // L: 57 + if (var3.indexOf("10.4") != -1) { // L: 58 var7 = 20; - } else if (var3.indexOf("10.5") != -1) { // L: 60 + } else if (var3.indexOf("10.5") != -1) { // L: 59 var7 = 21; - } else if (var3.indexOf("10.6") != -1) { // L: 61 + } else if (var3.indexOf("10.6") != -1) { // L: 60 var7 = 22; - } else if (var3.indexOf("10.7") != -1) { // L: 62 + } else if (var3.indexOf("10.7") != -1) { // L: 61 var7 = 23; - } else if (var3.indexOf("10.8") != -1) { // L: 63 + } else if (var3.indexOf("10.8") != -1) { // L: 62 var7 = 24; - } else if (var3.indexOf("10.9") != -1) { // L: 64 + } else if (var3.indexOf("10.9") != -1) { // L: 63 var7 = 25; - } else if (var3.indexOf("10.10") != -1) { // L: 65 - var7 = 26; - } else if (var3.indexOf("10.11") != -1) { // L: 66 + } else if (var3.indexOf("10.10") != -1) { + var7 = 26; // L: 64 + } else if (var3.indexOf("10.11") != -1) { // L: 65 var7 = 27; - } else if (var3.indexOf("10.12") != -1) { // L: 67 + } else if (var3.indexOf("10.12") != -1) { // L: 66 var7 = 28; - } else if (var3.indexOf("10.13") != -1) { // L: 68 + } else if (var3.indexOf("10.13") != -1) { // L: 67 var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { // L: 71 + if (var4.toLowerCase().indexOf("sun") != -1) { // L: 70 var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 72 + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 71 var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 73 + } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 72 var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 74 + } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 73 var8 = 5; } else { - var8 = 4; // L: 75 + var8 = 4; // L: 74 } - this.method7264(var5); // L: 76 - boolean var9 = false; // L: 77 - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78 + this.method7178(var5); // L: 75 + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field4413 > 3) { // L: 81 + if (this.field4413 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; // L: 82 + var11 = 0; // L: 81 } - byte var12 = 0; // L: 83 - String var13 = ""; // L: 84 - String var14 = ""; // L: 85 - String var15 = ""; // L: 86 - String var16 = ""; // L: 87 - String var17 = ""; // L: 88 - String var18 = ""; // L: 89 - boolean var19 = false; // L: 90 - boolean var20 = false; // L: 91 - boolean var21 = false; // L: 92 - boolean var22 = false; // L: 93 - int[] var23 = new int[3]; // L: 94 - boolean var24 = false; // L: 95 - String var25 = ""; // L: 96 - boolean var26 = false; // L: 97 - return new PlatformInfo(var1, var27, var7, var8, this.field4413, this.field4416, this.field4415, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98 + byte var12 = 0; // L: 82 + String var13 = ""; // L: 83 + String var14 = ""; // L: 84 + String var15 = ""; // L: 85 + String var16 = ""; // L: 86 + String var17 = ""; // L: 87 + String var18 = ""; // L: 88 + int[] var23 = new int[3]; // L: 93 + return new PlatformInfo(var1, var24, var7, var8, this.field4413, this.field4412, this.field4416, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1017093968" + garbageValue = "559180637" ) - void method7264(String var1) { - if (var1.startsWith("1.")) { // L: 102 - this.method7268(var1); // L: 103 + void method7178(String var1) { + if (var1.startsWith("1.")) { // L: 101 + this.method7179(var1); // L: 102 } else { - this.method7265(var1); // L: 106 + this.method7177(var1); // L: 105 } - } // L: 108 + } // L: 107 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-494383958" + garbageValue = "435492533" ) - void method7268(String var1) { - String[] var2 = var1.split("\\."); // L: 111 + void method7179(String var1) { + String[] var2 = var1.split("\\."); // L: 110 try { - this.field4413 = Integer.parseInt(var2[1]); // L: 113 - var2 = var2[2].split("_"); // L: 114 - this.field4416 = Integer.parseInt(var2[0]); // L: 115 - this.field4415 = Integer.parseInt(var2[1]); // L: 116 - } catch (Exception var4) { // L: 118 + this.field4413 = Integer.parseInt(var2[1]); // L: 112 + var2 = var2[2].split("_"); // L: 113 + this.field4412 = Integer.parseInt(var2[0]); // L: 114 + this.field4416 = Integer.parseInt(var2[1]); // L: 115 + } catch (Exception var4) { // L: 117 } - } // L: 119 + } // L: 118 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1896923040" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "120" ) - void method7265(String var1) { - String[] var2 = var1.split("\\."); // L: 122 + void method7177(String var1) { + String[] var2 = var1.split("\\."); // L: 121 try { - this.field4413 = Integer.parseInt(var2[0]); // L: 124 - this.field4416 = Integer.parseInt(var2[1]); // L: 125 - this.field4415 = Integer.parseInt(var2[2]); // L: 126 - } catch (Exception var4) { // L: 128 + this.field4413 = Integer.parseInt(var2[0]); // L: 123 + this.field4412 = Integer.parseInt(var2[1]); // L: 124 + this.field4416 = Integer.parseInt(var2[2]); // L: 125 + } catch (Exception var4) { // L: 127 } - } // L: 129 + } // L: 128 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 5eb82964f9..9ef79d4012 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,22 +9,22 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ae") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("v") @Export("format") AudioFormat format; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("line") SourceDataLine line; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1710681231 + intValue = -1556714099 ) @Export("capacity2") int capacity2; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("byteSamples") byte[] byteSamples; @@ -33,90 +33,90 @@ public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "44" + descriptor = "(I)V", + garbageValue = "-843995592" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)SecureRandomFuture.field949, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22 - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 23 - } // L: 24 + this.format = new AudioFormat((float)PcmPlayer.field268, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 + } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "5561" + descriptor = "(II)V", + garbageValue = "1651380399" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 29 - this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 30 - this.line.open(); // L: 31 - this.line.start(); // L: 32 - this.capacity2 = var1; // L: 33 - } catch (LineUnavailableException var3) { // L: 35 - if (class263.method5208(var1) != 1) { // L: 36 - this.open(Login.method1894(var1)); // L: 37 + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 + this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28 + this.line.open(); // L: 29 + this.line.start(); // L: 30 + this.capacity2 = var1; // L: 31 + } catch (LineUnavailableException var3) { // L: 33 + if (class150.method3150(var1) != 1) { // L: 34 + this.open(class67.method1909(var1)); // L: 35 } else { - this.line = null; // L: 40 - throw var3; // L: 41 + this.line = null; // L: 38 + throw var3; // L: 39 } } - } // L: 38 43 + } // L: 36 41 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "244839095" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 47 + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("write") protected void write() { - int var1 = 256; // L: 53 - if (PcmPlayer.PcmPlayer_stereo) { // L: 54 + int var1 = 256; // L: 49 + if (PcmPlayer.PcmPlayer_stereo) { // L: 50 var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { // L: 55 - int var3 = super.samples[var2]; // L: 56 - if ((var3 + 8388608 & -16777216) != 0) { // L: 57 - var3 = 8388607 ^ var3 >> 31; // L: 58 + for (int var2 = 0; var2 < var1; ++var2) { // L: 51 + int var3 = super.samples[var2]; // L: 52 + if ((var3 + 8388608 & -16777216) != 0) { // L: 53 + var3 = 8388607 ^ var3 >> 31; // L: 54 } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 60 - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 61 + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57 } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 63 - } // L: 64 + this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 + } // L: 60 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1892762612" + garbageValue = "-1662003992" ) @Export("close") protected void close() { - if (this.line != null) { // L: 68 - this.line.close(); // L: 69 - this.line = null; // L: 70 + if (this.line != null) { // L: 63 + this.line.close(); // L: 64 + this.line = null; // L: 65 } - } // L: 72 + } // L: 67 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-476108420" + garbageValue = "1137884684" ) @Export("discard") protected void discard() { - this.line.flush(); // L: 76 - } // L: 77 + this.line.flush(); // L: 70 + } // L: 71 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 1d94514346..83209f2e7d 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -3,306 +3,41 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("t") +@ObfuscatedName("z") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements class47 { - @ObfuscatedName("sj") +public class DevicePcmPlayerProvider implements class45 { + @ObfuscatedName("sx") @ObfuscatedGetter( - intValue = -637981437 + intValue = 1132145401 ) - static int field146; - @ObfuscatedName("g") + static int field154; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "[Lbb;" ) - @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 798256057 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("el") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("l") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("ns") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lky;" ) - @Export("archive14") - static Archive archive14; + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; DevicePcmPlayerProvider() { } // L: 7 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lao;", - garbageValue = "-1472980183" + descriptor = "(I)Lay;", + garbageValue = "-262480710" ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); // L: 11 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Lda;", - garbageValue = "-1114679532" - ) - static class123[] method383() { - return new class123[]{class123.field1505, class123.field1494, class123.field1495, class123.field1496, class123.field1497, class123.field1498, class123.field1493, class123.field1500, class123.field1501}; // L: 97 - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "1263905668" - ) - static int method384(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526 - return 1; // L: 3527 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529 - class295.Interpreter_intStackSize -= 3; // L: 3530 - Client.publicChatMode = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3531 - Varps.privateChatMode = class83.method2124(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 3532 - if (Varps.privateChatMode == null) { // L: 3533 - Varps.privateChatMode = PrivateChatMode.field4738; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3534 - PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2907, Client.packetWriter.isaacCipher); // L: 3536 - var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537 - var13.packetBuffer.writeByte(Varps.privateChatMode.field4737); // L: 3538 - var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539 - Client.packetWriter.addNode(var13); // L: 3540 - return 1; // L: 3541 - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543 - var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3544 - class295.Interpreter_intStackSize -= 2; // L: 3545 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3546 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3547 - var6 = ItemContainer.getPacketBufferNode(ClientPacket.field2926, Client.packetWriter.isaacCipher); // L: 3549 - var6.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550 - var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551 - var6.packetBuffer.writeByte(var7 - 1); // L: 3552 - var6.packetBuffer.writeByte(var9); // L: 3553 - Client.packetWriter.addNode(var6); // L: 3554 - return 1; // L: 3555 - } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557 - class295.Interpreter_intStackSize -= 2; // L: 3558 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3559 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3560 - var5 = Tiles.Messages_getByChannelAndID(var3, var7); // L: 3561 - if (var5 != null) { // L: 3562 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.count; // L: 3563 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3571 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3572 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3573 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3574 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3575 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3576 - } - - return 1; // L: 3578 - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3581 - var4 = Strings.Messages_getMessage(var3); // L: 3582 - if (var4 != null) { // L: 3583 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.type; // L: 3584 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3592 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3593 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3594 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3595 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3596 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3597 - } - - return 1; // L: 3599 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601 - if (Varps.privateChatMode == null) { // L: 3602 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Varps.privateChatMode.field4737; // L: 3603 - } - - return 1; // L: 3604 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606 - var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3607 - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3608 - var12 = class388.method7151(var7, var8, FriendSystem.clientLanguage, -1); // L: 3609 - Client.packetWriter.addNode(var12); // L: 3610 - return 1; // L: 3611 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3614 - var8 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3615 - String var11 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3616 - var12 = ItemContainer.getPacketBufferNode(ClientPacket.field2990, Client.packetWriter.isaacCipher); // L: 3618 - var12.packetBuffer.writeShort(0); // L: 3619 - int var10 = var12.packetBuffer.offset; // L: 3620 - var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621 - WorldMapIcon_0.method4900(var12.packetBuffer, var11); // L: 3622 - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623 - Client.packetWriter.addNode(var12); // L: 3624 - return 1; // L: 3625 - } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627 - var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3628 - class295.Interpreter_intStackSize -= 2; // L: 3629 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3630 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3631 - var6 = class388.method7151(var7, var8, FriendSystem.clientLanguage, var9); // L: 3632 - Client.packetWriter.addNode(var6); // L: 3633 - return 1; // L: 3634 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644 - return 1; // L: 3645 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3648 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Message.Messages_getHistorySize(var3); // L: 3649 - return 1; // L: 3650 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3653 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class18.Messages_getLastChatID(var3); // L: 3654 - return 1; // L: 3655 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3658 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapSectionType.method4942(var3); // L: 3659 - return 1; // L: 3660 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662 - var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3663 - class9.doCheat(var8); // L: 3664 - return 1; // L: 3665 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667 - Client.field712 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668 - return 1; // L: 3669 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = Client.field712; // L: 3672 - return 1; // L: 3673 - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675 - var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3676 - System.out.println(var8); // L: 3677 - return 1; // L: 3678 - } else if (var0 == 5024) { // L: 3680 - --class295.Interpreter_intStackSize; // L: 3681 - return 1; // L: 3682 - } else if (var0 == 5025) { // L: 3684 - ++class295.Interpreter_intStackSize; // L: 3685 - return 1; // L: 3686 - } else if (var0 == 5030) { // L: 3688 - class295.Interpreter_intStackSize -= 2; // L: 3689 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3690 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3691 - var5 = Tiles.Messages_getByChannelAndID(var3, var7); // L: 3692 - if (var5 != null) { // L: 3693 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.count; // L: 3694 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3700 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3701 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3704 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3705 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3706 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3707 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3708 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3709 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3710 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3711 - } - - return 1; // L: 3713 - } else if (var0 == 5031) { // L: 3715 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3716 - var4 = Strings.Messages_getMessage(var3); // L: 3717 - if (var4 != null) { // L: 3718 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.type; // L: 3719 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3725 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3726 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3729 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3730 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3731 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3732 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3733 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3734 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3735 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3736 - } - - return 1; // L: 3738 - } else { - return 2; // L: 3740 - } - } else { - if (class19.localPlayer != null && class19.localPlayer.username != null) { // L: 3638 - var8 = class19.localPlayer.username.getName(); - } else { - var8 = ""; // L: 3639 - } - - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var8; // L: 3640 - return 1; // L: 3641 - } - } - } - } - } - } - - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "632699476" - ) - static int method385(int var0) { - return var0 * 3 + 600; // L: 1377 - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "(Lkn;I)Lkn;", - garbageValue = "2084106709" - ) - static Widget method381(Widget var0) { - Widget var1 = UserComparator3.method2601(var0); // L: 11271 - if (var1 == null) { - var1 = var0.parent; // L: 11272 - } - - return var1; // L: 11273 + return new DevicePcmPlayer(); // L: 10 } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 48baf8db8a..f5228e3f6a 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -3,21 +3,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jc") +@ObfuscatedName("js") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("p") - static int[][][] field3277; + @ObfuscatedName("pf") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + @Export("HitSplatDefinition_cached") + static class426 HitSplatDefinition_cached; @ObfuscatedName("v") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("g") + DirectByteArrayCopier() { + } // L: 10 + + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "-16" + descriptor = "(I)[B", + garbageValue = "2035077648" ) @Export("get") byte[] get() { @@ -27,813 +33,24 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; // L: 16 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-308662955" + garbageValue = "-1279201457" ) @Export("set") - public void set(byte[] var1) { + void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 this.directBuffer.position(0); // L: 21 this.directBuffer.put(var1); // L: 22 } // L: 23 - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llq;Ljava/lang/String;Ljava/lang/String;I)[Lql;", - garbageValue = "-177825093" + descriptor = "(II)Z", + garbageValue = "1117680233" ) - public static SpritePixels[] method5541(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 88 - int var4 = var0.getFileId(var3, var2); // L: 89 - return UserList.method6853(var0, var3, var4); // L: 90 + public static boolean method5516(int var0) { + return (var0 >> 20 & 1) != 0; // L: 17 } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "1953861280" - ) - static int method5540(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1882 - class295.Interpreter_intStackSize -= 3; // L: 1883 - KitDefinition.queueSoundEffect(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]); // L: 1884 - return 1; // L: 1885 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1887 - class401.playSong(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1888 - return 1; // L: 1889 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1891 - class295.Interpreter_intStackSize -= 2; // L: 1892 - class145.method3032(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 1893 - return 1; // L: 1894 - } else { - class83 var3; - class82 var4; - int var5; - int var6; - String var7; - if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1896 - if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2008 - return var0 == 3211 ? 1 : 2; // L: 2117 2118 2120 - } else { - var3 = class83.field1081; // L: 2009 - var4 = class82.field1072; // L: 2010 - boolean var8 = false; // L: 2011 - if (var0 == 3214) { // L: 2012 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2013 - var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 2014 - if (var3 == null) { // L: 2015 - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2016 - } - } - - if (var0 == 3215) { // L: 2019 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2020 - var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 2021 - if (var4 == null) { // L: 2022 - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2023 - } - } - - if (var0 == 3210) { // L: 2026 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2027 - var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 2028 - if (var3 == null) { // L: 2029 - var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 2030 - if (var4 == null) { // L: 2031 - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2032 - } - } - } else if (var0 == 3182) { // L: 2036 - var3 = class83.field1078; // L: 2037 - } else if (var0 == 3204) { // L: 2039 - var4 = class82.field1065; // L: 2040 - } else if (var0 == 3206) { // L: 2042 - var4 = class82.field1069; // L: 2043 - } else if (var0 == 3208) { // L: 2045 - var4 = class82.field1067; // L: 2046 - } - - if (var4 == class82.field1072) { // L: 2048 - switch(var3.field1079) { // L: 2049 - case 1: - var5 = Interpreter.clientPreferences.method2257() ? 1 : 0; // L: 2067 - break; // L: 2068 - case 2: - var5 = Interpreter.clientPreferences.method2259() ? 1 : 0; // L: 2062 - break; // L: 2063 - case 3: - var5 = Interpreter.clientPreferences.method2251() ? 1 : 0; // L: 2057 - break; // L: 2058 - case 4: - var5 = Interpreter.clientPreferences.method2275(); // L: 2072 - break; // L: 2073 - case 5: - var5 = ViewportMouse.method4492(); // L: 2052 - break; - default: - var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2077 - throw new RuntimeException(var7); // L: 2078 - } - } else { - switch(var4.field1068) { // L: 2083 - case 1: - var5 = Interpreter.clientPreferences.method2255() ? 1 : 0; // L: 2104 - break; // L: 2105 - case 2: - var6 = Interpreter.clientPreferences.method2288(); // L: 2092 - var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2093 - break; // L: 2094 - case 3: - var6 = Interpreter.clientPreferences.method2269(); // L: 2098 - var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2099 - break; // L: 2100 - case 4: - var6 = Interpreter.clientPreferences.method2286(); // L: 2086 - var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2087 - break; // L: 2088 - default: - var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2109 - throw new RuntimeException(var7); // L: 2110 - } - } - - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5; // L: 2114 - return 1; // L: 2115 - } - } else { - var3 = class83.field1081; // L: 1897 - var4 = class82.field1072; // L: 1898 - var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1899 - if (var0 == 3212) { // L: 1900 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1901 - var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 1902 - if (var3 == null) { // L: 1903 - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1904 - } - } - - if (var0 == 3213) { // L: 1907 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1908 - var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 1909 - if (var4 == null) { // L: 1910 - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1911 - } - } - - if (var0 == 3209) { // L: 1914 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1915 - var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 1916 - if (var3 == null) { // L: 1917 - var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 1918 - if (var4 == null) { // L: 1919 - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1920 - } - } - } else if (var0 == 3181) { // L: 1924 - var3 = class83.field1078; // L: 1925 - } else if (var0 == 3203) { // L: 1927 - var4 = class82.field1065; // L: 1928 - } else if (var0 == 3205) { // L: 1930 - var4 = class82.field1069; // L: 1931 - } else if (var0 == 3207) { // L: 1933 - var4 = class82.field1067; // L: 1934 - } - - if (var4 == class82.field1072) { // L: 1936 - switch(var3.field1079) { // L: 1937 - case 1: - Interpreter.clientPreferences.method2256(var5 == 1); // L: 1961 - break; // L: 1962 - case 2: - Interpreter.clientPreferences.method2258(var5 == 1); // L: 1966 - break; // L: 1967 - case 3: - Interpreter.clientPreferences.method2265(var5 == 1); // L: 1956 - break; // L: 1957 - case 4: - if (var5 < 0) { // L: 1945 - var5 = 0; - } - - Interpreter.clientPreferences.method2263(var5); // L: 1946 - break; // L: 1947 - case 5: - WorldMapSection0.method4940(var5); // L: 1940 - break; - default: - var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1951 - throw new RuntimeException(var7); // L: 1952 - } - } else { - switch(var4.field1068) { // L: 1972 - case 1: - Interpreter.clientPreferences.method2254(var5 == 1); // L: 1989 - break; // L: 1990 - case 2: - var5 = Math.min(Math.max(var5, 0), 100); // L: 1982 - var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1983 - Tiles.method2040(var6); // L: 1984 - break; // L: 1985 - case 3: - var5 = Math.min(Math.max(var5, 0), 100); // L: 1975 - var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1976 - class28.method424(var6); // L: 1977 - break; // L: 1978 - case 4: - var5 = Math.min(Math.max(var5, 0), 100); // L: 1994 - var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1995 - class21.method334(var6); // L: 1996 - break; // L: 1997 - default: - var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2001 - throw new RuntimeException(var7); // L: 2002 - } - } - - return 1; // L: 2006 - } - } - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-874180383" - ) - static final void method5546() { - class286.method5548(false); // L: 5273 - Client.field541 = 0; // L: 5274 - boolean var0 = true; // L: 5275 - - int var1; - for (var1 = 0; var1 < WorldMapSectionType.regionLandArchives.length; ++var1) { // L: 5276 - if (ObjectComposition.regionMapArchiveIds[var1] != -1 && WorldMapSectionType.regionLandArchives[var1] == null) { // L: 5277 5278 - WorldMapSectionType.regionLandArchives[var1] = class302.archive5.takeFile(ObjectComposition.regionMapArchiveIds[var1], 0); // L: 5279 - if (WorldMapSectionType.regionLandArchives[var1] == null) { // L: 5280 - var0 = false; // L: 5281 - ++Client.field541; // L: 5282 - } - } - - if (Message.regionLandArchiveIds[var1] != -1 && Occluder.regionMapArchives[var1] == null) { // L: 5286 5287 - Occluder.regionMapArchives[var1] = class302.archive5.takeFileEncrypted(Message.regionLandArchiveIds[var1], 0, Message.xteaKeys[var1]); // L: 5288 - if (Occluder.regionMapArchives[var1] == null) { // L: 5289 - var0 = false; // L: 5290 - ++Client.field541; // L: 5291 - } - } - } - - if (!var0) { // L: 5296 - Client.field545 = 1; // L: 5297 - } else { - Client.field543 = 0; // L: 5300 - var0 = true; // L: 5301 - - int var3; - int var4; - for (var1 = 0; var1 < WorldMapSectionType.regionLandArchives.length; ++var1) { // L: 5302 - byte[] var15 = Occluder.regionMapArchives[var1]; // L: 5303 - if (var15 != null) { // L: 5304 - var3 = (class123.regions[var1] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5305 - var4 = (class123.regions[var1] & 255) * 64 - class250.baseY; // L: 5306 - if (Client.isInInstance) { // L: 5307 - var3 = 10; // L: 5308 - var4 = 10; // L: 5309 - } - - var0 &= class67.method1879(var15, var3, var4); // L: 5311 - } - } - - if (!var0) { // L: 5314 - Client.field545 = 2; // L: 5315 - } else { - if (Client.field545 != 0) { // L: 5318 - class119.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - MouseHandler.playPcmPlayers(); // L: 5319 - FriendSystem.scene.clear(); // L: 5320 - - for (var1 = 0; var1 < 4; ++var1) { // L: 5321 - Client.collisionMaps[var1].clear(); - } - - int var2; - for (var1 = 0; var1 < 4; ++var1) { // L: 5322 - for (var2 = 0; var2 < 104; ++var2) { // L: 5323 - for (var3 = 0; var3 < 104; ++var3) { // L: 5324 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5325 - } - } - } - - MouseHandler.playPcmPlayers(); // L: 5329 - Tile.method3992(); // L: 5330 - var1 = WorldMapSectionType.regionLandArchives.length; // L: 5331 - Players.method2419(); // L: 5332 - class286.method5548(true); // L: 5333 - int var5; - if (!Client.isInInstance) { // L: 5334 - byte[] var14; - for (var2 = 0; var2 < var1; ++var2) { // L: 5335 - var3 = (class123.regions[var2] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5336 - var4 = (class123.regions[var2] & 255) * 64 - class250.baseY; // L: 5337 - var14 = WorldMapSectionType.regionLandArchives[var2]; // L: 5338 - if (var14 != null) { // L: 5339 - MouseHandler.playPcmPlayers(); // L: 5340 - ChatChannel.method1991(var14, var3, var4, class193.field2197 * 8 - 48, class221.field2647 * 8 - 48, Client.collisionMaps); // L: 5341 - } - } - - for (var2 = 0; var2 < var1; ++var2) { // L: 5344 - var3 = (class123.regions[var2] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5345 - var4 = (class123.regions[var2] & 255) * 64 - class250.baseY; // L: 5346 - var14 = WorldMapSectionType.regionLandArchives[var2]; // L: 5347 - if (var14 == null && class221.field2647 < 800) { // L: 5348 - MouseHandler.playPcmPlayers(); // L: 5349 - WorldMapEvent.method5136(var3, var4, 64, 64); // L: 5350 - } - } - - class286.method5548(true); // L: 5353 - - for (var2 = 0; var2 < var1; ++var2) { // L: 5354 - byte[] var13 = Occluder.regionMapArchives[var2]; // L: 5355 - if (var13 != null) { // L: 5356 - var4 = (class123.regions[var2] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5357 - var5 = (class123.regions[var2] & 255) * 64 - class250.baseY; // L: 5358 - MouseHandler.playPcmPlayers(); // L: 5359 - Canvas.method388(var13, var4, var5, FriendSystem.scene, Client.collisionMaps); // L: 5360 - } - } - } - - int var6; - int var7; - int var8; - if (Client.isInInstance) { // L: 5364 - int var9; - int var10; - int var11; - for (var2 = 0; var2 < 4; ++var2) { // L: 5365 - MouseHandler.playPcmPlayers(); // L: 5366 - - for (var3 = 0; var3 < 13; ++var3) { // L: 5367 - for (var4 = 0; var4 < 13; ++var4) { // L: 5368 - boolean var16 = false; // L: 5369 - var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5370 - if (var6 != -1) { // L: 5371 - var7 = var6 >> 24 & 3; // L: 5372 - var8 = var6 >> 1 & 3; // L: 5373 - var9 = var6 >> 14 & 1023; // L: 5374 - var10 = var6 >> 3 & 2047; // L: 5375 - var11 = (var9 / 8 << 8) + var10 / 8; // L: 5376 - - for (int var12 = 0; var12 < class123.regions.length; ++var12) { // L: 5377 - if (class123.regions[var12] == var11 && WorldMapSectionType.regionLandArchives[var12] != null) { // L: 5378 - WorldMapScaleHandler.method5135(WorldMapSectionType.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5379 - var16 = true; // L: 5380 - break; - } - } - } - - if (!var16) { // L: 5385 - class126.method2820(var2, var3 * 8, var4 * 8); // L: 5386 - } - } - } - } - - for (var2 = 0; var2 < 13; ++var2) { // L: 5391 - for (var3 = 0; var3 < 13; ++var3) { // L: 5392 - var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5393 - if (var4 == -1) { // L: 5394 - WorldMapEvent.method5136(var2 * 8, var3 * 8, 8, 8); // L: 5395 - } - } - } - - class286.method5548(true); // L: 5399 - - for (var2 = 0; var2 < 4; ++var2) { // L: 5400 - MouseHandler.playPcmPlayers(); // L: 5401 - - for (var3 = 0; var3 < 13; ++var3) { // L: 5402 - for (var4 = 0; var4 < 13; ++var4) { // L: 5403 - var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5404 - if (var5 != -1) { // L: 5405 - var6 = var5 >> 24 & 3; // L: 5406 - var7 = var5 >> 1 & 3; // L: 5407 - var8 = var5 >> 14 & 1023; // L: 5408 - var9 = var5 >> 3 & 2047; // L: 5409 - var10 = (var8 / 8 << 8) + var9 / 8; // L: 5410 - - for (var11 = 0; var11 < class123.regions.length; ++var11) { // L: 5411 - if (class123.regions[var11] == var10 && Occluder.regionMapArchives[var11] != null) { // L: 5412 - Tiles.method2006(Occluder.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, FriendSystem.scene, Client.collisionMaps); // L: 5413 - break; // L: 5414 - } - } - } - } - } - } - } - - class286.method5548(true); // L: 5422 - MouseHandler.playPcmPlayers(); // L: 5423 - Renderable.method4310(FriendSystem.scene, Client.collisionMaps); // L: 5424 - class286.method5548(true); // L: 5425 - var2 = Tiles.Tiles_minPlane; // L: 5426 - if (var2 > class160.Client_plane) { // L: 5427 - var2 = class160.Client_plane; - } - - if (var2 < class160.Client_plane - 1) { // L: 5428 - var2 = class160.Client_plane - 1; - } - - if (Client.isLowDetail) { // L: 5429 - FriendSystem.scene.init(Tiles.Tiles_minPlane); - } else { - FriendSystem.scene.init(0); // L: 5430 - } - - for (var3 = 0; var3 < 104; ++var3) { // L: 5431 - for (var4 = 0; var4 < 104; ++var4) { // L: 5432 - class162.updateItemPile(var3, var4); // L: 5433 - } - } - - MouseHandler.playPcmPlayers(); // L: 5436 - Projectile.method1957(); // L: 5437 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5438 - PacketBufferNode var17; - if (UserComparator10.client.hasFrame()) { // L: 5439 - var17 = ItemContainer.getPacketBufferNode(ClientPacket.field2938, Client.packetWriter.isaacCipher); // L: 5441 - var17.packetBuffer.writeInt(1057001181); // L: 5442 - Client.packetWriter.addNode(var17); // L: 5443 - } - - if (!Client.isInInstance) { // L: 5445 - var3 = (class193.field2197 - 6) / 8; // L: 5446 - var4 = (class193.field2197 + 6) / 8; // L: 5447 - var5 = (class221.field2647 - 6) / 8; // L: 5448 - var6 = (class221.field2647 + 6) / 8; // L: 5449 - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5450 - for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5451 - if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5452 - class302.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5453 - class302.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5454 - } - } - } - } - - InterfaceParent.updateGameState(30); // L: 5458 - MouseHandler.playPcmPlayers(); // L: 5459 - ScriptEvent.method2111(); // L: 5460 - var17 = ItemContainer.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 5461 - Client.packetWriter.addNode(var17); // L: 5462 - class78.method2098(); // L: 5463 - } - } - } // L: 5298 5316 5464 - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "465119855" - ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7442 - if (Client.isLowDetail && var0 != class160.Client_plane) { // L: 7443 - return; - } - - long var7 = 0L; // L: 7444 - boolean var9 = true; // L: 7445 - boolean var10 = false; // L: 7446 - boolean var11 = false; // L: 7447 - if (var1 == 0) { // L: 7448 - var7 = FriendSystem.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 7449 - var7 = FriendSystem.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 7450 - var7 = FriendSystem.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 7451 - var7 = FriendSystem.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { // L: 7452 - var12 = FriendSystem.scene.getObjectFlags(var0, var2, var3, var7); // L: 7453 - int var38 = class121.Entity_unpackID(var7); // L: 7454 - int var39 = var12 & 31; // L: 7455 - int var40 = var12 >> 6 & 3; // L: 7456 - ObjectComposition var13; - if (var1 == 0) { // L: 7457 - FriendSystem.scene.removeBoundaryObject(var0, var2, var3); // L: 7458 - var13 = class116.getObjectDefinition(var38); // L: 7459 - if (var13.interactType != 0) { // L: 7460 - Client.collisionMaps[var0].method3843(var2, var3, var39, var40, var13.boolean1); - } - } - - if (var1 == 1) { // L: 7462 - FriendSystem.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 7463 - FriendSystem.scene.removeGameObject(var0, var2, var3); // L: 7464 - var13 = class116.getObjectDefinition(var38); // L: 7465 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7466 - return; - } - - if (var13.interactType != 0) { // L: 7467 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); - } - } - - if (var1 == 3) { // L: 7469 - FriendSystem.scene.removeFloorDecoration(var0, var2, var3); // L: 7470 - var13 = class116.getObjectDefinition(var38); // L: 7471 - if (var13.interactType == 1) { // L: 7472 - Client.collisionMaps[var0].method3846(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 7475 - var12 = var0; // L: 7476 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7477 - var12 = var0 + 1; - } - - Scene var41 = FriendSystem.scene; // L: 7478 - CollisionMap var14 = Client.collisionMaps[var0]; // L: 7479 - ObjectComposition var15 = class116.getObjectDefinition(var4); // L: 7481 - int var16; - int var17; - if (var5 != 1 && var5 != 3) { // L: 7484 - var16 = var15.sizeX; // L: 7489 - var17 = var15.sizeY; // L: 7490 - } else { - var16 = var15.sizeY; // L: 7485 - var17 = var15.sizeX; // L: 7486 - } - - int var18; - int var19; - if (var16 + var2 <= 104) { // L: 7496 - var18 = (var16 >> 1) + var2; // L: 7497 - var19 = var2 + (var16 + 1 >> 1); // L: 7498 - } else { - var18 = var2; // L: 7501 - var19 = var2 + 1; // L: 7502 - } - - int var20; - int var21; - if (var3 + var17 <= 104) { // L: 7504 - var20 = var3 + (var17 >> 1); // L: 7505 - var21 = var3 + (var17 + 1 >> 1); // L: 7506 - } else { - var20 = var3; // L: 7509 - var21 = var3 + 1; // L: 7510 - } - - int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7512 - int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; // L: 7513 - int var24 = (var2 << 7) + (var16 << 6); // L: 7514 - int var25 = (var3 << 7) + (var17 << 6); // L: 7515 - long var26 = MilliClock.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7516 - int var28 = (var5 << 6) + var6; // L: 7517 - if (var15.int3 == 1) { // L: 7518 - var28 += 256; - } - - Object var36; - if (var6 == 22) { // L: 7519 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7521 - var36 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7522 - } - - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7523 - if (var15.interactType == 1) { // L: 7524 - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { // L: 7527 - if (var6 >= 12) { // L: 7535 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7537 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7538 - } - - var41.method4138(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7539 - if (var15.interactType != 0) { // L: 7540 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { // L: 7543 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7545 - var36 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7546 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field988[var5], 0, var26, var28); // L: 7547 - if (var15.interactType != 0) { // L: 7548 - var14.method3838(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { // L: 7551 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7553 - var36 = var15.getModel(1, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7554 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7555 - if (var15.interactType != 0) { // L: 7556 - var14.method3838(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var29; - if (var6 == 2) { // L: 7559 - var29 = var5 + 1 & 3; // L: 7560 - Object var31; - Object var37; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7563 - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7564 - var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7565 - } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7568 - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7569 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field988[var5], Tiles.field988[var29], var26, var28); // L: 7571 - if (var15.interactType != 0) { // L: 7572 - var14.method3838(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { // L: 7575 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7577 - var36 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7578 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7579 - if (var15.interactType != 0) { // L: 7580 - var14.method3838(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { // L: 7583 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7585 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7586 - } - - var41.method4138(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7587 - if (var15.interactType != 0) { // L: 7588 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { // L: 7591 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7593 - var36 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7594 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field988[var5], 0, 0, 0, var26, var28); // L: 7595 - } else { - long var30; - Object var32; - if (var6 == 5) { // L: 7598 - var29 = 16; // L: 7599 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7600 - if (0L != var30) { // L: 7601 - var29 = class116.getObjectDefinition(class121.Entity_unpackID(var30)).int2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7603 - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7604 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field988[var5], 0, var29 * Tiles.field990[var5], var29 * Tiles.field991[var5], var26, var28); // L: 7605 - } else if (var6 == 6) { // L: 7608 - var29 = 8; // L: 7609 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7610 - if (0L != var30) { // L: 7611 - var29 = class116.getObjectDefinition(class121.Entity_unpackID(var30)).int2 / 2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7613 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7614 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1000[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7615 - } else if (var6 == 7) { // L: 7618 - int var35 = var5 + 2 & 3; // L: 7620 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7621 - var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7622 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7623 - } else if (var6 == 8) { // L: 7626 - var29 = 8; // L: 7627 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7628 - if (0L != var30) { // L: 7629 - var29 = class116.getObjectDefinition(class121.Entity_unpackID(var30)).int2 / 2; - } - - int var34 = var5 + 2 & 3; // L: 7632 - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7633 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7634 - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7635 - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7638 - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7639 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1000[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7641 - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { // L: 7529 - var36 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7530 - } - - if (var36 != null) { // L: 7531 - var41.method4138(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { // L: 7532 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } - } - } - - } // L: 7646 - - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(Lkn;Lgz;IIZI)V", - garbageValue = "-1597453701" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 10374 - byte var6 = -1; // L: 10375 - String var7 = null; // L: 10376 - if (var5 != null && var5[var3] != null) { // L: 10377 - if (var3 == 0) { // L: 10378 - var6 = 33; - } else if (var3 == 1) { // L: 10379 - var6 = 34; - } else if (var3 == 2) { - var6 = 35; // L: 10380 - } else if (var3 == 3) { // L: 10381 - var6 = 36; - } else { - var6 = 37; // L: 10382 - } - - var7 = var5[var3]; // L: 10383 - } else if (var3 == 4) { // L: 10386 - var6 = 37; // L: 10387 - var7 = "Drop"; // L: 10388 - } - - if (var6 != -1 && var7 != null) { // L: 10391 - DynamicObject.insertMenuItem(var7, ChatChannel.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10392 - } - - } // L: 10394 } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 99ec275f3c..5eb131ace3 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ig") +@ObfuscatedName("id") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { @ObfuscatedName("v") @@ -20,7 +20,7 @@ public class DirectWrapper extends Wrapper { return this.obj; // L: 12 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isSoft") boolean isSoft() { return false; // L: 16 diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 0c58192e54..54bb69c86f 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("oh") +@ObfuscatedName("oz") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cs") + @ObfuscatedName("cd") @Export("keyDual") public long keyDual; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("ce") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("dh") + @ObfuscatedName("de") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 144cb2489a..b73866baab 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("lv") +@ObfuscatedName("la") @Implements("DualNodeDeque") public final class DualNodeDeque { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("sentinel") DualNode sentinel; @@ -21,7 +21,7 @@ public final class DualNodeDeque { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Loh;)V" + descriptor = "(Loz;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Loh;)V" + descriptor = "(Loz;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Loh;" + descriptor = "()Loz;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index f1a4b8b1d7..b61f2906e7 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,77 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bc") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("az") + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lfx;" ) - static Bounds field973; - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "[Lql;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("hp") + @Export("regionMapArchives") + static byte[][] regionMapArchives; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 554829183 + intValue = 920193097 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 991387999 + intValue = -1286565411 ) @Export("type") int type; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 736345731 + intValue = -971153847 ) @Export("orientation") int orientation; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -831272437 + intValue = 326052965 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 270984957 + intValue = -1315093071 ) @Export("x") int x; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1149406205 + intValue = 255854397 ) @Export("y") int y; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lgw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -895172373 + intValue = 896717489 ) @Export("frame") int frame; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1887106399 + intValue = 131494325 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLgh;)V" + descriptor = "(IIIIIIIZLix;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; // L: 20 @@ -84,12 +82,12 @@ public class DynamicObject extends Renderable { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = ItemContainer.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = class163.SequenceDefinition_get(var7); // L: 27 this.frame = 0; // L: 28 this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field2172 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + if (this.sequenceDefinition.field2161 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 DynamicObject var10 = (DynamicObject)var9; // L: 31 - if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 + if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 this.frame = var10.frame; // L: 33 this.cycleStart = var10.cycleStart; // L: 34 return; // L: 35 @@ -101,17 +99,17 @@ public class DynamicObject extends Renderable { this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 40 this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 41 } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3827()); // L: 44 + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3844()); // L: 44 } } } } // L: 48 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" + descriptor = "(B)Liq;", + garbageValue = "103" ) @Export("getModel") protected final Model getModel() { @@ -123,40 +121,40 @@ public class DynamicObject extends Renderable { } if (this.sequenceDefinition.isCachedModelIdSet()) { // L: 54 - var2 = this.sequenceDefinition.method3827(); // L: 68 - this.frame += var1; - var1 = 0; - if (this.frame >= var2) { - this.frame = var2 - this.sequenceDefinition.frameCount; - if (this.frame < 0 || this.frame > var2) { - this.sequenceDefinition = null; + var2 = this.sequenceDefinition.method3844(); // L: 68 + this.frame += var1; // L: 69 + var1 = 0; // L: 70 + if (this.frame >= var2) { // L: 71 + this.frame = var2 - this.sequenceDefinition.frameCount; // L: 72 + if (this.frame < 0 || this.frame > var2) { // L: 73 + this.sequenceDefinition = null; // L: 74 } } } else { - label78: { + label79: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55 - break label78; + break label79; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56 - ++this.frame; + ++this.frame; // L: 57 } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 58 - this.frame -= this.sequenceDefinition.frameCount; + this.frame -= this.sequenceDefinition.frameCount; // L: 59 } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 60 - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 61 } } this.cycleStart = Client.cycle - var1; // L: 78 } - ObjectComposition var12 = class116.getObjectDefinition(this.id); // L: 80 - if (var12.transforms != null) { // L: 81 - var12 = var12.transform(); + ObjectComposition var12 = class146.getObjectDefinition(this.id); // L: 80 + if (var12.transforms != null) { + var12 = var12.transform(); // L: 81 } if (var12 == null) { // L: 82 @@ -176,293 +174,52 @@ public class DynamicObject extends Renderable { int var6 = (var3 >> 1) + this.y; // L: 95 int var7 = (var3 + 1 >> 1) + this.y; // L: 96 int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 97 - int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; // L: 98 + int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; // L: 98 int var10 = (this.x << 7) + (var2 << 6); // L: 99 int var11 = (this.y << 7) + (var3 << 6); // L: 100 return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 101 } } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpd;II)Ljava/lang/String;", - garbageValue = "-255046682" + descriptor = "(B)V", + garbageValue = "57" ) - static String method1988(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); // L: 69 - if (var2 > var1) { // L: 70 - var2 = var1; - } - - byte[] var3 = new byte[var2]; // L: 71 - var0.offset += class282.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 72 - String var4 = class113.decodeStringCp1252(var3, 0, var2); // L: 73 - return var4; // L: 74 - } catch (Exception var6) { // L: 76 - return "Cabbage"; // L: 77 - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-429735944" - ) - public static int method1987(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 57 - int var1 = (int)(var2 >>> 0 & 127L); // L: 59 - return var1; // L: 61 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "2084684475" - ) - static final void method1985(String var0, int var1) { - PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2924, Client.packetWriter.isaacCipher); // L: 228 - var2.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 229 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 230 - var2.packetBuffer.method7787(var1); // L: 231 - Client.packetWriter.addNode(var2); // L: 232 - } // L: 233 - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(ZLpy;S)V", - garbageValue = "176" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field634 = 0; // L: 7687 - Client.field609 = 0; // L: 7688 - class385.method7028(); // L: 7689 - SecureRandomCallable.method2066(var0, var1); // L: 7690 - - int var2; - int var3; - for (var2 = 0; var2 < Client.field609; ++var2) { // L: 7692 - var3 = Client.field533[var2]; // L: 7693 - NPC var4 = Client.npcs[var3]; // L: 7694 - int var5 = var1.readUnsignedByte(); // L: 7695 - int var6; - if (class162.field1768 && (var5 & 64) != 0) { // L: 7696 - var6 = var1.readUnsignedByte(); // L: 7697 - var5 += var6 << 8; // L: 7698 - } - - int var7; - int var8; - int var9; - if ((var5 & 1) != 0) { // L: 7700 - var6 = var1.readUnsignedShort(); // L: 7701 - var7 = var1.method7971(); // L: 7702 - if (class162.field1768) { // L: 7703 - var4.field1183 = var1.method7789() == 1; // L: 7704 - } - - var8 = var4.x - (var6 - ApproximateRouteStrategy.baseX - ApproximateRouteStrategy.baseX) * 64; // L: 7706 - var9 = var4.y - (var7 - class250.baseY - class250.baseY) * 64; // L: 7707 - if (var8 != 0 || var9 != 0) { // L: 7708 - var4.field1160 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; - } - } - - if ((var5 & 1024) != 0) { // L: 7710 - var4.field1161 = var1.readInt(); // L: 7711 - } - - if ((var5 & 16) != 0) { // L: 7713 - var4.spotAnimation = var1.readUnsignedShort(); // L: 7714 - var6 = var1.readInt(); // L: 7715 - var4.spotAnimationHeight = var6 >> 16; // L: 7716 - var4.field1173 = (var6 & 65535) + Client.cycle; // L: 7717 - var4.spotAnimationFrame = 0; // L: 7718 - var4.spotAnimationFrameCycle = 0; // L: 7719 - if (var4.field1173 > Client.cycle) { // L: 7720 - var4.spotAnimationFrame = -1; - } - - if (var4.spotAnimation == 65535) { // L: 7721 - var4.spotAnimation = -1; - } - } - - if ((var5 & 128) != 0) { // L: 7723 - var6 = var1.readUnsignedByte(); // L: 7724 - int var10; - int var11; - int var12; - if (var6 > 0) { // L: 7725 - for (var7 = 0; var7 < var6; ++var7) { // L: 7726 - var9 = -1; // L: 7728 - var10 = -1; // L: 7729 - var11 = -1; // L: 7730 - var8 = var1.readUShortSmart(); // L: 7731 - if (var8 == 32767) { // L: 7732 - var8 = var1.readUShortSmart(); // L: 7733 - var10 = var1.readUShortSmart(); // L: 7734 - var9 = var1.readUShortSmart(); // L: 7735 - var11 = var1.readUShortSmart(); // L: 7736 - } else if (var8 != 32766) { // L: 7738 - var10 = var1.readUShortSmart(); // L: 7739 - } else { - var8 = -1; // L: 7741 - } - - var12 = var1.readUShortSmart(); // L: 7742 - var4.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); // L: 7743 - } - } - - var7 = var1.method7790(); // L: 7746 - if (var7 > 0) { // L: 7747 - for (var8 = 0; var8 < var7; ++var8) { // L: 7748 - var9 = var1.readUShortSmart(); // L: 7749 - var10 = var1.readUShortSmart(); // L: 7750 - if (var10 != 32767) { // L: 7751 - var11 = var1.readUShortSmart(); // L: 7752 - var12 = var1.readUnsignedByte(); // L: 7753 - int var13 = var10 > 0 ? var1.method7789() : var12; // L: 7754 - var4.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); // L: 7755 - } else { - var4.removeHealthBar(var9); // L: 7757 - } - } - } - } - - if (class162.field1768 && (var5 & 256) != 0 || !class162.field1768 && (var5 & 64) != 0) { // L: 7761 - var4.field1175 = var1.method7925(); // L: 7762 - var4.field1177 = var1.method7792(); // L: 7763 - var4.field1176 = var1.readByte(); // L: 7764 - var4.field1178 = var1.readByte(); // L: 7765 - var4.field1179 = var1.method7971() + Client.cycle; // L: 7766 - var4.field1180 = var1.readUnsignedShort() + Client.cycle; // L: 7767 - var4.field1181 = var1.method7971(); // L: 7768 - var4.pathLength = 1; // L: 7769 - var4.field1134 = 0; // L: 7770 - var4.field1175 += var4.pathX[0]; // L: 7771 - var4.field1177 += var4.pathY[0]; // L: 7772 - var4.field1176 += var4.pathX[0]; // L: 7773 - var4.field1178 += var4.pathY[0]; // L: 7774 - } - - if ((var5 & 512) != 0) { // L: 7776 - var4.field1133 = Client.cycle + var1.method7798(); // L: 7777 - var4.field1185 = Client.cycle + var1.method7935(); // L: 7778 - var4.field1146 = var1.readByte(); // L: 7779 - var4.field1187 = var1.method7792(); // L: 7780 - var4.field1188 = var1.method7792(); // L: 7781 - var4.field1189 = (byte)var1.method7927(); // L: 7782 - } - - if ((var5 & 2) != 0) { // L: 7784 - var4.overheadText = var1.readStringCp1252NullTerminated(); // L: 7785 - var4.overheadTextCyclesRemaining = 100; // L: 7786 - } - - if ((var5 & 4) != 0) { // L: 7788 - var4.targetIndex = var1.method7935(); // L: 7789 - if (var4.targetIndex == 65535) { // L: 7790 - var4.targetIndex = -1; - } - } - - if ((var5 & 32) != 0) { // L: 7792 - var4.definition = class9.getNpcDefinition(var1.method7971()); // L: 7793 - var4.field1145 = var4.definition.size; // L: 7794 - var4.field1192 = var4.definition.rotation; // L: 7795 - var4.walkSequence = var4.definition.walkSequence; // L: 7796 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7797 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7798 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7799 - var4.idleSequence = var4.definition.idleSequence; // L: 7800 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7801 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7802 - } - - if ((var5 & 8) != 0) { // L: 7804 - var6 = var1.method7798(); // L: 7805 - if (var6 == 65535) { // L: 7806 - var6 = -1; // L: 7807 - } - - var7 = var1.method7789(); // L: 7809 - if (var6 == var4.sequence && var6 != -1) { // L: 7810 - var8 = ItemContainer.SequenceDefinition_get(var6).field2172; // L: 7811 - if (var8 == 1) { // L: 7812 - var4.sequenceFrame = 0; // L: 7813 - var4.sequenceFrameCycle = 0; // L: 7814 - var4.sequenceDelay = var7; // L: 7815 - var4.field1169 = 0; // L: 7816 - } - - if (var8 == 2) { // L: 7818 - var4.field1169 = 0; // L: 7819 - } - } else if (var6 == -1 || var4.sequence == -1 || ItemContainer.SequenceDefinition_get(var6).field2166 >= ItemContainer.SequenceDefinition_get(var4.sequence).field2166) { // L: 7822 - var4.sequence = var6; // L: 7823 - var4.sequenceFrame = 0; // L: 7824 - var4.sequenceFrameCycle = 0; // L: 7825 - var4.sequenceDelay = var7; // L: 7826 - var4.field1169 = 0; // L: 7827 - var4.field1134 = var4.pathLength; // L: 7828 - } - } - } - - for (var2 = 0; var2 < Client.field634; ++var2) { // L: 7834 - var3 = Client.field612[var2]; // L: 7835 - if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7836 - Client.npcs[var3].definition = null; // L: 7837 - Client.npcs[var3] = null; // L: 7838 - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7841 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + static void method2003() { + Login.Login_username = Login.Login_username.trim(); // L: 1152 + if (Login.Login_username.length() == 0) { // L: 1153 + class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1154 } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7842 - if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7843 - throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7844 - } + long var1 = World.method1678(); // L: 1158 + int var0; + if (0L == var1) { // L: 1159 + var0 = 5; + } else { + var0 = WorldMapSectionType.method4312(var1, Login.Login_username); // L: 1160 + } + + switch(var0) { // L: 1161 + case 2: + class4.setLoginResponseString(Strings.field3628, Strings.field3870, Strings.field3646); // L: 1169 + Ignored.method6828(6); // L: 1170 + break; // L: 1171 + case 3: + class4.setLoginResponseString("", "Error connecting to server.", ""); // L: 1173 + break; // L: 1174 + case 4: + class4.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1166 + break; // L: 1167 + case 5: + class4.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1163 + break; + case 6: + class4.setLoginResponseString("", "Error connecting to server.", ""); // L: 1179 + break; + case 7: + class4.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 1176 } } - } // L: 7847 - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "-4" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 9218 - if (Client.menuOptionsCount < 500) { // L: 9219 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 9220 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9221 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9222 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9223 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9224 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9225 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9226 - ++Client.menuOptionsCount; // L: 9227 - } - - } - } // L: 9229 - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-403331915" - ) - static final void method1982(int var0, int var1, int var2, boolean var3) { - if (MusicPatchNode2.loadInterface(var0)) { // L: 10165 - class65.resizeInterface(EnumComposition.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10166 - } - } // L: 10167 + } // L: 1155 1182 } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 17a06fc6c1..32bc0be8e4 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,55 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fs") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lln;" + ) + @Export("EnumDefinition_archive") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lig;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[[Lkn;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("iq") - @ObfuscatedGetter( - intValue = 1021472065 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("inputType") public char inputType; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("outputType") public char outputType; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("defaultStr") public String defaultStr; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 345435135 + intValue = 1966559045 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 123601371 + intValue = 1434238149 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("keys") public int[] keys; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("intVals") public int[] intVals; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("strVals") public String[] strVals; @@ -65,70 +59,85 @@ public class EnumComposition extends DualNode { this.outputCount = 0; // L: 17 } // L: 22 - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-701511419" + descriptor = "(Lpi;B)V", + garbageValue = "-91" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 36 - if (var2 == 0) { // L: 37 - return; // L: 40 + int var2 = var1.readUnsignedByte(); // L: 40 + if (var2 == 0) { // L: 41 + return; // L: 44 } - this.decodeNext(var1, var2); // L: 38 + this.decodeNext(var1, var2); // L: 42 } } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "1" + descriptor = "(Lpi;II)V", + garbageValue = "-2119565699" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 43 + if (var2 == 1) { // L: 47 this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { // L: 44 + } else if (var2 == 2) { // L: 48 this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 45 + } else if (var2 == 3) { // L: 49 this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 46 + } else if (var2 == 4) { // L: 50 this.defaultInt = var1.readInt(); } else { int var3; - if (var2 == 5) { // L: 47 - this.outputCount = var1.readUnsignedShort(); // L: 48 - this.keys = new int[this.outputCount]; // L: 49 - this.strVals = new String[this.outputCount]; // L: 50 + if (var2 == 5) { // L: 51 + this.outputCount = var1.readUnsignedShort(); // L: 52 + this.keys = new int[this.outputCount]; // L: 53 + this.strVals = new String[this.outputCount]; // L: 54 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51 - this.keys[var3] = var1.readInt(); // L: 52 - this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 + this.keys[var3] = var1.readInt(); // L: 56 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 } - } else if (var2 == 6) { // L: 56 - this.outputCount = var1.readUnsignedShort(); // L: 57 - this.keys = new int[this.outputCount]; // L: 58 - this.intVals = new int[this.outputCount]; // L: 59 + } else if (var2 == 6) { // L: 60 + this.outputCount = var1.readUnsignedShort(); // L: 61 + this.keys = new int[this.outputCount]; // L: 62 + this.intVals = new int[this.outputCount]; // L: 63 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60 - this.keys[var3] = var1.readInt(); // L: 61 - this.intVals[var3] = var1.readInt(); // L: 62 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 + this.keys[var3] = var1.readInt(); // L: 65 + this.intVals[var3] = var1.readInt(); // L: 66 } } } - } // L: 66 + } // L: 70 - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1309113097" + descriptor = "(B)I", + garbageValue = "1" ) @Export("size") public int size() { - return this.outputCount; // L: 69 + return this.outputCount; // L: 73 } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lky;IIII)V", + garbageValue = "-585894477" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3417 == null) { // L: 1012 + throw new RuntimeException(); // L: 1013 + } else { + var0.field3417[var1] = var2; // L: 1015 + var0.field3418[var1] = var3; // L: 1016 + } + } // L: 1017 } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 7746701439..6c205799a6 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,30 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("ig") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("capacity") int capacity; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmr;" ) @Export("deque") IterableDualNodeQueue deque; @@ -46,59 +46,59 @@ public final class EvictingDualNodeHashTable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Loh;" + descriptor = "(J)Loz;" ) @Export("get") public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 24 - if (var3 != null) { // L: 25 - this.deque.add(var3); // L: 26 + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 + if (var3 != null) { // L: 24 + this.deque.add(var3); // L: 25 } - return var3; // L: 29 + return var3; // L: 28 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("remove") public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 33 - if (var3 != null) { // L: 34 - var3.remove(); // L: 35 - var3.removeDual(); // L: 36 - ++this.remainingCapacity; // L: 37 + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 + if (var3 != null) { // L: 33 + var3.remove(); // L: 34 + var3.removeDual(); // L: 35 + ++this.remainingCapacity; // L: 36 } - } // L: 39 + } // L: 38 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Loh;J)V" + descriptor = "(Loz;J)V" ) @Export("put") public void put(DualNode var1, long var2) { - if (this.remainingCapacity == 0) { // L: 42 - DualNode var4 = this.deque.removeLast(); // L: 43 - var4.remove(); // L: 44 - var4.removeDual(); // L: 45 - if (var4 == this.dualNode) { // L: 46 - var4 = this.deque.removeLast(); // L: 47 - var4.remove(); // L: 48 - var4.removeDual(); // L: 49 + if (this.remainingCapacity == 0) { // L: 41 + DualNode var4 = this.deque.removeLast(); // L: 42 + var4.remove(); // L: 43 + var4.removeDual(); // L: 44 + if (var4 == this.dualNode) { // L: 45 + var4 = this.deque.removeLast(); // L: 46 + var4.remove(); // L: 47 + var4.removeDual(); // L: 48 } } else { - --this.remainingCapacity; // L: 52 + --this.remainingCapacity; // L: 51 } - this.hashTable.put(var1, var2); // L: 53 - this.deque.add(var1); // L: 54 - } // L: 55 + this.hashTable.put(var1, var2); // L: 52 + this.deque.add(var1); // L: 53 + } // L: 54 - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("clear") public void clear() { - this.deque.clear(); // L: 58 - this.hashTable.clear(); // L: 59 - this.dualNode = new DualNode(); // L: 60 - this.remainingCapacity = this.capacity; // L: 61 - } // L: 62 + this.deque.clear(); // L: 57 + this.hashTable.clear(); // L: 58 + this.dualNode = new DualNode(); // L: 59 + this.remainingCapacity = this.capacity; // L: 60 + } // L: 61 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 8ae645e13c..c0073a8526 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -2,39 +2,34 @@ 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("gc") +@ObfuscatedName("ia") @Implements("FaceNormal") public class FaceNormal { + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -360796493 + ) + static int field2664; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1581281175 + intValue = 1964753239 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1155482083 + intValue = 538442569 ) @Export("y") int y; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 990620569 + intValue = 708188277 ) @Export("z") int z; FaceNormal() { } // L: 8 - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "12" - ) - static int method4313(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3837 - } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index ec557b5b7f..9009f8dd69 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fu") +@ObfuscatedName("fm") @Implements("FileSystem") public class FileSystem { @ObfuscatedName("v") @Export("FileSystem_hasPermissions") - public static boolean FileSystem_hasPermissions; - @ObfuscatedName("h") + static boolean FileSystem_hasPermissions; + @ObfuscatedName("i") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; @@ -17,4 +17,10 @@ public class FileSystem { FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); } // L: 9 + + @ObfuscatedName("b") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 65 + } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index ef09eb96cf..e6271c05a4 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,73 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qs") +@ObfuscatedName("qe") @Implements("FillMode") public enum FillMode implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lqs;" + descriptor = "Lqe;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lqs;" + descriptor = "Lqe;" ) - field4698(1, 1), - @ObfuscatedName("h") + field4695(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lqs;" + descriptor = "Lqe;" ) - field4695(2, 2); + field4694(2, 2); - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1649672729 + intValue = 1363476013 ) - public final int field4696; - @ObfuscatedName("l") + public final int field4699; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 774013847 + intValue = -2111018979 ) - final int field4697; + final int field4698; FillMode(int var3, int var4) { - this.field4696 = var3; // L: 19 - this.field4697 = var4; // L: 20 + this.field4699 = var3; // L: 19 + this.field4698 = var4; // L: 20 } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4697; // L: 25 + return this.field4698; // L: 24 } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2114010966" - ) - static void method8155(String var0) { - class429.field4593 = var0; // L: 11828 - - try { - String var1 = UserComparator10.client.getParameter(Integer.toString(18)); // L: 11830 - String var2 = UserComparator10.client.getParameter(Integer.toString(13)); // L: 11831 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11832 - if (var0.length() == 0) { // L: 11833 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - var3 = var3 + "; Expires=" + class160.method3236(WorldMapSprite.method4989() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 11834 - } - - class27.method416(UserComparator10.client, "document.cookie=\"" + var3 + "\""); // L: 11835 - } catch (Throwable var4) { // L: 11837 - } - - } // L: 11838 } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 408e72fee6..6fb84b5db0 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,48 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("hp") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1272026655 + intValue = 330018341 ) @Export("z") int z; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -511933001 + intValue = -1177773149 ) @Export("x") int x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 444068925 + intValue = 541305317 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 8223121448283750647L + longValue = 1757180845189134269L ) @Export("tag") public long tag; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2133308705 + intValue = 1754694829 ) @Export("flags") int flags; @@ -53,99 +47,125 @@ public final class FloorDecoration { FloorDecoration() { } // L: 11 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)Lbr;", - garbageValue = "39" - ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; // L: 237 - return WallDecoration.getNextWorldListWorld(); // L: 238 + @ObfuscatedName("i") + public static int method4592(long var0) { + return (int)(var0 >>> 14 & 3L); // L: 57 } - @ObfuscatedName("c") + @ObfuscatedName("hx") @ObfuscatedSignature( - descriptor = "(Lhx;IIII)Z", - garbageValue = "1779752066" + descriptor = "(IIZI)V", + garbageValue = "718192951" ) - static final boolean method3980(Model var0, int var1, int var2, int var3) { - if (!Client.method1198()) { // L: 99 - return false; - } else { - int var4; - int var5; - int var6; + static final void method4591(int var0, int var1, boolean var2) { + if (!var2 || var0 != ScriptEvent.field1042 || KitDefinition.field1855 != var1) { // L: 5544 + ScriptEvent.field1042 = var0; // L: 5547 + KitDefinition.field1855 = var1; // L: 5548 + Decimator.updateGameState(25); // L: 5549 + MusicPatch.drawLoadingMessage("Loading - please wait.", true); // L: 5550 + int var3 = GrandExchangeOfferOwnWorldComparator.baseX; // L: 5551 + int var4 = VarcInt.baseY; // L: 5552 + GrandExchangeOfferOwnWorldComparator.baseX = (var0 - 6) * 8; // L: 5553 + VarcInt.baseY = (var1 - 6) * 8; // L: 5554 + int var5 = GrandExchangeOfferOwnWorldComparator.baseX - var3; // L: 5555 + int var6 = VarcInt.baseY - var4; // L: 5556 + var3 = GrandExchangeOfferOwnWorldComparator.baseX; // L: 5557 + var4 = VarcInt.baseY; // L: 5558 + int var7; - int var10; - int var11; - int var12; - int var15; - int var16; - if (!ViewportMouse.ViewportMouse_false0) { // L: 101 - var4 = Scene.Scene_cameraPitchSine; // L: 102 - var5 = Scene.Scene_cameraPitchCosine; // L: 103 - var6 = Scene.Scene_cameraYawSine; // L: 104 - var7 = Scene.Scene_cameraYawCosine; // L: 105 - byte var8 = 50; // L: 106 - short var9 = 3500; // L: 107 - var10 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var8 / Rasterizer3D.Rasterizer3D_zoom; // L: 108 - var11 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var8 / Rasterizer3D.Rasterizer3D_zoom; // L: 109 - var12 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; // L: 110 - int var13 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; // L: 111 - int var14 = Rasterizer3D.method4019(var11, var8, var5, var4); // L: 113 - var15 = Rasterizer3D.method4020(var11, var8, var5, var4); // L: 114 - var11 = var14; // L: 115 - var14 = Rasterizer3D.method4019(var13, var9, var5, var4); // L: 116 - var16 = Rasterizer3D.method4020(var13, var9, var5, var4); // L: 117 - var13 = var14; // L: 118 - var14 = Rasterizer3D.method4017(var10, var15, var7, var6); // L: 119 - var15 = Rasterizer3D.method4018(var10, var15, var7, var6); // L: 120 - var10 = var14; // L: 121 - var14 = Rasterizer3D.method4017(var12, var16, var7, var6); // L: 122 - var16 = Rasterizer3D.method4018(var12, var16, var7, var6); // L: 123 - UserComparator7.field1354 = (var14 + var10) / 2; // L: 125 - class21.field108 = (var11 + var13) / 2; // L: 126 - ViewportMouse.field2577 = (var15 + var16) / 2; // L: 127 - ViewportMouse.field2581 = (var14 - var10) / 2; // L: 128 - ViewportMouse.field2579 = (var13 - var11) / 2; // L: 129 - class124.field1520 = (var16 - var15) / 2; // L: 130 - HealthBar.field1251 = Math.abs(ViewportMouse.field2581); // L: 131 - AbstractUserComparator.field4268 = Math.abs(ViewportMouse.field2579); // L: 132 - TaskHandler.field1722 = Math.abs(class124.field1520); // L: 133 + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5559 + NPC var19 = Client.npcs[var7]; // L: 5560 + if (var19 != null) { // L: 5561 + for (var9 = 0; var9 < 10; ++var9) { // L: 5562 + var10000 = var19.pathX; // L: 5563 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5564 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5566 + var19.y -= var6 * 128; // L: 5567 + } } - var4 = var0.xMid + var1; // L: 135 - var5 = var2 + var0.yMid; // L: 136 - var6 = var3 + var0.zMid; // L: 137 - var7 = var0.xMidOffset; // L: 138 - var15 = var0.yMidOffset; // L: 139 - var16 = var0.zMidOffset; // L: 140 - var10 = UserComparator7.field1354 - var4; // L: 141 - var11 = class21.field108 - var5; // L: 142 - var12 = ViewportMouse.field2577 - var6; // L: 143 - if (Math.abs(var10) > var7 + HealthBar.field1251) { // L: 144 - return false; // L: 145 - } else if (Math.abs(var11) > var15 + AbstractUserComparator.field4268) { // L: 147 - return false; // L: 148 - } else if (Math.abs(var12) > var16 + TaskHandler.field1722) { // L: 150 - return false; // L: 151 - } else if (Math.abs(var12 * ViewportMouse.field2579 - var11 * class124.field1520) > var16 * AbstractUserComparator.field4268 + var15 * TaskHandler.field1722) { // L: 153 - return false; // L: 154 - } else if (Math.abs(var10 * class124.field1520 - var12 * ViewportMouse.field2581) > var16 * HealthBar.field1251 + var7 * TaskHandler.field1722) { // L: 156 - return false; // L: 157 - } else { - return Math.abs(var11 * ViewportMouse.field2581 - var10 * ViewportMouse.field2579) <= var15 * HealthBar.field1251 + var7 * AbstractUserComparator.field4268; // L: 159 + for (var7 = 0; var7 < 2048; ++var7) { // L: 5570 + Player var22 = Client.players[var7]; // L: 5571 + if (var22 != null) { // L: 5572 + for (var9 = 0; var9 < 10; ++var9) { // L: 5573 + var10000 = var22.pathX; // L: 5574 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5575 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5577 + var22.y -= var6 * 128; // L: 5578 + } } + + byte var20 = 0; // L: 5581 + byte var8 = 104; // L: 5582 + byte var21 = 1; // L: 5583 + if (var5 < 0) { // L: 5584 + var20 = 103; // L: 5585 + var8 = -1; // L: 5586 + var21 = -1; // L: 5587 + } + + byte var10 = 0; // L: 5589 + byte var11 = 104; // L: 5590 + byte var12 = 1; // L: 5591 + if (var6 < 0) { // L: 5592 + var10 = 103; // L: 5593 + var11 = -1; // L: 5594 + var12 = -1; // L: 5595 + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5597 + for (var14 = var10; var11 != var14; var14 += var12) { // L: 5598 + int var15 = var5 + var13; // L: 5599 + int var16 = var14 + var6; // L: 5600 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5601 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5602 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5603 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5607 5608 5612 + var18.x -= var5; // L: 5609 + var18.y -= var6; // L: 5610 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5611 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5614 + Client.destinationX -= var5; // L: 5615 + Client.destinationY -= var6; // L: 5616 + } + + Client.soundEffectCount = 0; // L: 5618 + Client.isCameraLocked = false; // L: 5619 + WorldMapLabelSize.cameraX -= var5 << 7; // L: 5620 + class154.cameraZ -= var6 << 7; // L: 5621 + class10.oculusOrbFocalPointX -= var5 << 7; // L: 5622 + ClientPacket.oculusOrbFocalPointY -= var6 << 7; // L: 5623 + Client.field714 = -1; // L: 5624 + Client.graphicsObjects.clear(); // L: 5625 + Client.projectiles.clear(); // L: 5626 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5627 + Client.collisionMaps[var14].clear(); + } + } - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1385887599" - ) - static boolean method3981() { - return (Client.drawPlayerNames & 1) != 0; // L: 4434 - } + } // L: 5545 5628 } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 83b84ab57b..2179a1a805 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -1,95 +1,84 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("gc") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("eb") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "Lmr;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("jm") + @ObfuscatedName("u") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1743026493 - ) - static int field2136; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 67638903 + intValue = 858309139 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 222487841 + intValue = -297032293 ) @Export("texture") public int texture; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("hideUnderlay") public boolean hideUnderlay; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1576648291 + intValue = 183406227 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1331174071 + intValue = -769091361 ) @Export("hue") public int hue; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1793349537 + intValue = -1068550667 ) @Export("saturation") public int saturation; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 167555719 + intValue = 539781723 ) @Export("lightness") public int lightness; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -19762575 + intValue = 1744203063 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1484296667 + intValue = -1545602265 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1158289255 + intValue = 658215089 ) @Export("secondaryLightness") public int secondaryLightness; @@ -98,120 +87,120 @@ public class FloorOverlayDefinition extends DualNode { FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public FloorOverlayDefinition() { + FloorOverlayDefinition() { this.primaryRgb = 0; // L: 12 this.texture = -1; // L: 13 this.hideUnderlay = true; // L: 14 this.secondaryRgb = -1; // L: 15 - } + } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1865539852" + garbageValue = "1367888420" ) @Export("postDecode") - public void postDecode() { - if (this.secondaryRgb != -1) { // L: 28 - this.setHsl(this.secondaryRgb); // L: 29 - this.secondaryHue = this.hue; // L: 30 - this.secondarySaturation = this.saturation; // L: 31 - this.secondaryLightness = this.lightness; // L: 32 + void postDecode() { + if (this.secondaryRgb != -1) { // L: 37 + this.setHsl(this.secondaryRgb); // L: 38 + this.secondaryHue = this.hue; // L: 39 + this.secondarySaturation = this.saturation; + this.secondaryLightness = this.lightness; } - this.setHsl(this.primaryRgb); // L: 34 - } // L: 35 + this.setHsl(this.primaryRgb); + } // L: 44 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-1353822747" + descriptor = "(Lpi;II)V", + garbageValue = "1515870395" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 39 - if (var3 == 0) { // L: 40 - return; // L: 43 + int var3 = var1.readUnsignedByte(); + if (var3 == 0) { // L: 49 + return; // L: 52 } - this.decodeNext(var1, var3, var2); // L: 41 + this.decodeNext(var1, var3, var2); } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;IIS)V", - garbageValue = "995" + descriptor = "(Lpi;III)V", + garbageValue = "-343485551" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 46 + if (var2 == 1) { this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { // L: 47 + } else if (var2 == 2) { this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { // L: 48 + } else if (var2 == 5) { // L: 57 this.hideUnderlay = false; } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); // L: 49 - } else if (var2 == 8) { // L: 50 + this.secondaryRgb = var1.readMedium(); // L: 58 + } else if (var2 == 8) { } - } // L: 52 + } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2044852241" + garbageValue = "1828314979" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 55 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 56 - double var6 = (double)(var1 & 255) / 256.0D; // L: 57 - double var8 = var2; // L: 58 - if (var4 < var2) { // L: 59 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; + double var4 = (double)(var1 >> 8 & 255) / 256.0D; + double var6 = (double)(var1 & 255) / 256.0D; + double var8 = var2; + if (var4 < var2) { var8 = var4; } - if (var6 < var8) { // L: 60 + if (var6 < var8) { var8 = var6; } - double var10 = var2; // L: 61 - if (var4 > var2) { // L: 62 + double var10 = var2; + if (var4 > var2) { var10 = var4; } - if (var6 > var10) { // L: 63 + if (var6 > var10) { // L: 72 var10 = var6; } - double var12 = 0.0D; // L: 64 - double var14 = 0.0D; // L: 65 - double var16 = (var10 + var8) / 2.0D; // L: 66 - if (var8 != var10) { // L: 67 - if (var16 < 0.5D) { // L: 68 - var14 = (var10 - var8) / (var10 + var8); + double var12 = 0.0D; + double var14 = 0.0D; + double var16 = (var8 + var10) / 2.0D; + if (var8 != var10) { // L: 76 + if (var16 < 0.5D) { + var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 69 + if (var16 >= 0.5D) { // L: 78 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 70 + if (var10 == var2) { // L: 79 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 71 + } else if (var10 == var4) { // L: 80 var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81 } } - var12 /= 6.0D; + var12 /= 6.0D; // L: 83 this.hue = (int)(var12 * 256.0D); - this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(var16 * 256.0D); + this.saturation = (int)(256.0D * var14); // L: 85 + this.lightness = (int)(256.0D * var16); // L: 86 if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -220,98 +209,129 @@ public class FloorOverlayDefinition extends DualNode { if (this.lightness < 0) { this.lightness = 0; - } else if (this.lightness > 255) { + } else if (this.lightness > 255) { // L: 90 this.lightness = 255; } - } // L: 82 + } // L: 91 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "110" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "55" ) - public static int method3788(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 72 - boolean var3 = false; // L: 73 - boolean var4 = false; // L: 74 - int var5 = 0; // L: 75 - int var6 = var0.length(); // L: 76 + public static void method3788(String var0, String var1, int var2, int var3) throws IOException { + JagexCache.idxCount = var3; // L: 40 + WorldMapSection1.cacheGamebuild = var2; // L: 41 - for (int var7 = 0; var7 < var6; ++var7) { // L: 77 - char var8 = var0.charAt(var7); // L: 78 - if (var7 == 0) { // L: 79 - if (var8 == '-') { // L: 80 - var3 = true; // L: 81 - continue; - } + try { + class10.operatingSystemName = System.getProperty("os.name"); // L: 43 + } catch (Exception var15) { // L: 45 + class10.operatingSystemName = "Unknown"; // L: 46 + } - if (var8 == '+') { // L: 84 - continue; - } + class128.formattedOperatingSystemName = class10.operatingSystemName.toLowerCase(); // L: 48 + + try { + NetSocket.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (NetSocket.userHomeDirectory != null) { // L: 51 + NetSocket.userHomeDirectory = NetSocket.userHomeDirectory + "/"; + } + } catch (Exception var14) { // L: 53 + } + + try { + if (class128.formattedOperatingSystemName.startsWith("win")) { // L: 55 + if (NetSocket.userHomeDirectory == null) { // L: 56 + NetSocket.userHomeDirectory = System.getenv("USERPROFILE"); } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 86 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 87 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 88 - throw new NumberFormatException(); // L: 89 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 90 - throw new NumberFormatException(); - } - - if (var3) { // L: 91 - var10 = -var10; - } - - int var9 = var5 * var1 + var10; // L: 92 - if (var9 / var1 != var5) { // L: 93 - throw new NumberFormatException(); - } - - var5 = var9; // L: 94 - var4 = true; // L: 95 + } else if (NetSocket.userHomeDirectory == null) { // L: 59 + NetSocket.userHomeDirectory = System.getenv("HOME"); } - if (!var4) { // L: 97 - throw new NumberFormatException(); + if (NetSocket.userHomeDirectory != null) { // L: 61 + NetSocket.userHomeDirectory = NetSocket.userHomeDirectory + "/"; + } + } catch (Exception var13) { // L: 63 + } + + if (NetSocket.userHomeDirectory == null) { // L: 64 + NetSocket.userHomeDirectory = "~/"; + } + + ItemContainer.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", NetSocket.userHomeDirectory, "/tmp/", ""}; // L: 65 + class216.cacheSubPaths = new String[]{".jagex_cache_" + WorldMapSection1.cacheGamebuild, ".file_store_" + WorldMapSection1.cacheGamebuild}; // L: 66 + int var9 = 0; + + label128: + while (var9 < 4) { + JagexCache.cacheDir = WorldMapArea.method4036(var0, var1, var9); // L: 68 + if (!JagexCache.cacheDir.exists()) { // L: 69 + JagexCache.cacheDir.mkdirs(); + } + + File[] var5 = JagexCache.cacheDir.listFiles(); // L: 70 + if (var5 == null) { // L: 71 + break; + } + + File[] var6 = var5; // L: 73 + int var7 = 0; + + while (true) { + if (var7 >= var6.length) { + break label128; + } + + File var8 = var6[var7]; // L: 75 + if (!AbstractWorldMapIcon.method4405(var8, false)) { // L: 77 + ++var9; // L: 67 + break; + } + + ++var7; // L: 74 + } + } + + class128.method2856(JagexCache.cacheDir); // L: 84 + + try { + File var4 = new File(NetSocket.userHomeDirectory, "random.dat"); // L: 87 + int var11; + if (var4.exists()) { // L: 88 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 89 } else { - return var5; // L: 98 + label110: + for (int var10 = 0; var10 < class216.cacheSubPaths.length; ++var10) { // L: 92 + for (var11 = 0; var11 < ItemContainer.cacheParentPaths.length; ++var11) { // L: 93 + File var12 = new File(ItemContainer.cacheParentPaths[var11] + class216.cacheSubPaths[var10] + File.separatorChar + "random.dat"); // L: 94 + if (var12.exists()) { // L: 95 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var12, "rw", 25L), 24, 0); // L: 96 + break label110; // L: 97 + } + } + } } - } else { - throw new IllegalArgumentException("" + var1); - } - } - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1419819792" - ) - static int method3773(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { // L: 2322 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2323 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UserComparator3.method2600(var3) ? 1 : 0; // L: 2324 - return 1; // L: 2325 - } else if (var0 == 3501) { // L: 2327 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2328 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class268.method5227(var3) ? 1 : 0; // L: 2329 - return 1; // L: 2330 - } else if (var0 == 3502) { // L: 2332 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2333 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = PcmPlayer.method772(var3) ? 1 : 0; // L: 2334 - return 1; // L: 2335 - } else { - return 2; // L: 2337 + if (JagexCache.JagexCache_randomDat == null) { // L: 102 + RandomAccessFile var17 = new RandomAccessFile(var4, "rw"); // L: 103 + var11 = var17.read(); // L: 104 + var17.seek(0L); // L: 105 + var17.write(var11); // L: 106 + var17.seek(0L); // L: 107 + var17.close(); // L: 108 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 109 + } + } catch (IOException var16) { // L: 112 } - } + + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 114 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 115 + class115.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 116 + + for (var9 = 0; var9 < JagexCache.idxCount; ++var9) { // L: 117 + class115.JagexCache_idxFiles[var9] = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx" + var9), "rw", 1048576L), 6000, 0); // L: 118 + } + + } // L: 120 } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 09d1421a0d..efb2ae2bc3 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("fx") +@ObfuscatedName("fk") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("FloorUnderlayDefinition_archive") - static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("o") + public static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("FloorUnderlayDefinition_cached") - public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("h") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1777998723 + intValue = 2001140681 ) @Export("rgb") int rgb; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 10295831 + intValue = -1442875069 ) @Export("hue") public int hue; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2028509669 + intValue = 1249056165 ) @Export("saturation") public int saturation; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2013441019 + intValue = -1727815031 ) @Export("lightness") public int lightness; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1582174631 + intValue = 634259911 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,143 +58,120 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; // L: 12 } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-597629849" + garbageValue = "1803560536" ) @Export("postDecode") void postDecode() { - this.setHsl(this.rgb); // L: 36 - } // L: 37 + this.setHsl(this.rgb); // L: 32 + } // L: 33 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "922943363" + descriptor = "(Lpi;II)V", + garbageValue = "141274967" ) @Export("decode") void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 41 - if (var3 == 0) { // L: 42 - return; // L: 45 + int var3 = var1.readUnsignedByte(); // L: 37 + if (var3 == 0) { // L: 38 + return; // L: 41 } - this.decodeNext(var1, var3, var2); // L: 43 + this.decodeNext(var1, var3, var2); // L: 39 } } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;IIB)V", - garbageValue = "10" + descriptor = "(Lpi;III)V", + garbageValue = "-606456868" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 48 + if (var2 == 1) { // L: 44 this.rgb = var1.readMedium(); } - } // L: 50 + } // L: 46 - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "458316763" + descriptor = "(IB)V", + garbageValue = "15" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54 - double var6 = (double)(var1 & 255) / 256.0D; // L: 55 - double var8 = var2; // L: 56 - if (var4 < var2) { // L: 57 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 49 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 50 + double var6 = (double)(var1 & 255) / 256.0D; // L: 51 + double var8 = var2; // L: 52 + if (var4 < var2) { // L: 53 var8 = var4; } - if (var6 < var8) { // L: 58 + if (var6 < var8) { // L: 54 var8 = var6; } - double var10 = var2; // L: 59 - if (var4 > var2) { // L: 60 + double var10 = var2; // L: 55 + if (var4 > var2) { // L: 56 var10 = var4; } - if (var6 > var10) { // L: 61 + if (var6 > var10) { // L: 57 var10 = var6; } - double var12 = 0.0D; // L: 62 - double var14 = 0.0D; // L: 63 - double var16 = (var10 + var8) / 2.0D; // L: 64 - if (var10 != var8) { // L: 65 - if (var16 < 0.5D) { // L: 66 - var14 = (var10 - var8) / (var8 + var10); + double var12 = 0.0D; // L: 58 + double var14 = 0.0D; // L: 59 + double var16 = (var8 + var10) / 2.0D; // L: 60 + if (var8 != var10) { // L: 61 + if (var16 < 0.5D) { // L: 62 + var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { // L: 67 + if (var16 >= 0.5D) { // L: 63 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 68 + if (var2 == var10) { // L: 64 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 69 + } else if (var10 == var4) { // L: 65 var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 70 + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 66 } } - var12 /= 6.0D; // L: 72 - this.saturation = (int)(var14 * 256.0D); // L: 73 - this.lightness = (int)(var16 * 256.0D); // L: 74 - if (this.saturation < 0) { // L: 75 + var12 /= 6.0D; // L: 68 + this.saturation = (int)(var14 * 256.0D); // L: 69 + this.lightness = (int)(var16 * 256.0D); // L: 70 + if (this.saturation < 0) { // L: 71 this.saturation = 0; - } else if (this.saturation > 255) { // L: 76 + } else if (this.saturation > 255) { // L: 72 this.saturation = 255; } - if (this.lightness < 0) { // L: 77 + if (this.lightness < 0) { // L: 73 this.lightness = 0; - } else if (this.lightness > 255) { // L: 78 + } else if (this.lightness > 255) { // L: 74 this.lightness = 255; } - if (var16 > 0.5D) { // L: 79 - this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); + if (var16 > 0.5D) { // L: 75 + this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 80 + this.hueMultiplier = (int)(var14 * var16 * 512.0D); // L: 76 } - if (this.hueMultiplier < 1) { // L: 81 + if (this.hueMultiplier < 1) { // L: 77 this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 82 - } // L: 83 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "122" - ) - public static int method3536(int var0, int var1) { - return (-3 - var0 << 8) + var1; // L: 17 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-699179659" - ) - static void method3548() { - if (MusicPatch.loadWorlds()) { // L: 2078 - Login.worldSelectOpen = true; // L: 2079 - Login.worldSelectPage = 0; // L: 2080 - Login.worldSelectPagesCount = 0; // L: 2081 - } - - } // L: 2083 + this.hue = (int)((double)this.hueMultiplier * var12); // L: 78 + } // L: 79 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 3d5df76932..308e3a16a9 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("mr") +@ObfuscatedName("md") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 7d6cf11973..2ebce4d12e 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -2,54 +2,53 @@ 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("oa") +@ObfuscatedName("ow") @Implements("FontName") public class FontName { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("pv") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lps;" + descriptor = "Lqu;" ) - @Export("HitSplatDefinition_cached") - static class426 HitSplatDefinition_cached; - @ObfuscatedName("d") + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("s") @Export("name") String name; @@ -66,139 +65,44 @@ public class FontName { this.name = var1; // L: 16 } // L: 17 - @ObfuscatedName("g") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" + descriptor = "(IIII)I", + garbageValue = "-2021946113" ) - public static void method7509() { - VarpDefinition.VarpDefinition_cached.clear(); // L: 41 - } // L: 42 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "35948304" - ) - static int method7511(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 478 - class295.Interpreter_intStackSize -= 3; // L: 479 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 480 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 481 - int var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 482 - if (var4 == 0) { // L: 483 - throw new RuntimeException(); // L: 484 - } else { - Widget var6 = HorizontalAlignment.getWidget(var9); // L: 486 - if (var6.children == null) { // L: 487 - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { // L: 488 - Widget[] var7 = new Widget[var11 + 1]; // L: 489 - - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 490 - var7[var8] = var6.children[var8]; - } - - var6.children = var7; // L: 491 - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 493 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 494 - var12.type = var4; // L: 495 - var12.parentId = var12.id = var6.id; // L: 496 - var12.childIndex = var11; // L: 497 - var12.isIf3 = true; // L: 498 - var6.children[var11] = var12; // L: 499 - if (var2) { // L: 500 - class432.scriptDotWidget = var12; - } else { - class341.scriptActiveWidget = var12; // L: 501 - } - - class290.invalidateWidget(var6); // L: 502 - return 1; // L: 503 - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 505 - var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 506 - Widget var10 = HorizontalAlignment.getWidget(var3.id); // L: 507 - var10.children[var3.childIndex] = null; // L: 508 - class290.invalidateWidget(var10); // L: 509 - return 1; // L: 510 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 512 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 513 - var3.children = null; // L: 514 - class290.invalidateWidget(var3); // L: 515 - return 1; // L: 516 - } else if (var0 == 103) { // L: 518 - class295.Interpreter_intStackSize -= 3; // L: 519 - return 1; // L: 520 - } else if (var0 == 104) { // L: 522 - --class295.Interpreter_intStackSize; // L: 523 - return 1; // L: 524 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 526 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 539 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 540 - if (var3 != null) { // L: 541 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 542 - if (var2) { // L: 543 - class432.scriptDotWidget = var3; - } else { - class341.scriptActiveWidget = var3; // L: 544 - } - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 546 - } - - return 1; // L: 547 - } else if (var0 == 202) { // L: 549 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] = 0; // L: 550 - return 1; // L: 551 - } else if (var0 == 203) { // L: 553 - Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize + 1] = 0; // L: 554 - return 1; // L: 555 - } else { - return 2; // L: 557 - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 527 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 528 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 529 - Widget var5 = class143.getWidgetChild(var9, var4); // L: 530 - if (var5 != null && var4 != -1) { // L: 531 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 532 - if (var2) { // L: 533 - class432.scriptDotWidget = var5; - } else { - class341.scriptActiveWidget = var5; // L: 534 - } - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 536 - } - - return 1; // L: 537 - } + static int method7415(int var0, int var1, int var2) { + if (var2 > 179) { // L: 84 + var1 /= 2; } + + if (var2 > 192) { // L: 85 + var1 /= 2; + } + + if (var2 > 217) { // L: 86 + var1 /= 2; + } + + if (var2 > 243) { // L: 87 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 88 + return var3; // L: 89 } - @ObfuscatedName("lb") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BII)V", - garbageValue = "-1923637215" + descriptor = "(I)[I", + garbageValue = "-1556490427" ) - static void method7510(byte[] var0, int var1) { - if (Client.randomDatData == null) { // L: 11870 - Client.randomDatData = new byte[24]; + public static int[] method7414() { + int[] var0 = new int[KeyHandler.field118]; // L: 251 + + for (int var1 = 0; var1 < KeyHandler.field118; ++var1) { // L: 252 + var0[var1] = KeyHandler.field143[var1]; // L: 253 } - class350.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11871 - } // L: 11872 + return var0; // L: 255 + } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index a535070617..7f14f18a55 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,30 +1,36 @@ 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("ot") +@ObfuscatedName("of") @Implements("Fonts") public class Fonts { + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 623297429 + ) + static int field4517; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Llq;Llq;)V" + descriptor = "(Lln;Lln;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -34,8 +40,8 @@ public class Fonts { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([Loa;I)Ljava/util/HashMap;", - garbageValue = "-1428980647" + descriptor = "([Low;I)Ljava/util/HashMap;", + garbageValue = "554923002" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -47,7 +53,7 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - Font var6 = AbstractSocket.method6899(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + Font var6 = class431.method7594(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 if (var6 != null) { // L: 31 this.map.put(var5, var6); // L: 32 var2.put(var5, var6); // L: 33 @@ -55,6 +61,52 @@ public class Fonts { } } - return var2; // L: 39 + return var2; } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpz;B)V", + garbageValue = "0" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = GrandExchangeEvents.localPlayer = Client.players[var1] = new Player(); // L: 39 + var2.index = var1; // L: 40 + int var3 = var0.readBits(30); // L: 41 + byte var4 = (byte)(var3 >> 28); // L: 42 + int var5 = var3 >> 14 & 16383; // L: 43 + int var6 = var3 & 16383; // L: 44 + var2.pathX[0] = var5 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - VarcInt.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + class18.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1276[var1] != null) { // L: 50 + var2.read(Players.field1276[var1]); + } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1283[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var1 != var7) { // L: 56 + int var8 = var0.readBits(18); // L: 57 + int var9 = var8 >> 16; // L: 58 + int var10 = var8 >> 8 & 597; // L: 59 + int var11 = var8 & 597; // L: 60 + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 + Players.Players_orientations[var7] = 0; // L: 62 + Players.Players_targetIndices[var7] = -1; // L: 63 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 + Players.field1283[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index ac0d27dd8a..0a48cc3415 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -3,21 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("im") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("q") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lgi;" + descriptor = "[Lhf;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Llq;Llq;IZ)V" + descriptor = "(Lln;Lln;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); // L: 35 @@ -54,73 +51,22 @@ public class Frames extends DualNode { } // L: 60 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-2054162856" + garbageValue = "1974445635" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; // L: 63 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(FFFF[FB)V", - garbageValue = "1" + descriptor = "(IS)I", + garbageValue = "500" ) - static void method4316(float var0, float var1, float var2, float var3, float[] var4) { - float var5 = var1 - var0; // L: 318 - float var6 = var2 - var1; // L: 319 - float var7 = var3 - var2; // L: 320 - float var8 = var6 - var5; // L: 321 - var4[3] = var7 - var6 - var8; // L: 322 - var4[2] = var8 + var8 + var8; // L: 323 - var4[1] = var5 + var5 + var5; // L: 324 - var4[0] = var0; // L: 325 - } // L: 326 - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(Lkn;I)Z", - garbageValue = "-1456881202" - ) - static final boolean method4319(Widget var0) { - int var1 = var0.contentType; // L: 11529 - if (var1 == 205) { // L: 11530 - Client.logoutTimer = 250; // L: 11531 - return true; // L: 11532 - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 11534 - var2 = (var1 - 300) / 2; // L: 11535 - var3 = var1 & 1; // L: 11536 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11537 - } - - if (var1 >= 314 && var1 <= 323) { // L: 11539 - var2 = (var1 - 314) / 2; // L: 11540 - var3 = var1 & 1; // L: 11541 - Client.playerAppearance.method5610(var2, var3 == 1); // L: 11542 - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); // L: 11544 - } - - if (var1 == 325) { // L: 11545 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 11546 - PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); // L: 11548 - Client.playerAppearance.write(var4.packetBuffer); // L: 11549 - Client.packetWriter.addNode(var4); // L: 11550 - return true; // L: 11551 - } else { - return false; // L: 11553 - } - } + public static int method4934(int var0) { + return FileSystem.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 61 } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 19f48d7494..fe21644881 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nk") +@ObfuscatedName("nh") @Implements("Friend") public class Friend extends Buddy { @ObfuscatedName("v") - boolean field4256; - @ObfuscatedName("o") - boolean field4257; + boolean field4237; + @ObfuscatedName("c") + boolean field4236; Friend() { } // L: 9 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)I", - garbageValue = "985584211" + descriptor = "(Lnh;I)I", + garbageValue = "-1631917139" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field4256 && !var1.field4256) { // L: 16 + } else if (this.field4237 && !var1.field4237) { // L: 16 return -1; - } else if (!this.field4256 && var1.field4256) { // L: 17 + } else if (!this.field4237 && var1.field4237) { // L: 17 return 1; - } else if (this.field4257 && !var1.field4257) { // L: 18 + } else if (this.field4236 && !var1.field4236) { // L: 18 return -1; - } else if (!this.field4257 && var1.field4257) { // L: 19 + } else if (!this.field4236 && var1.field4236) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnc;S)I", - garbageValue = "-8912" + descriptor = "(Lnn;I)I", + garbageValue = "842367957" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 0e1d0636af..9b1f59b58b 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,39 +4,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nx") +@ObfuscatedName("nk") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { + @ObfuscatedName("q") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -652045891 + intValue = 900847361 ) - public int field4259; - @ObfuscatedName("o") + public int field4246; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqb;" ) @Export("username") public Username username; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lqy;I)V" + descriptor = "(Lqb;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field4259 = (int)(WorldMapSprite.method4989() / 1000L); // L: 109 - this.username = var1; // L: 110 - this.world = (short)var2; // L: 111 - } // L: 112 + this.field4246 = (int)(class136.method2931() / 1000L); // L: 107 + this.username = var1; // L: 108 + this.world = (short)var2; // L: 109 + } // L: 110 - @ObfuscatedName("o") - static final void method6731(long var0) { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-635847249" + ) + public static void method6685() { try { - Thread.sleep(var0); // L: 20 - } catch (InterruptedException var3) { // L: 22 + JagexCache.JagexCache_dat2File.close(); // L: 276 + + for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 277 + class115.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 278 + JagexCache.JagexCache_randomDat.close(); // L: 279 + } catch (Exception var2) { // L: 281 } - } // L: 23 + } // L: 282 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(Lky;I)Lky;", + garbageValue = "177537571" + ) + static Widget method6686(Widget var0) { + Widget var2 = var0; // L: 11903 + int var3 = Players.method2420(class326.getWidgetFlags(var0)); // L: 11905 + Widget var1; + if (var3 == 0) { // L: 11906 + var1 = null; // L: 11907 + } else { + int var4 = 0; + + while (true) { + if (var4 >= var3) { + var1 = var2; // L: 11917 + break; + } + + var2 = class127.getWidget(var2.parentId); // L: 11911 + if (var2 == null) { // L: 11912 + var1 = null; // L: 11913 + break; // L: 11914 + } + + ++var4; // L: 11910 + } + } + + Widget var5 = var1; // L: 11919 + if (var1 == null) { // L: 11920 + var5 = var0.parent; + } + + return var5; // L: 11921 + } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index c38a054948..811c014bf8 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -4,413 +4,556 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bw") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("br") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lea;" ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("hv") + static ClanChannel field808; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgs;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("he") - @ObfuscatedGetter( - intValue = 505945319 - ) - static int field803; - @ObfuscatedName("ig") - @ObfuscatedGetter( - intValue = -134669163 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnr;" ) @Export("friendsList") public final FriendsList friendsList; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmw;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -244669207 + intValue = -189724235 ) - int field801; + int field805; @ObfuscatedSignature( - descriptor = "(Lpa;)V" + descriptor = "(Lpe;)V" ) FriendSystem(LoginType var1) { - this.field801 = 0; // L: 23 + this.field805 = 0; // L: 23 this.loginType = var1; // L: 26 this.friendsList = new FriendsList(var1); // L: 27 this.ignoreList = new IgnoreList(var1); // L: 28 - } // L: 29 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "215" + descriptor = "(I)Z", + garbageValue = "-846146726" ) - boolean method1657() { - return this.field801 == 2; // L: 32 + boolean method1681() { + return this.field805 == 2; // L: 32 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "16711935" + descriptor = "(B)V", + garbageValue = "-22" ) - final void method1687() { - this.field801 = 1; // L: 36 - } + final void method1726() { + this.field805 = 1; // L: 36 + } // L: 37 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-490203066" + descriptor = "(Lpi;II)V", + garbageValue = "-1095656877" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 - this.field801 = 2; - Strings.method5795(); - } + this.field805 = 2; // L: 41 + class295.method5732(); // L: 42 + } // L: 43 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(S)V", + garbageValue = "-6357" ) @Export("processFriendUpdates") final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field4259 < WorldMapSprite.method4989() / 1000L - 5L) { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46 + if ((long)var1.field4246 < class136.method2931() / 1000L - 5L) { // L: 47 if (var1.world > 0) { - Login.addGameMessage(5, "", var1.username + " has logged in."); + Actor.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 } - if (var1.world == 0) { - Login.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { // L: 49 + Actor.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); // L: 50 } } - } + } // L: 53 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "1878826448" ) @Export("clear") final void clear() { - this.field801 = 0; + this.field805 = 0; // L: 56 this.friendsList.clear(); // L: 57 - this.ignoreList.clear(); - } + this.ignoreList.clear(); // L: 58 + } // L: 59 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lqy;ZB)Z", - garbageValue = "-62" + descriptor = "(Lqb;ZS)Z", + garbageValue = "301" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { + if (var1 == null) { // L: 62 return false; - } else if (var1.equals(class19.localPlayer.username)) { // L: 63 + } else if (var1.equals(GrandExchangeEvents.localPlayer.username)) { // L: 63 return true; } else { return this.friendsList.isFriended(var1, var2); // L: 64 } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lqy;B)Z", - garbageValue = "33" + descriptor = "(Lqb;B)Z", + garbageValue = "24" ) @Export("isIgnored") final boolean isIgnored(Username var1) { - if (var1 == null) { + if (var1 == null) { // L: 69 return false; } else { return this.ignoreList.contains(var1); // L: 70 } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "957037997" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "95" ) @Export("addFriend") final void addFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); + if (var1 != null) { // L: 75 + Username var2 = new Username(var1, this.loginType); // L: 76 if (var2.hasCleanName()) { // L: 77 - StringBuilder var10000; - String var4; if (this.friendsListIsFull()) { // L: 78 - var10000 = null; - var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - Login.addGameMessage(30, "", var4); - } else if (class19.localPlayer.username.equals(var2)) { - class33.method632(); - } else if (this.isFriended(var2, false)) { - class241.method5001(var1); - } else if (this.isIgnored(var2)) { // L: 95 - var10000 = new StringBuilder(); - Object var10001 = null; // L: 97 - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var4 = var10000.append(" from your ignore list first").toString(); - Login.addGameMessage(30, "", var4); // L: 99 + class149.method3138("Your friend list is full. Max of 200 for free users, and 400 for members"); // L: 80 + } else if (GrandExchangeEvents.localPlayer.username.equals(var2)) { // L: 84 + ClanSettings.method3031(); // L: 85 + } else if (this.isFriended(var2, false)) { // L: 88 + class149.method3138(var1 + " is already on your friend list"); // L: 90 + } else if (this.isIgnored(var2)) { // L: 94 + Canvas.method359(var1); // L: 95 } else { - PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 106 - var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 107 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 108 - Client.packetWriter.addNode(var3); // L: 109 + Skeleton.method4728(var1); // L: 98 } } } - } // L: 89 102 111 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "146943112" - ) - @Export("friendsListIsFull") - final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field607 != 1; // L: 128 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "32" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { // L: 135 - Username var2 = new Username(var1, this.loginType); // L: 136 - if (var2.hasCleanName()) { // L: 137 - StringBuilder var10000; - String var4; - if (this.canAddIgnore()) { // L: 138 - var10000 = null; // L: 140 - var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - Login.addGameMessage(30, "", var4); // L: 142 - } else if (class19.localPlayer.username.equals(var2)) { // L: 147 - var10000 = null; // L: 149 - var4 = "You can't add yourself to your own ignore list"; - Login.addGameMessage(30, "", var4); // L: 151 - } else if (this.isIgnored(var2)) { // L: 156 - var10000 = (new StringBuilder()).append(var1); // L: 158 - Object var10001 = null; - var4 = var10000.append(" is already on your ignore list").toString(); - Login.addGameMessage(30, "", var4); // L: 160 - } else if (this.isFriended(var2, false)) { // L: 165 - class10.method106(var1); // L: 166 - } else { - PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 171 - var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 172 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 173 - Client.packetWriter.addNode(var3); // L: 174 - } - } - } - } // L: 145 154 163 167 176 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "117" - ) - @Export("canAddIgnore") - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field607 != 1; // L: 186 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-780712144" - ) - @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { // L: 193 - Username var2 = new Username(var1, this.loginType); // L: 194 - if (var2.hasCleanName()) { // L: 195 - if (this.friendsList.removeByUsername(var2)) { // L: 196 - Client.field685 = Client.cycleCntr; // L: 198 - PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 201 - var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 202 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 203 - Client.packetWriter.addNode(var3); // L: 204 - } - - Strings.method5795(); // L: 206 - } - } - } // L: 207 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "70" - ) - @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { // L: 210 - Username var2 = new Username(var1, this.loginType); // L: 211 - if (var2.hasCleanName()) { // L: 212 - if (this.ignoreList.removeByUsername(var2)) { // L: 213 - Client.field685 = Client.cycleCntr; // L: 215 - PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 218 - var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 219 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 220 - Client.packetWriter.addNode(var3); // L: 221 - } - - ObjectComposition.FriendSystem_invalidateIgnoreds(); // L: 223 - } - } - } // L: 224 + } // L: 82 86 92 96 99 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lqy;I)Z", - garbageValue = "-1790043427" + descriptor = "(I)Z", + garbageValue = "-1352470577" + ) + @Export("friendsListIsFull") + final boolean friendsListIsFull() { + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field544 != 1; // L: 122 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1994485705" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 129 + Username var2 = new Username(var1, this.loginType); // L: 130 + if (var2.hasCleanName()) { // L: 131 + if (this.canAddIgnore()) { // L: 132 + ModeWhere.method6092(); // L: 133 + } else if (GrandExchangeEvents.localPlayer.username.equals(var2)) { // L: 136 + class149.method3138("You can't add yourself to your own ignore list"); // L: 138 + } else if (this.isIgnored(var2)) { // L: 142 + class149.method3138(var1 + " is already on your ignore list"); // L: 144 + } else if (this.isFriended(var2, false)) { // L: 148 + KeyHandler.method348(var1); // L: 149 + } else { + GameEngine.method569(var1); // L: 152 + } + } + } + } // L: 134 140 146 150 153 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1971481625" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field544 != 1; // L: 172 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-14" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { // L: 179 + Username var2 = new Username(var1, this.loginType); // L: 180 + if (var2.hasCleanName()) { // L: 181 + if (this.friendsList.removeByUsername(var2)) { // L: 182 + Client.field701 = Client.cycleCntr; // L: 184 + PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 187 + var3.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var1)); // L: 188 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 189 + Client.packetWriter.addNode(var3); // L: 190 + } + + class295.method5732(); // L: 192 + } + } + } // L: 193 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "20346063" + ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { // L: 196 + Username var2 = new Username(var1, this.loginType); // L: 197 + if (var2.hasCleanName()) { // L: 198 + if (this.ignoreList.removeByUsername(var2)) { // L: 199 + Client.field701 = Client.cycleCntr; // L: 201 + PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 204 + var3.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var1)); // L: 205 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 206 + Client.packetWriter.addNode(var3); // L: 207 + } + + KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 209 + } + } + } // L: 210 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lqb;I)Z", + garbageValue = "-2101577013" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 236 - return var2 != null && var2.hasWorld(); // L: 237 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIII)Lbo;", - garbageValue = "878673450" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = class401.method7247(var1, var0); // L: 38 - Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41 - Script var4; - if (var5 != null) { // L: 42 - var4 = var5; // L: 43 - } else { - String var6 = String.valueOf(var3); // L: 46 - int var7 = class135.archive12.getGroupId(var6); // L: 47 - if (var7 == -1) { - var4 = null; // L: 49 - } else { - label59: { - byte[] var8 = class135.archive12.takeFileFlat(var7); - if (var8 != null) { - if (var8.length <= 1) { - var4 = null; // L: 55 - break label59; // L: 56 - } - - var5 = Message.newScript(var8); // L: 58 - if (var5 != null) { // L: 59 - Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60 - var4 = var5; // L: 61 - break label59; // L: 62 - } - } - - var4 = null; // L: 65 - } - } - } - - if (var4 != null) { // L: 68 - return var4; // L: 69 - } else { - var3 = FloorUnderlayDefinition.method3536(var2, var0); // L: 71 - Script var11 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 74 - Script var12; - if (var11 != null) { // L: 75 - var12 = var11; // L: 76 - } else { - String var13 = String.valueOf(var3); // L: 79 - int var9 = class135.archive12.getGroupId(var13); // L: 80 - if (var9 == -1) { // L: 81 - var12 = null; // L: 82 - } else { - byte[] var10 = class135.archive12.takeFileFlat(var9); // L: 85 - if (var10 != null) { // L: 86 - if (var10.length <= 1) { // L: 87 - var12 = null; // L: 88 - return var12 != null ? var12 : null; // L: 101 104 - } - - var11 = Message.newScript(var10); // L: 91 - if (var11 != null) { // L: 92 - Script.Script_cached.put(var11, (long)(var3 << 16)); // L: 93 - var12 = var11; // L: 94 - return var12 != null ? var12 : null; - } - } - - var12 = null; // L: 98 - } - } - - return var12 != null ? var12 : null; - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Ljt;", - garbageValue = "2041104179" - ) - public static PacketBufferNode method1723() { - PacketBufferNode var0; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 44 - var0 = new PacketBufferNode(); // L: 45 - } else { - var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 48 - } - - var0.clientPacket = null; // L: 51 - var0.clientPacketLength = 0; // L: 52 - var0.packetBuffer = new PacketBuffer(5000); // L: 53 - return var0; // L: 54 + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 222 + return var2 != null && var2.hasWorld(); // L: 223 } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-92" + descriptor = "(I)[Lcn;", + garbageValue = "-1586565487" ) - public static boolean method1658(int var0) { - return (var0 >> 30 & 1) != 0; // L: 37 + static AttackOption[] method1743() { + return new AttackOption[]{AttackOption.field1263, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.field1257}; // L: 12680 } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "106" + ) + public static boolean method1698(int var0) { + return (var0 >> 28 & 1) != 0; // L: 29 + } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1628645730" + ) + static final void method1715() { + class389.method7094(false); // L: 5650 + Client.field747 = 0; // L: 5651 + boolean var0 = true; // L: 5652 + + int var1; + for (var1 = 0; var1 < Varcs.regionLandArchives.length; ++var1) { // L: 5653 + if (VarpDefinition.regionMapArchiveIds[var1] != -1 && Varcs.regionLandArchives[var1] == null) { // L: 5654 5655 + Varcs.regionLandArchives[var1] = Players.archive5.takeFile(VarpDefinition.regionMapArchiveIds[var1], 0); // L: 5656 + if (Varcs.regionLandArchives[var1] == null) { // L: 5657 + var0 = false; // L: 5658 + ++Client.field747; // L: 5659 + } + } + + if (class133.regionLandArchiveIds[var1] != -1 && DynamicObject.regionMapArchives[var1] == null) { // L: 5663 5664 + DynamicObject.regionMapArchives[var1] = Players.archive5.takeFileEncrypted(class133.regionLandArchiveIds[var1], 0, WorldMapSectionType.xteaKeys[var1]); // L: 5665 + if (DynamicObject.regionMapArchives[var1] == null) { // L: 5666 + var0 = false; // L: 5667 + ++Client.field747; // L: 5668 + } + } + } + + if (!var0) { // L: 5673 + Client.field560 = 1; // L: 5674 + } else { + Client.field558 = 0; // L: 5677 + var0 = true; // L: 5678 + + int var3; + int var4; + for (var1 = 0; var1 < Varcs.regionLandArchives.length; ++var1) { // L: 5679 + byte[] var15 = DynamicObject.regionMapArchives[var1]; // L: 5680 + if (var15 != null) { // L: 5681 + var3 = (class21.regions[var1] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5682 + var4 = (class21.regions[var1] & 255) * 64 - VarcInt.baseY; // L: 5683 + if (Client.isInInstance) { // L: 5684 + var3 = 10; // L: 5685 + var4 = 10; // L: 5686 + } + + var0 &= ItemComposition.method3771(var15, var3, var4); // L: 5688 + } + } + + if (!var0) { // L: 5691 + Client.field560 = 2; // L: 5692 + } else { + if (Client.field560 != 0) { // L: 5695 + MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + class116.playPcmPlayers(); // L: 5696 + ArchiveLoader.scene.clear(); // L: 5697 + + for (var1 = 0; var1 < 4; ++var1) { // L: 5698 + Client.collisionMaps[var1].clear(); + } + + int var2; + for (var1 = 0; var1 < 4; ++var1) { // L: 5699 + for (var2 = 0; var2 < 104; ++var2) { // L: 5700 + for (var3 = 0; var3 < 104; ++var3) { // L: 5701 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5702 + } + } + } + + class116.playPcmPlayers(); // L: 5706 + class321.method5996(); // L: 5707 + var1 = Varcs.regionLandArchives.length; // L: 5708 + ClientPreferences.method2259(); // L: 5709 + class389.method7094(true); // L: 5710 + int var5; + if (!Client.isInInstance) { // L: 5711 + byte[] var14; + for (var2 = 0; var2 < var1; ++var2) { // L: 5712 + var3 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5713 + var4 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5714 + var14 = Varcs.regionLandArchives[var2]; // L: 5715 + if (var14 != null) { // L: 5716 + class116.playPcmPlayers(); // L: 5717 + class1.method9(var14, var3, var4, ScriptEvent.field1042 * 8 - 48, KitDefinition.field1855 * 8 - 48, Client.collisionMaps); // L: 5718 + } + } + + for (var2 = 0; var2 < var1; ++var2) { // L: 5721 + var3 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5722 + var4 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5723 + var14 = Varcs.regionLandArchives[var2]; // L: 5724 + if (var14 == null && KitDefinition.field1855 < 800) { // L: 5725 + class116.playPcmPlayers(); // L: 5726 + class431.method7593(var3, var4, 64, 64); // L: 5727 + } + } + + class389.method7094(true); // L: 5730 + + for (var2 = 0; var2 < var1; ++var2) { // L: 5731 + byte[] var13 = DynamicObject.regionMapArchives[var2]; // L: 5732 + if (var13 != null) { // L: 5733 + var4 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5734 + var5 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5735 + class116.playPcmPlayers(); // L: 5736 + Widget.method5681(var13, var4, var5, ArchiveLoader.scene, Client.collisionMaps); // L: 5737 + } + } + } + + int var6; + int var7; + int var8; + if (Client.isInInstance) { // L: 5741 + int var9; + int var10; + int var11; + for (var2 = 0; var2 < 4; ++var2) { // L: 5742 + class116.playPcmPlayers(); // L: 5743 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5744 + for (var4 = 0; var4 < 13; ++var4) { // L: 5745 + boolean var16 = false; // L: 5746 + var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5747 + if (var6 != -1) { // L: 5748 + var7 = var6 >> 24 & 3; // L: 5749 + var8 = var6 >> 1 & 3; // L: 5750 + var9 = var6 >> 14 & 1023; // L: 5751 + var10 = var6 >> 3 & 2047; // L: 5752 + var11 = (var9 / 8 << 8) + var10 / 8; // L: 5753 + + for (int var12 = 0; var12 < class21.regions.length; ++var12) { // L: 5754 + if (class21.regions[var12] == var11 && Varcs.regionLandArchives[var12] != null) { // L: 5755 + class305.method5781(Varcs.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5756 + var16 = true; // L: 5757 + break; + } + } + } + + if (!var16) { // L: 5762 + KeyHandler.method337(var2, var3 * 8, var4 * 8); // L: 5763 + } + } + } + } + + for (var2 = 0; var2 < 13; ++var2) { // L: 5768 + for (var3 = 0; var3 < 13; ++var3) { // L: 5769 + var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5770 + if (var4 == -1) { // L: 5771 + class431.method7593(var2 * 8, var3 * 8, 8, 8); // L: 5772 + } + } + } + + class389.method7094(true); // L: 5776 + + for (var2 = 0; var2 < 4; ++var2) { // L: 5777 + class116.playPcmPlayers(); // L: 5778 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5779 + for (var4 = 0; var4 < 13; ++var4) { // L: 5780 + var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5781 + if (var5 != -1) { // L: 5782 + var6 = var5 >> 24 & 3; // L: 5783 + var7 = var5 >> 1 & 3; // L: 5784 + var8 = var5 >> 14 & 1023; // L: 5785 + var9 = var5 >> 3 & 2047; // L: 5786 + var10 = (var8 / 8 << 8) + var9 / 8; // L: 5787 + + for (var11 = 0; var11 < class21.regions.length; ++var11) { // L: 5788 + if (class21.regions[var11] == var10 && DynamicObject.regionMapArchives[var11] != null) { // L: 5789 + Tiles.method2015(DynamicObject.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, ArchiveLoader.scene, Client.collisionMaps); // L: 5790 + break; // L: 5791 + } + } + } + } + } + } + } + + class389.method7094(true); // L: 5799 + class116.playPcmPlayers(); // L: 5800 + GraphicsDefaults.method6939(ArchiveLoader.scene, Client.collisionMaps); // L: 5801 + class389.method7094(true); // L: 5802 + var2 = Tiles.Tiles_minPlane; // L: 5803 + if (var2 > class18.Client_plane) { // L: 5804 + var2 = class18.Client_plane; + } + + if (var2 < class18.Client_plane - 1) { // L: 5805 + var2 = class18.Client_plane - 1; + } + + if (Client.isLowDetail) { // L: 5806 + ArchiveLoader.scene.init(Tiles.Tiles_minPlane); + } else { + ArchiveLoader.scene.init(0); // L: 5807 + } + + for (var3 = 0; var3 < 104; ++var3) { // L: 5808 + for (var4 = 0; var4 < 104; ++var4) { // L: 5809 + UserComparator3.updateItemPile(var3, var4); // L: 5810 + } + } + + class116.playPcmPlayers(); // L: 5813 + class28.method390(); // L: 5814 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5815 + PacketBufferNode var17; + if (class127.client.hasFrame()) { // L: 5816 + var17 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 5818 + var17.packetBuffer.writeInt(1057001181); // L: 5819 + Client.packetWriter.addNode(var17); // L: 5820 + } + + if (!Client.isInInstance) { // L: 5822 + var3 = (ScriptEvent.field1042 - 6) / 8; // L: 5823 + var4 = (ScriptEvent.field1042 + 6) / 8; // L: 5824 + var5 = (KitDefinition.field1855 - 6) / 8; // L: 5825 + var6 = (KitDefinition.field1855 + 6) / 8; // L: 5826 + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5827 + for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5828 + if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5829 + Players.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5830 + Players.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5831 + } + } + } + } + + Decimator.updateGameState(30); // L: 5835 + class116.playPcmPlayers(); // L: 5836 + NPC.method2360(); // L: 5837 + var17 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 5838 + Client.packetWriter.addNode(var17); // L: 5839 + UserComparator9.method2619(); // L: 5840 + } + } + } // L: 5675 5693 5841 + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-825343638" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 9666 + Widget var0 = ItemComposition.getWidgetChild(Timer.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9667 + if (var0 != null && var0.onTargetLeave != null) { // L: 9668 + ScriptEvent var1 = new ScriptEvent(); // L: 9669 + var1.widget = var0; // L: 9670 + var1.args = var0.onTargetLeave; // L: 9671 + ClanSettings.runScriptEvent(var1); // L: 9672 + } + + Client.selectedSpellItemId = -1; // L: 9674 + Client.isSpellSelected = false; // L: 9675 + class346.invalidateWidget(var0); // L: 9676 + } + } // L: 9677 } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index 46d82fe367..190f5cdb23 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -4,209 +4,282 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("ns") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lnp;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("name") public String name; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("owner") public String owner; @ObfuscatedName("n") @Export("minKick") public byte minKick; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1904728549 + intValue = -1273194957 ) @Export("rank") public int rank; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1723570979 + intValue = 923261223 ) - int field4252; + int field4244; @ObfuscatedSignature( - descriptor = "(Lpa;Lnv;)V" + descriptor = "(Lpe;Lnp;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(100); // L: 19 this.name = null; // L: 12 this.owner = null; // L: 13 - this.field4252 = 1; // L: 16 + this.field4244 = 1; // L: 16 this.loginType = var1; // L: 20 this.localUser = var2; // L: 21 } // L: 22 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lnc;", - garbageValue = "-1289438305" + descriptor = "(I)Lnn;", + garbageValue = "-2105397576" ) @Export("newInstance") User newInstance() { - return new ClanMate(); // L: 26 + return new ClanMate(); // L: 25 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Lnc;", - garbageValue = "-1075861644" + descriptor = "(II)[Lnn;", + garbageValue = "1888809026" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new ClanMate[var1]; // L: 31 + return new ClanMate[var1]; // L: 29 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "256" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "106117795" ) @Export("readName") final void readName(String var1) { - String var3 = UserComparator7.base37DecodeLong(class306.method5788(var1)); // L: 37 - if (var3 == null) { - var3 = ""; // L: 38 + long var5 = 0L; // L: 37 + int var7 = var1.length(); // L: 38 + + for (int var8 = 0; var8 < var7; ++var8) { // L: 39 + var5 *= 37L; // L: 40 + char var9 = var1.charAt(var8); // L: 41 + if (var9 >= 'A' && var9 <= 'Z') { // L: 42 + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { // L: 43 + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); // L: 44 + } + + if (var5 >= 177917621779460413L) { // L: 45 + break; + } } - this.name = var3; // L: 41 - } // L: 42 + while (var5 % 37L == 0L && var5 != 0L) { // L: 47 + var5 /= 37L; + } - @ObfuscatedName("f") + String var10 = class82.base37DecodeLong(var5); // L: 50 + if (var10 == null) { // L: 51 + var10 = ""; + } + + this.name = var10; // L: 54 + } // L: 55 + + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1041352742" + garbageValue = "-1333219984" ) @Export("setOwner") final void setOwner(String var1) { - String var3 = UserComparator7.base37DecodeLong(class306.method5788(var1)); // L: 47 - if (var3 == null) { - var3 = ""; // L: 48 + long var5 = 0L; // L: 62 + int var7 = var1.length(); // L: 63 + + for (int var8 = 0; var8 < var7; ++var8) { // L: 64 + var5 *= 37L; // L: 65 + char var9 = var1.charAt(var8); // L: 66 + if (var9 >= 'A' && var9 <= 'Z') { // L: 67 + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { // L: 68 + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); // L: 69 + } + + if (var5 >= 177917621779460413L) { // L: 70 + break; + } } - this.owner = var3; // L: 51 - } // L: 52 + while (0L == var5 % 37L && 0L != var5) { // L: 72 + var5 /= 37L; + } - @ObfuscatedName("u") + String var10 = class82.base37DecodeLong(var5); // L: 75 + if (var10 == null) { // L: 76 + var10 = ""; + } + + this.owner = var10; // L: 79 + } // L: 80 + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-1861333718" + descriptor = "(Lpi;I)V", + garbageValue = "-896267822" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); // L: 55 - long var2 = var1.readLong(); // L: 56 - this.readName(WorldMapArea.method4648(var2)); // L: 57 - this.minKick = var1.readByte(); // L: 58 - int var4 = var1.readUnsignedByte(); // L: 59 - if (var4 != 255) { // L: 60 - this.clear(); // L: 61 + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 83 + long var2 = var1.readLong(); // L: 84 + long var5 = var2; // L: 86 + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { // L: 88 + if (0L == var2 % 37L) { // L: 92 + var4 = null; // L: 93 + } else { + var7 = 0; // L: 96 - for (int var5 = 0; var5 < var4; ++var5) { // L: 62 - ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 63 - int var7 = var1.readUnsignedShort(); // L: 64 - var6.set(var7, ++this.field4252 - 1); // L: 65 - var6.rank = var1.readByte(); // L: 66 - var1.readStringCp1252NullTerminated(); // L: 67 - this.isLocalPlayer(var6); // L: 68 + for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 97 98 100 + ++var7; // L: 99 + } + + StringBuilder var10 = new StringBuilder(var7); // L: 102 + + while (0L != var5) { // L: 103 + long var11 = var5; // L: 104 + var5 /= 37L; // L: 105 + var10.append(class349.base37Table[(int)(var11 - var5 * 37L)]); // L: 106 + } + + var4 = var10.reverse().toString(); // L: 108 + } + } else { + var4 = null; // L: 89 + } + + this.readName(var4); // L: 110 + this.minKick = var1.readByte(); // L: 111 + var7 = var1.readUnsignedByte(); // L: 112 + if (var7 != 255) { // L: 113 + this.clear(); // L: 114 + + for (int var13 = 0; var13 < var7; ++var13) { // L: 115 + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 116 + int var14 = var1.readUnsignedShort(); // L: 117 + var9.set(var14, ++this.field4244 - 1); // L: 118 + var9.rank = var1.readByte(); // L: 119 + var1.readStringCp1252NullTerminated(); // L: 120 + this.isLocalPlayer(var9); // L: 121 } } - } // L: 70 + } // L: 123 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "24300" + descriptor = "(Lpi;I)V", + garbageValue = "-432033095" ) - public final void method6718(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 73 - int var3 = var1.readUnsignedShort(); // L: 74 - byte var4 = var1.readByte(); // L: 75 - boolean var5 = false; // L: 76 - if (var4 == -128) { // L: 77 + public final void method6661(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 126 + int var3 = var1.readUnsignedShort(); // L: 127 + byte var4 = var1.readByte(); // L: 128 + boolean var5 = false; // L: 129 + if (var4 == -128) { // L: 130 var5 = true; } ClanMate var6; - if (var5) { // L: 78 - if (this.getSize() == 0) { // L: 79 + if (var5) { // L: 131 + if (this.getSize() == 0) { // L: 132 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 80 - if (var6 != null && var6.getWorld() == var3) { // L: 81 - this.remove(var6); // L: 82 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 133 + if (var6 != null && var6.getWorld() == var3) { // L: 134 + this.remove(var6); // L: 135 } } else { - var1.readStringCp1252NullTerminated(); // L: 86 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 87 - if (var6 == null) { // L: 88 - if (this.getSize() > super.capacity) { // L: 89 + var1.readStringCp1252NullTerminated(); // L: 139 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 140 + if (var6 == null) { // L: 141 + if (this.getSize() > super.capacity) { // L: 142 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 90 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 143 } - var6.set(var3, ++this.field4252 - 1); // L: 92 - var6.rank = var4; // L: 93 - this.isLocalPlayer(var6); // L: 94 + var6.set(var3, ++this.field4244 - 1); // L: 145 + var6.rank = var4; // L: 146 + this.isLocalPlayer(var6); // L: 147 } - } // L: 96 + } // L: 149 - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "5720718" + garbageValue = "-990148862" ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 99 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 100 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 152 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 153 } - } // L: 102 + } // L: 155 - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "6" + descriptor = "(I)V", + garbageValue = "1742976679" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 105 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 106 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 158 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 159 } - } // L: 108 + } // L: 161 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnp;B)V", - garbageValue = "-104" + descriptor = "(Lne;I)V", + garbageValue = "-103692595" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 111 + if (var1.getUsername().equals(this.localUser.username())) { // L: 164 this.rank = var1.rank; } - } // L: 112 + } // L: 165 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 7764a29765..baba09a922 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,171 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +@ObfuscatedName("nr") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -812029461 + intValue = -676332345 ) - int field4246; - @ObfuscatedName("l") + int field4235; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Llr;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lpa;)V" + descriptor = "(Lpe;)V" ) public FriendsList(LoginType var1) { super(400); // L: 18 - this.field4246 = 1; // L: 14 + this.field4235 = 1; // L: 14 this.friendLoginUpdates = new LinkDeque(); // L: 15 this.loginType = var1; // L: 19 } // L: 20 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lnc;", - garbageValue = "-1289438305" + descriptor = "(I)Lnn;", + garbageValue = "-2105397576" ) @Export("newInstance") User newInstance() { - return new Friend(); // L: 24 + return new Friend(); // L: 23 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Lnc;", - garbageValue = "-1075861644" + descriptor = "(II)[Lnn;", + garbageValue = "1888809026" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Friend[var1]; // L: 29 + return new Friend[var1]; // L: 27 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lqy;ZB)Z", - garbageValue = "-18" + descriptor = "(Lqb;ZB)Z", + garbageValue = "-86" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); // L: 33 - if (var3 == null) { // L: 34 - return false; + Friend var3 = (Friend)this.getByUsername(var1); // L: 31 + if (var3 == null) { + return false; // L: 32 } else { - return !var2 || var3.world != 0; // L: 35 + return !var2 || var3.world != 0; // L: 33 } } - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-311568713" + descriptor = "(Lpi;II)V", + garbageValue = "1085083645" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { // L: 40 - boolean var3 = var1.readUnsignedByte() == 1; // L: 41 - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 42 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 43 - int var6 = var1.readUnsignedShort(); // L: 44 - int var7 = var1.readUnsignedByte(); // L: 45 - int var8 = var1.readUnsignedByte(); // L: 46 - boolean var9 = (var8 & 2) != 0; // L: 47 - boolean var10 = (var8 & 1) != 0; // L: 48 - if (var6 > 0) { // L: 49 - var1.readStringCp1252NullTerminated(); // L: 50 - var1.readUnsignedByte(); // L: 51 - var1.readInt(); // L: 52 + if (var1.offset < var2) { // L: 38 + boolean var3 = var1.readUnsignedByte() == 1; // L: 39 + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 41 + int var6 = var1.readUnsignedShort(); // L: 42 + int var7 = var1.readUnsignedByte(); // L: 43 + int var8 = var1.readUnsignedByte(); // L: 44 + boolean var9 = (var8 & 2) != 0; // L: 45 + boolean var10 = (var8 & 1) != 0; // L: 46 + if (var6 > 0) { // L: 47 + var1.readStringCp1252NullTerminated(); // L: 48 + var1.readUnsignedByte(); // L: 49 + var1.readInt(); // L: 50 } - var1.readStringCp1252NullTerminated(); // L: 54 - if (var4 != null && var4.hasCleanName()) { // L: 55 - Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 56 - if (var3) { // L: 57 - Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 58 - if (var12 != null && var11 != var12) { // L: 59 - if (var11 != null) { // L: 60 - this.remove(var12); // L: 61 + var1.readStringCp1252NullTerminated(); // L: 52 + if (var4 != null && var4.hasCleanName()) { // L: 53 + Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 54 + if (var3) { // L: 55 + Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 56 + if (var12 != null && var12 != var11) { // L: 57 + if (var11 != null) { // L: 58 + this.remove(var12); // L: 59 } else { - var11 = var12; // L: 64 + var11 = var12; // L: 62 } } } - if (var11 != null) { // L: 68 - this.changeName(var11, var4, var5); // L: 69 - if (var6 != var11.world) { // L: 70 - boolean var14 = true; // L: 71 + if (var11 != null) { // L: 66 + this.changeName(var11, var4, var5); // L: 67 + if (var6 != var11.world) { // L: 68 + boolean var14 = true; // L: 69 - for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 72 - if (var13.username.equals(var4)) { // L: 73 - if (var6 != 0 && var13.world == 0) { // L: 74 - var13.remove(); // L: 75 - var14 = false; // L: 76 - } else if (var6 == 0 && var13.world != 0) { // L: 78 - var13.remove(); // L: 79 - var14 = false; // L: 80 + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 70 + if (var13.username.equals(var4)) { // L: 71 + if (var6 != 0 && var13.world == 0) { // L: 72 + var13.remove(); // L: 73 + var14 = false; // L: 74 + } else if (var6 == 0 && var13.world != 0) { // L: 76 + var13.remove(); // L: 77 + var14 = false; // L: 78 } } } - if (var14) { // L: 84 + if (var14) { // L: 82 this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { // L: 87 + if (this.getSize() >= 400) { // L: 85 continue; } - var11 = (Friend)this.addLast(var4, var5); // L: 88 + var11 = (Friend)this.addLast(var4, var5); // L: 86 } - if (var6 != var11.world) { // L: 91 - var11.int2 = ++this.field4246 - 1; // L: 92 - if (var11.world == -1 && var6 == 0) { // L: 93 - var11.int2 = -(var11.int2 * 34527129) * 942443689; + if (var6 != var11.world) { // L: 89 + var11.int2 = ++this.field4235 - 1; // L: 90 + if (var11.world == -1 && var6 == 0) { // L: 91 + var11.int2 = -(var11.int2 * 859703757) * -1261040891; } - var11.world = var6; // L: 94 + var11.world = var6; // L: 92 } - var11.rank = var7; // L: 96 - var11.field4256 = var9; // L: 97 - var11.field4257 = var10; // L: 98 - continue; // L: 99 + var11.rank = var7; // L: 94 + var11.field4237 = var9; // L: 95 + var11.field4236 = var10; // L: 96 + continue; // L: 97 } throw new IllegalStateException(); } - this.sort(); // L: 100 - return; // L: 101 + this.sort(); // L: 98 + return; // L: 99 } } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "775454330" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (World.World_worlds != null) { // L: 171 - class128.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 - } - - } // L: 174 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index d2b495f7d8..ed476c2991 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,17 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qr") +@ObfuscatedName("qg") @Implements("GZipDecompressor") public class GZipDecompressor { @ObfuscatedName("v") @Export("inflater") Inflater inflater; - public GZipDecompressor() { - this(-1, 1000000, 1000000); // L: 10 - } // L: 11 - @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" @@ -22,10 +18,14 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } // L: 13 + public GZipDecompressor() { + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;[BI)V", - garbageValue = "-1169563168" + descriptor = "(Lpi;[BI)V", + garbageValue = "21631557" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index c907987881..2c607ca8a3 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -3,44 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kx") +@ObfuscatedName("kl") @Implements("GameBuild") public class GameBuild { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lkl;" ) @Export("LIVE") - public static final GameBuild LIVE; - @ObfuscatedName("o") + static final GameBuild LIVE; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lkl;" ) @Export("BUILDLIVE") - public static final GameBuild BUILDLIVE; - @ObfuscatedName("h") + static final GameBuild BUILDLIVE; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lkl;" ) @Export("RC") - public static final GameBuild RC; - @ObfuscatedName("g") + static final GameBuild RC; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lkl;" ) @Export("WIP") - public static final GameBuild WIP; - @ObfuscatedName("l") + static final GameBuild WIP; + @ObfuscatedName("dk") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("b") @Export("name") public final String name; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -643398901 + intValue = -21967843 ) @Export("buildId") - public final int buildId; + final int buildId; static { LIVE = new GameBuild("LIVE", 0); // L: 5 @@ -50,76 +52,16 @@ public class GameBuild { } GameBuild(String var1, int var2) { - this.name = var1; // L: 13 - this.buildId = var2; // L: 14 - } // L: 15 + this.name = var1; // L: 17 + this.buildId = var2; // L: 18 + } // L: 19 - @ObfuscatedName("r") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(Llq;II)Lqx;", - garbageValue = "-1898780571" + descriptor = "(I)I", + garbageValue = "-733827758" ) - public static IndexedSprite method5774(AbstractArchive var0, int var1) { - return !AbstractUserComparator.method6771(var0, var1) ? null : Clock.method3323(); // L: 100 101 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1736889340" - ) - static int method5775(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1130 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1131 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1132 - return 1; // L: 1133 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1135 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1136 - return 1; // L: 1137 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1139 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.text; // L: 1140 - return 1; // L: 1141 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1143 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1144 - return 1; // L: 1145 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1147 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1148 - return 1; // L: 1149 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1151 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1152 - return 1; // L: 1153 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1155 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1156 - return 1; // L: 1157 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1159 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1160 - return 1; // L: 1161 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1163 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1164 - return 1; // L: 1165 - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1167 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1168 - return 1; // L: 1169 - } else if (var0 == 1610) { // L: 1171 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1172 - return 1; // L: 1173 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1175 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color; // L: 1176 - return 1; // L: 1177 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1179 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color2; // L: 1180 - return 1; // L: 1181 - } else if (var0 == 1613) { // L: 1183 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1184 - return 1; // L: 1185 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1187 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1188 - return 1; // L: 1189 - } else if (var0 != 1615 && var0 != 1616) { // L: 1191 - return 2; // L: 1195 - } else { - ++class295.Interpreter_intStackSize; // L: 1192 - return 1; // L: 1193 - } + static final int method5773() { + return Client.menuOptionsCount - 1; // L: 9844 } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index fe896a1db5..89201eaf8f 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -24,167 +24,176 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("ao") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("o") + @ObfuscatedName("qj") @ObfuscatedSignature( - descriptor = "Law;" + descriptor = "Lqa;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("uu") + @ObfuscatedGetter( + intValue = 399090461 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lff;" + ) + @Export("taskHandler") + protected static TaskHandler taskHandler; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lao;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 915941483 + intValue = 1669508535 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -2593658155731261435L + longValue = -5981543505247076235L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1637749829 + intValue = 449978353 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1340526085 + intValue = -1442597045 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -871728399 + intValue = 1121679723 ) @Export("fps") protected static int fps; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("clientTickTimes") static long[] clientTickTimes; - @ObfuscatedName("au") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1673260223 + intValue = -1397179313 ) - static int field192; - @ObfuscatedName("am") + static int field206; + @ObfuscatedName("ad") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = -3214398047383872977L + longValue = -4858752129692683603L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedGetter( - longValue = 2946912833293583083L + longValue = -1651553175101575951L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("pu") - @ObfuscatedSignature( - descriptor = "Los;" + @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = -543979185 ) - static class391 field205; + public static int field218; @ObfuscatedName("n") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("a") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1020947567 + intValue = 1855082601 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1131645475 + intValue = 995503961 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -976425917 + intValue = -1680473879 ) @Export("canvasX") int canvasX; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1664726751 + intValue = -63361611 ) @Export("canvasY") int canvasY; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 31638833 + intValue = 741948317 ) - int field177; - @ObfuscatedName("ac") + int field205; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1090157949 + intValue = 1573332371 ) - int field187; - @ObfuscatedName("ax") + int field200; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1992376427 + intValue = 1344171121 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -284047095 + intValue = -337625473 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("frame") Frame frame; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("ad") + @ObfuscatedName("an") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedGetter( - longValue = -8844499073377564733L + longValue = 5910881770928839481L ) - volatile long field197; - @ObfuscatedName("aq") + volatile long field209; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lz;" + descriptor = "Lj;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("ah") + @ObfuscatedName("af") @Export("eventQueue") final EventQueue eventQueue; @@ -193,383 +202,363 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen GameEngine_redundantStartThreadCount = 0; // L: 43 stopTimeMs = 0L; // L: 44 isKilled = false; // L: 45 - cycleDurationMillis = 20; - fiveOrOne = 1; - fps = 0; + cycleDurationMillis = 20; // L: 48 + fiveOrOne = 1; // L: 49 + fps = 0; // L: 50 graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field192 = 500; // L: 73 + field206 = 500; // L: 73 volatileFocus = true; // L: 82 garbageCollectorLastCollectionTime = -1L; // L: 85 garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameEngine() { - this.hasErrored = false; + this.hasErrored = false; // L: 46 this.canvasX = 0; // L: 59 this.canvasY = 0; // L: 60 this.fullRedraw = true; // L: 71 this.resizeCanvasNextFrame = false; // L: 74 this.isCanvasInvalid = false; // L: 75 - this.field197 = 0L; // L: 76 + this.field209 = 0L; // L: 76 EventQueue var1 = null; // L: 89 try { var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 - } catch (Throwable var3) { + } catch (Throwable var3) { // L: 93 } - this.eventQueue = var1; - class125.method2804(new DevicePcmPlayerProvider()); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-426630363" - ) - @Export("setMaxCanvasSize") - protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method469(); - } - - this.maxCanvasWidth = var1; - this.maxCanvasHeight = var2; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "478240082" - ) - @Export("post") - final void post(Object var1) { - if (this.eventQueue != null) { - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - GrandExchangeOfferTotalQuantityComparator.method6007(1L); - } - - if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); - } - - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Lfz;", - garbageValue = "-1404787408" - ) - @Export("mouseWheel") - protected class158 mouseWheel() { - if (this.mouseWheelHandler == null) { // L: 111 - this.mouseWheelHandler = new MouseWheelHandler(); - this.mouseWheelHandler.addTo(this.canvas); - } - - return this.mouseWheelHandler; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "30" - ) - @Export("setUpClipboard") - protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119 - } // L: 120 + this.eventQueue = var1; // L: 94 + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 + class384.pcmPlayerProvider = var2; // L: 97 + } // L: 99 @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "0" + descriptor = "(III)V", + garbageValue = "-1436013377" ) - protected void method535(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123 - } // L: 124 + @Export("setMaxCanvasSize") + protected final void setMaxCanvasSize(int var1, int var2) { + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 + this.method466(); + } - @ObfuscatedName("u") + this.maxCanvasWidth = var1; // L: 103 + this.maxCanvasHeight = var2; // L: 104 + } // L: 105 + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-45" + descriptor = "(Ljava/lang/Object;I)V", + garbageValue = "82345296" + ) + @Export("post") + final void post(Object var1) { + if (this.eventQueue != null) { // L: 108 + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 + class93.method2384(1L); + } + + if (var1 != null) { + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110 + } + + } + } // L: 111 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Lfo;", + garbageValue = "-1578740301" + ) + @Export("mouseWheel") + protected class158 mouseWheel() { + if (this.mouseWheelHandler == null) { // L: 114 + this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 + this.mouseWheelHandler.addTo(this.canvas); // L: 116 + } + + return this.mouseWheelHandler; // L: 118 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1872048935" + ) + @Export("setUpClipboard") + protected void setUpClipboard() { + this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 + } // L: 123 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "109" + ) + protected void method452(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 + } // L: 127 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1077399719" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - if (ChatChannel.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 128 - KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 129 - KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 130 - KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 131 - KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 132 - KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 133 - KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 134 - KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 135 - KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 136 - KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 137 - KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 138 - KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 139 - KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 140 - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 143 - KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 144 - KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 145 - KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 146 - KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 147 - KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 148 - KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 149 - KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 150 - KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 151 - KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 152 - KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 153 - KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 154 - } + StudioGame.method5776(); // L: 130 + java.awt.Canvas var1 = this.canvas; // L: 131 + var1.setFocusTraversalKeysEnabled(false); // L: 133 + var1.addKeyListener(KeyHandler.KeyHandler_instance); + var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 135 + } - java.awt.Canvas var1 = this.canvas; // L: 157 - var1.setFocusTraversalKeysEnabled(false); // L: 159 - var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 160 - var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 161 - } // L: 163 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-41" + ) + protected final void method428() { + java.awt.Canvas var1 = this.canvas; + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 144 + } @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1582400139" - ) - protected final void method534() { - UserComparator7.method2584(this.canvas); // L: 166 - } // L: 167 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-20103" + garbageValue = "825452096" ) @Export("resizeCanvas") final void resizeCanvas() { - Container var1 = this.container(); // L: 170 - if (var1 != null) { // L: 171 - Bounds var2 = this.getFrameContentBounds(); // L: 172 - this.contentWidth = Math.max(var2.highX, this.field177); // L: 173 - this.contentHeight = Math.max(var2.highY, this.field187); // L: 174 - if (this.contentWidth <= 0) { // L: 175 + Container var1 = this.container(); // L: 149 + if (var1 != null) { // L: 150 + Bounds var2 = this.getFrameContentBounds(); // L: 151 + this.contentWidth = Math.max(var2.highX, this.field205); // L: 152 + this.contentHeight = Math.max(var2.highY, this.field200); // L: 153 + if (this.contentWidth <= 0) { // L: 154 this.contentWidth = 1; } - if (this.contentHeight <= 0) { // L: 176 + if (this.contentHeight <= 0) { // L: 155 this.contentHeight = 1; } - class4.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 177 - class309.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 178 - this.canvasX = (this.contentWidth - class4.canvasWidth) / 2; // L: 179 - this.canvasY = 0; // L: 180 - this.canvas.setSize(class4.canvasWidth, class309.canvasHeight); // L: 181 - SpotAnimationDefinition.rasterProvider = new RasterProvider(class4.canvasWidth, class309.canvasHeight, this.canvas); // L: 182 - if (var1 == this.frame) { // L: 183 - Insets var3 = this.frame.getInsets(); // L: 184 - this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 185 + InvDefinition.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 156 + class321.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 157 + this.canvasX = (this.contentWidth - InvDefinition.canvasWidth) / 2; // L: 158 + this.canvasY = 0; // L: 159 + this.canvas.setSize(InvDefinition.canvasWidth, class321.canvasHeight); // L: 160 + FontName.rasterProvider = new RasterProvider(InvDefinition.canvasWidth, class321.canvasHeight, this.canvas); // L: 161 + if (var1 == this.frame) { // L: 162 + Insets var3 = this.frame.getInsets(); // L: 163 + this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); // L: 164 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 187 + this.canvas.setLocation(this.canvasX, this.canvasY); } - this.fullRedraw = true; // L: 188 - this.resizeGame(); // L: 189 + this.fullRedraw = true; + this.resizeGame(); } - } // L: 190 + } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1462606142" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "111" + descriptor = "(I)V", + garbageValue = "-977788049" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 195 - int var2 = this.canvasY; // L: 196 - int var3 = this.contentWidth - class4.canvasWidth - var1; // L: 197 - int var4 = this.contentHeight - class309.canvasHeight - var2; // L: 198 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 199 + int var1 = this.canvasX; // L: 174 + int var2 = this.canvasY; // L: 175 + int var3 = this.contentWidth - InvDefinition.canvasWidth - var1; // L: 176 + int var4 = this.contentHeight - class321.canvasHeight - var2; // L: 177 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 178 try { - Container var5 = this.container(); // L: 201 - int var6 = 0; // L: 202 - int var7 = 0; // L: 203 - if (var5 == this.frame) { // L: 204 - Insets var8 = this.frame.getInsets(); // L: 205 - var6 = var8.left; // L: 206 - var7 = var8.top; // L: 207 + Container var5 = this.container(); // L: 180 + int var6 = 0; // L: 181 + int var7 = 0; // L: 182 + if (var5 == this.frame) { // L: 183 + Insets var8 = this.frame.getInsets(); // L: 184 + var6 = var8.left; // L: 185 + var7 = var8.top; // L: 186 } - Graphics var10 = var5.getGraphics(); // L: 209 - var10.setColor(Color.black); // L: 210 + Graphics var10 = var5.getGraphics(); // L: 188 + var10.setColor(Color.black); // L: 189 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 211 + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 190 } - if (var2 > 0) { // L: 212 + if (var2 > 0) { // L: 191 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 213 + if (var3 > 0) { // L: 192 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 214 + if (var4 > 0) { // L: 193 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 216 + } catch (Exception var9) { // L: 195 } } - } // L: 218 + } // L: 197 - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "5" + garbageValue = "-125" ) @Export("replaceCanvas") final void replaceCanvas() { - CollisionMap.method3852(this.canvas); // L: 221 - java.awt.Canvas var1 = this.canvas; // L: 222 - var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 224 - var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 225 - var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 226 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 227 - if (this.mouseWheelHandler != null) { // L: 229 + Renderable.method4928(this.canvas); // L: 200 + java.awt.Canvas var1 = this.canvas; // L: 201 + var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 203 + var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 204 + var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 205 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 206 + if (this.mouseWheelHandler != null) { // L: 208 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 230 - java.awt.Canvas var2 = this.canvas; // L: 231 - var2.setFocusTraversalKeysEnabled(false); // L: 233 - var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 234 - var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 235 - UserComparator7.method2584(this.canvas); // L: 237 - if (this.mouseWheelHandler != null) { // L: 238 - this.mouseWheelHandler.addTo(this.canvas); + this.addCanvas(); // L: 209 + java.awt.Canvas var2 = this.canvas; // L: 210 + var2.setFocusTraversalKeysEnabled(false); // L: 212 + var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 213 + var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 214 + java.awt.Canvas var3 = this.canvas; // L: 216 + var3.addMouseListener(MouseHandler.MouseHandler_instance); // L: 218 + var3.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 219 + var3.addFocusListener(MouseHandler.MouseHandler_instance); // L: 220 + if (this.mouseWheelHandler != null) { + this.mouseWheelHandler.addTo(this.canvas); // L: 222 } - this.method469(); // L: 239 - } // L: 240 + this.method466(); // L: 223 + } // L: 224 - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2101804155" + descriptor = "(IIIB)V", + garbageValue = "-34" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 244 - ++GameEngine_redundantStartThreadCount; // L: 245 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 246 - this.error("alreadyloaded"); // L: 247 - return; // L: 248 + if (gameEngine != null) { // L: 228 + ++GameEngine_redundantStartThreadCount; // L: 229 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 230 + this.error("alreadyloaded"); // L: 231 + return; // L: 232 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 250 - return; // L: 251 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 234 + return; // L: 235 } - gameEngine = this; // L: 253 - class4.canvasWidth = var1; // L: 254 - class309.canvasHeight = var2; // L: 255 - RunException.RunException_revision = var3; // L: 256 - RunException.RunException_applet = this; // L: 257 - if (class434.taskHandler == null) { // L: 258 - class434.taskHandler = new TaskHandler(); + gameEngine = this; // L: 237 + InvDefinition.canvasWidth = var1; // L: 238 + class321.canvasHeight = var2; // L: 239 + RunException.RunException_revision = var3; // L: 240 + RunException.RunException_applet = this; // L: 241 + if (taskHandler == null) { // L: 242 + taskHandler = new TaskHandler(); } - class434.taskHandler.newThreadTask(this, 1); // L: 259 - } catch (Exception var5) { // L: 261 - class301.RunException_sendStackTrace((String)null, var5); // L: 262 - this.error("crash"); // L: 263 + taskHandler.newThreadTask(this, 1); // L: 243 + } catch (Exception var5) { // L: 245 + Widget.RunException_sendStackTrace((String)null, var5); // L: 246 + this.error("crash"); // L: 247 } - } // L: 265 + } // L: 249 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-50" + descriptor = "(I)V", + garbageValue = "2136462097" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 268 - if (this.canvas != null) { // L: 269 - this.canvas.removeFocusListener(this); // L: 270 - var1.remove(this.canvas); // L: 271 + Container var1 = this.container(); // L: 252 + if (this.canvas != null) { // L: 253 + this.canvas.removeFocusListener(this); // L: 254 + var1.remove(this.canvas); // L: 255 } - class4.canvasWidth = Math.max(var1.getWidth(), this.field177); // L: 273 - class309.canvasHeight = Math.max(var1.getHeight(), this.field187); // L: 274 + InvDefinition.canvasWidth = Math.max(var1.getWidth(), this.field205); // L: 257 + class321.canvasHeight = Math.max(var1.getHeight(), this.field200); // L: 258 Insets var2; - if (this.frame != null) { // L: 275 - var2 = this.frame.getInsets(); // L: 276 - class4.canvasWidth -= var2.right + var2.left; // L: 277 - class309.canvasHeight -= var2.top + var2.bottom; // L: 278 + if (this.frame != null) { // L: 259 + var2 = this.frame.getInsets(); // L: 260 + InvDefinition.canvasWidth -= var2.right + var2.left; // L: 261 + class321.canvasHeight -= var2.top + var2.bottom; // L: 262 } - this.canvas = new Canvas(this); // L: 280 - var1.setBackground(Color.BLACK); // L: 281 - var1.setLayout((LayoutManager)null); // L: 282 - var1.add(this.canvas); // L: 283 - this.canvas.setSize(class4.canvasWidth, class309.canvasHeight); // L: 284 - this.canvas.setVisible(true); // L: 285 - this.canvas.setBackground(Color.BLACK); // L: 286 - if (var1 == this.frame) { // L: 287 - var2 = this.frame.getInsets(); // L: 288 - this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY); // L: 289 + this.canvas = new Canvas(this); // L: 264 + var1.setBackground(Color.BLACK); // L: 265 + var1.setLayout((LayoutManager)null); // L: 266 + var1.add(this.canvas); // L: 267 + this.canvas.setSize(InvDefinition.canvasWidth, class321.canvasHeight); // L: 268 + this.canvas.setVisible(true); // L: 269 + this.canvas.setBackground(Color.BLACK); // L: 270 + if (var1 == this.frame) { // L: 271 + var2 = this.frame.getInsets(); // L: 272 + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 273 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 291 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 275 } - this.canvas.addFocusListener(this); // L: 292 - this.canvas.requestFocus(); // L: 293 - this.fullRedraw = true; // L: 294 - if (SpotAnimationDefinition.rasterProvider != null && class4.canvasWidth == SpotAnimationDefinition.rasterProvider.width && class309.canvasHeight == SpotAnimationDefinition.rasterProvider.height) { // L: 295 - ((RasterProvider)SpotAnimationDefinition.rasterProvider).setComponent(this.canvas); // L: 296 - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 297 + this.canvas.addFocusListener(this); // L: 276 + this.canvas.requestFocus(); // L: 277 + this.fullRedraw = true; // L: 278 + if (FontName.rasterProvider != null && InvDefinition.canvasWidth == FontName.rasterProvider.width && class321.canvasHeight == FontName.rasterProvider.height) { // L: 279 + ((RasterProvider)FontName.rasterProvider).setComponent(this.canvas); // L: 280 + FontName.rasterProvider.drawFull(0, 0); // L: 281 } else { - SpotAnimationDefinition.rasterProvider = new RasterProvider(class4.canvasWidth, class309.canvasHeight, this.canvas); // L: 300 + FontName.rasterProvider = new RasterProvider(InvDefinition.canvasWidth, class321.canvasHeight, this.canvas); // L: 284 } - this.isCanvasInvalid = false; // L: 302 - this.field197 = WorldMapSprite.method4989(); // L: 303 - } // L: 304 + this.isCanvasInvalid = false; // L: 286 + this.field209 = class136.method2931(); // L: 287 + } // L: 288 - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "27" + descriptor = "(I)Z", + garbageValue = "1626365648" ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 307 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 308 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 309 - if (var1.endsWith("127.0.0.1")) { // L: 310 + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 291 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 292 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 293 + if (var1.endsWith("127.0.0.1")) { // L: 294 return true; } else { while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); // L: 311 + var1 = var1.substring(0, var1.length() - 1); // L: 295 } - if (var1.endsWith("192.168.1.")) { // L: 312 + if (var1.endsWith("192.168.1.")) { // L: 296 return true; } else { - this.error("invalidhost"); // L: 313 - return false; // L: 314 + this.error("invalidhost"); // L: 297 + return false; // L: 298 } } } else { @@ -580,521 +569,471 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "858052670" + garbageValue = "-1855362741" ) @Export("clientTick") void clientTick() { - long var1 = WorldMapSprite.method4989(); // L: 358 - long var3 = clientTickTimes[class82.field1071]; // L: 359 - clientTickTimes[class82.field1071] = var1; // L: 360 - class82.field1071 = class82.field1071 + 1 & 31; // L: 361 - if (0L != var3 && var1 > var3) { // L: 362 + long var1 = class136.method2931(); // L: 351 + long var3 = clientTickTimes[SoundCache.field311]; // L: 352 + clientTickTimes[SoundCache.field311] = var1; // L: 353 + SoundCache.field311 = SoundCache.field311 + 1 & 31; // L: 354 + if (var3 != 0L && var1 > var3) { // L: 355 } - synchronized(this) { // L: 363 - Varps.hasFocus = volatileFocus; // L: 364 - } // L: 365 + synchronized(this) { // L: 356 + Varcs.hasFocus = volatileFocus; // L: 357 + } // L: 358 - this.doCycle(); // L: 366 - } // L: 367 + this.doCycle(); // L: 359 + } // L: 360 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "30" + ) + @Export("graphicsTick") + void graphicsTick() { + Container var1 = this.container(); // L: 363 + long var2 = class136.method2931(); // L: 364 + long var4 = graphicsTickTimes[Fonts.field4517]; // L: 365 + graphicsTickTimes[Fonts.field4517] = var2; // L: 366 + Fonts.field4517 = Fonts.field4517 + 1 & 31; // L: 367 + if (0L != var4 && var2 > var4) { // L: 368 + int var6 = (int)(var2 - var4); // L: 369 + fps = ((var6 >> 1) + 32000) / var6; // L: 370 + } + + if (++field206 - 1 > 50) { // L: 372 + field206 -= 50; // L: 373 + this.fullRedraw = true; // L: 374 + this.canvas.setSize(InvDefinition.canvasWidth, class321.canvasHeight); // L: 375 + this.canvas.setVisible(true); // L: 376 + if (var1 == this.frame) { // L: 377 + Insets var7 = this.frame.getInsets(); // L: 378 + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 379 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 381 + } + } + + if (this.isCanvasInvalid) { // L: 383 + this.replaceCanvas(); + } + + this.method438(); // L: 384 + this.draw(this.fullRedraw); // L: 385 + if (this.fullRedraw) { // L: 386 + this.clearBackground(); + } + + this.fullRedraw = false; // L: 387 + } // L: 388 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-20" + ) + final void method438() { + Bounds var1 = this.getFrameContentBounds(); // L: 391 + if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 392 + this.resizeCanvas(); // L: 393 + this.resizeCanvasNextFrame = false; // L: 394 + } + + } // L: 396 @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1307738586" + garbageValue = "-1741244290" ) - @Export("graphicsTick") - void graphicsTick() { - Container var1 = this.container(); // L: 370 - long var2 = WorldMapSprite.method4989(); // L: 371 - long var4 = graphicsTickTimes[BufferedNetSocket.field4286]; // L: 372 - graphicsTickTimes[BufferedNetSocket.field4286] = var2; // L: 373 - BufferedNetSocket.field4286 = BufferedNetSocket.field4286 + 1 & 31; // L: 374 - if (var4 != 0L && var2 > var4) { // L: 375 - int var6 = (int)(var2 - var4); // L: 376 - fps = ((var6 >> 1) + 32000) / var6; // L: 377 - } - - if (++field192 - 1 > 50) { // L: 379 - field192 -= 50; // L: 380 - this.fullRedraw = true; // L: 381 - this.canvas.setSize(class4.canvasWidth, class309.canvasHeight); // L: 382 - this.canvas.setVisible(true); // L: 383 - if (var1 == this.frame) { // L: 384 - Insets var7 = this.frame.getInsets(); // L: 385 - this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); // L: 386 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 388 - } - } - - if (this.isCanvasInvalid) { // L: 390 - this.replaceCanvas(); - } - - this.method468(); // L: 391 - this.draw(this.fullRedraw); // L: 392 - if (this.fullRedraw) { // L: 393 - this.clearBackground(); - } - - this.fullRedraw = false; // L: 394 - } // L: 395 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-204191070" - ) - final void method468() { - Bounds var1 = this.getFrameContentBounds(); // L: 398 - if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 399 - this.resizeCanvas(); // L: 400 - this.resizeCanvasNextFrame = false; // L: 401 - } - - } // L: 403 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1470362606" - ) - final void method469() { - this.resizeCanvasNextFrame = true; // L: 406 - } // L: 407 + final void method466() { + this.resizeCanvasNextFrame = true; // L: 399 + } // L: 400 @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1753011645" + garbageValue = "1463619182" ) @Export("kill") final synchronized void kill() { - if (!isKilled) { // L: 410 - isKilled = true; // L: 411 + if (!isKilled) { // L: 403 + isKilled = true; // L: 404 try { - this.canvas.removeFocusListener(this); // L: 413 - } catch (Exception var5) { // L: 415 + this.canvas.removeFocusListener(this); // L: 406 + } catch (Exception var5) { // L: 408 } try { - this.kill0(); // L: 417 - } catch (Exception var4) { // L: 419 + this.kill0(); // L: 410 + } catch (Exception var4) { // L: 412 } - if (this.frame != null) { // L: 420 + if (this.frame != null) { // L: 413 try { - System.exit(0); // L: 422 - } catch (Throwable var3) { // L: 424 + System.exit(0); // L: 415 + } catch (Throwable var3) { // L: 417 } } - if (class434.taskHandler != null) { // L: 426 + if (taskHandler != null) { // L: 419 try { - class434.taskHandler.close(); // L: 428 - } catch (Exception var2) { // L: 430 + taskHandler.close(); // L: 421 + } catch (Exception var2) { // L: 423 } } - this.vmethod1135(); // L: 432 + this.vmethod1140(); // L: 425 } - } // L: 433 + } // L: 426 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "120" + descriptor = "(I)V", + garbageValue = "1665364684" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "612160698" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1683905481" + descriptor = "(ZS)V", + garbageValue = "-8708" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2114912088" + garbageValue = "-1364313232" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "-1473189085" + descriptor = "(ILjava/lang/String;ZB)V", + garbageValue = "40" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); // L: 519 - if (fontHelvetica13 == null) { // L: 520 - fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 521 - class241.loginScreenFontMetrics = this.canvas.getFontMetrics(fontHelvetica13); // L: 522 + Graphics var4 = this.canvas.getGraphics(); // L: 493 + if (WorldMapArchiveLoader.fontHelvetica13 == null) { // L: 494 + WorldMapArchiveLoader.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 495 + WorldMapSection1.loginScreenFontMetrics = this.canvas.getFontMetrics(WorldMapArchiveLoader.fontHelvetica13); // L: 496 } - if (var3) { // L: 524 - var4.setColor(Color.black); // L: 525 - var4.fillRect(0, 0, class4.canvasWidth, class309.canvasHeight); // L: 526 + if (var3) { // L: 498 + var4.setColor(Color.black); // L: 499 + var4.fillRect(0, 0, InvDefinition.canvasWidth, class321.canvasHeight); // L: 500 } - Color var5 = new Color(140, 17, 17); // L: 528 + Color var5 = new Color(140, 17, 17); // L: 502 try { - if (class11.field56 == null) { // L: 530 - class11.field56 = this.canvas.createImage(304, 34); + if (class1.field3 == null) { // L: 504 + class1.field3 = this.canvas.createImage(304, 34); } - Graphics var6 = class11.field56.getGraphics(); // L: 531 - var6.setColor(var5); // L: 532 - var6.drawRect(0, 0, 303, 33); // L: 533 - var6.fillRect(2, 2, var1 * 3, 30); // L: 534 - var6.setColor(Color.black); // L: 535 - var6.drawRect(1, 1, 301, 31); // L: 536 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 537 - var6.setFont(fontHelvetica13); // L: 538 - var6.setColor(Color.white); // L: 539 - var6.drawString(var2, (304 - class241.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 540 - var4.drawImage(class11.field56, class4.canvasWidth / 2 - 152, class309.canvasHeight / 2 - 18, (ImageObserver)null); // L: 541 - } catch (Exception var9) { // L: 543 - int var7 = class4.canvasWidth / 2 - 152; // L: 544 - int var8 = class309.canvasHeight / 2 - 18; // L: 545 - var4.setColor(var5); // L: 546 - var4.drawRect(var7, var8, 303, 33); // L: 547 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 548 - var4.setColor(Color.black); // L: 549 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 550 - var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 551 - var4.setFont(fontHelvetica13); // L: 552 - var4.setColor(Color.white); // L: 553 - var4.drawString(var2, var7 + (304 - class241.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 554 + Graphics var6 = class1.field3.getGraphics(); // L: 505 + var6.setColor(var5); // L: 506 + var6.drawRect(0, 0, 303, 33); // L: 507 + var6.fillRect(2, 2, var1 * 3, 30); // L: 508 + var6.setColor(Color.black); // L: 509 + var6.drawRect(1, 1, 301, 31); // L: 510 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 511 + var6.setFont(WorldMapArchiveLoader.fontHelvetica13); // L: 512 + var6.setColor(Color.white); // L: 513 + var6.drawString(var2, (304 - WorldMapSection1.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 514 + var4.drawImage(class1.field3, InvDefinition.canvasWidth / 2 - 152, class321.canvasHeight / 2 - 18, (ImageObserver)null); // L: 515 + } catch (Exception var9) { // L: 517 + int var7 = InvDefinition.canvasWidth / 2 - 152; // L: 518 + int var8 = class321.canvasHeight / 2 - 18; // L: 519 + var4.setColor(var5); // L: 520 + var4.drawRect(var7, var8, 303, 33); // L: 521 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 522 + var4.setColor(Color.black); // L: 523 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 524 + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 525 + var4.setFont(WorldMapArchiveLoader.fontHelvetica13); // L: 526 + var4.setColor(Color.white); // L: 527 + var4.drawString(var2, var7 + (304 - WorldMapSection1.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 528 } - } catch (Exception var10) { // L: 557 - this.canvas.repaint(); // L: 558 + } catch (Exception var10) { // L: 531 + this.canvas.repaint(); // L: 532 } - } // L: 560 + } // L: 534 - @ObfuscatedName("aj") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1566808200" + garbageValue = "900281563" ) - protected final void method481() { - class11.field56 = null; // L: 563 - fontHelvetica13 = null; // L: 564 - class241.loginScreenFontMetrics = null; // L: 565 - } // L: 566 + protected final void method520() { + class1.field3 = null; // L: 537 + WorldMapArchiveLoader.fontHelvetica13 = null; // L: 538 + WorldMapSection1.loginScreenFontMetrics = null; // L: 539 + } // L: 540 - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-314865656" + garbageValue = "-1191491956" ) @Export("error") protected void error(String var1) { - if (!this.hasErrored) { // L: 569 - this.hasErrored = true; // L: 570 - System.out.println("error_game_" + var1); // L: 571 + if (!this.hasErrored) { // L: 543 + this.hasErrored = true; // L: 544 + System.out.println("error_game_" + var1); // L: 545 try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 573 - } catch (Exception var3) { // L: 575 + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 547 + } catch (Exception var3) { // L: 549 } } - } // L: 576 + } // L: 550 - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-394881039" + descriptor = "(B)Ljava/awt/Container;", + garbageValue = "-23" ) @Export("container") Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 579 + return (Container)(this.frame != null ? this.frame : this); // L: 553 + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(S)Lnm;", + garbageValue = "5503" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 558 + int var2 = Math.max(var1.getWidth(), this.field205); // L: 559 + int var3 = Math.max(var1.getHeight(), this.field200); // L: 560 + if (this.frame != null) { // L: 561 + Insets var4 = this.frame.getInsets(); // L: 562 + var2 -= var4.left + var4.right; // L: 563 + var3 -= var4.top + var4.bottom; // L: 564 + } + + return new Bounds(var2, var3); // L: 566 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "180596017" + ) + @Export("hasFrame") + protected final boolean hasFrame() { + return this.frame != null; // L: 570 } @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)Lnm;", - garbageValue = "1930493271" + descriptor = "(I)V", + garbageValue = "111435525" ) - @Export("getFrameContentBounds") - Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 584 - int var2 = Math.max(var1.getWidth(), this.field177); // L: 585 - int var3 = Math.max(var1.getHeight(), this.field187); // L: 586 - if (this.frame != null) { // L: 587 - Insets var4 = this.frame.getInsets(); // L: 588 - var2 -= var4.right + var4.left; // L: 589 - var3 -= var4.top + var4.bottom; // L: 590 - } - - return new Bounds(var2, var3); // L: 592 - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1758582880" - ) - @Export("hasFrame") - protected final boolean hasFrame() { - return this.frame != null; // L: 596 - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "14" - ) - protected abstract void vmethod1135(); + protected abstract void vmethod1140(); public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { // L: 469 - this.fullRedraw = true; // L: 470 - if (WorldMapSprite.method4989() - this.field197 > 1000L) { // L: 471 - Rectangle var2 = var1.getClipBounds(); // L: 472 - if (var2 == null || var2.width >= class4.canvasWidth && var2.height >= class309.canvasHeight) { - this.isCanvasInvalid = true; // L: 473 + if (this == gameEngine && !isKilled) { // L: 457 + this.fullRedraw = true; // L: 458 + if (class136.method2931() - this.field209 > 1000L) { // L: 459 + Rectangle var2 = var1.getClipBounds(); // L: 460 + if (var2 == null || var2.width >= InvDefinition.canvasWidth && var2.height >= class321.canvasHeight) { + this.isCanvasInvalid = true; // L: 461 } } } - } // L: 475 + } // L: 463 public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 456 - stopTimeMs = WorldMapSprite.method4989(); // L: 457 - GrandExchangeOfferTotalQuantityComparator.method6007(5000L); // L: 458 - this.kill(); // L: 459 + if (this == gameEngine && !isKilled) { // L: 446 + stopTimeMs = class136.method2931(); // L: 447 + class93.method2384(5000L); // L: 448 + this.kill(); // L: 449 } - } // L: 460 - - public void run() { - try { - if (ChatChannel.javaVendor != null) { // L: 319 - String var1 = ChatChannel.javaVendor.toLowerCase(); // L: 320 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 321 - String var2 = TaskHandler.javaVersion; // L: 322 - if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 323 - this.error("wrongjava"); // L: 324 - return; // L: 325 - } - - if (var2.startsWith("1.6.0_")) { // L: 327 - int var3; - for (var3 = 6; var3 < var2.length() && class117.isDigit(var2.charAt(var3)); ++var3) { // L: 328 329 - } - - String var4 = var2.substring(6, var3); // L: 330 - if (class20.isNumber(var4) && class16.method217(var4) < 10) { // L: 331 - this.error("wrongjava"); // L: 332 - return; // L: 333 - } - } - - fiveOrOne = 5; // L: 336 - } - } - - this.setFocusCycleRoot(true); // L: 339 - this.addCanvas(); // L: 340 - this.setUp(); // L: 341 - class4.clock = UserComparator5.method2592(); // L: 342 - - while (stopTimeMs == 0L || WorldMapSprite.method4989() < stopTimeMs) { // L: 343 - class134.gameCyclesToDo = class4.clock.wait(cycleDurationMillis, fiveOrOne); // L: 344 - - for (int var5 = 0; var5 < class134.gameCyclesToDo; ++var5) { // L: 345 - this.clientTick(); - } - - this.graphicsTick(); // L: 346 - this.post(this.canvas); // L: 347 - } - } catch (Exception var6) { // L: 350 - class301.RunException_sendStackTrace((String)null, var6); // L: 351 - this.error("crash"); // L: 352 - } - - this.kill(); // L: 354 - } // L: 355 - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 485 - } // L: 486 - - public final void update(Graphics var1) { - this.paint(var1); // L: 464 - } // L: 465 - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 479 - this.fullRedraw = true; // L: 480 - } // L: 481 - - public final void stop() { - if (this == gameEngine && !isKilled) { // L: 450 - stopTimeMs = WorldMapSprite.method4989() + 4000L; // L: 451 - } - } // L: 452 + } // L: 450 public final void windowActivated(WindowEvent var1) { - } // L: 489 + } // L: 474 + + public final void start() { + if (this == gameEngine && !isKilled) { // L: 436 + stopTimeMs = 0L; // L: 437 + } + } // L: 438 + + public final void stop() { + if (this == gameEngine && !isKilled) { // L: 441 + stopTimeMs = class136.method2931() + 4000L; // L: 442 + } + } // L: 443 + + public final void update(Graphics var1) { + this.paint(var1); // L: 453 + } // L: 454 + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; // L: 471 + } // L: 472 public final void windowClosed(WindowEvent var1) { - } // L: 492 + } // L: 475 - public final void windowDeactivated(WindowEvent var1) { - } // L: 500 + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 478 + } // L: 479 public final void windowDeiconified(WindowEvent var1) { - } // L: 503 + } // L: 482 + + public final void windowIconified(WindowEvent var1) { + } // L: 483 + + public final void windowOpened(WindowEvent var1) { + } // L: 484 public abstract void init(); - public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 496 - } // L: 497 + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 466 + this.fullRedraw = true; // L: 467 + } // L: 468 - public final void windowIconified(WindowEvent var1) { - } // L: 506 + public final void windowDeactivated(WindowEvent var1) { + } // L: 481 - public final void start() { - if (this == gameEngine && !isKilled) { // L: 444 - stopTimeMs = 0L; // L: 445 + public void run() { + try { + if (TaskHandler.javaVendor != null) { // L: 303 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 304 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 305 + String var2 = TaskHandler.javaVersion; // L: 306 + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 307 + this.error("wrongjava"); // L: 308 + return; // L: 309 + } + + if (var2.startsWith("1.6.0_")) { // L: 311 + int var3; + for (var3 = 6; var3 < var2.length() && WorldMapElement.isDigit(var2.charAt(var3)); ++var3) { // L: 312 313 + } + + String var4 = var2.substring(6, var3); // L: 314 + if (class300.isNumber(var4) && class19.method288(var4) < 10) { // L: 315 + this.error("wrongjava"); // L: 316 + return; // L: 317 + } + } + + fiveOrOne = 5; // L: 320 + } + } + + this.setFocusCycleRoot(true); // L: 323 + this.addCanvas(); // L: 324 + this.setUp(); // L: 325 + + Object var8; + try { + var8 = new NanoClock(); // L: 329 + } catch (Throwable var6) { // L: 331 + var8 = new MilliClock(); // L: 332 + } + + class431.clock = (Clock)var8; // L: 335 + + while (stopTimeMs == 0L || class136.method2931() < stopTimeMs) { // L: 336 + TriBool.gameCyclesToDo = class431.clock.wait(cycleDurationMillis, fiveOrOne); // L: 337 + + for (int var5 = 0; var5 < TriBool.gameCyclesToDo; ++var5) { // L: 338 + this.clientTick(); + } + + this.graphicsTick(); // L: 339 + this.post(this.canvas); // L: 340 + } + } catch (Exception var7) { // L: 343 + Widget.RunException_sendStackTrace((String)null, var7); // L: 344 + this.error("crash"); // L: 345 } - } // L: 446 - public final void windowOpened(WindowEvent var1) { - } // L: 509 + this.kill(); // L: 347 + } // L: 348 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lgj;", - garbageValue = "1098154706" + descriptor = "(I)V", + garbageValue = "1147911593" ) - public static HitSplatDefinition method589(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46 - if (var1 != null) { // L: 47 - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48 - var1 = new HitSplatDefinition(); // L: 49 - if (var2 != null) { // L: 50 - var1.decode(new Buffer(var2)); - } + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 134 - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 - return var1; // L: 52 + try { + var0 = ModeWhere.getPreferencesFile("", Messages.field1305.name, true); // L: 136 + Buffer var1 = class131.clientPreferences.toBuffer(); // L: 137 + var0.write(var1.array, 0, var1.offset); // L: 138 + } catch (Exception var3) { // L: 140 } - } - @ObfuscatedName("o") + try { + if (var0 != null) { // L: 142 + var0.closeSync(true); // L: 143 + } + } catch (Exception var2) { // L: 146 + } + + } // L: 147 + + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(CLlp;I)C", - garbageValue = "705203472" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1079114439" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 93 - if (var0 >= 192 && var0 <= 198) { // L: 94 - return 'A'; - } + static final void method569(String var0) { + PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2912, Client.packetWriter.isaacCipher); // L: 165 + var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 166 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 167 + Client.packetWriter.addNode(var1); // L: 168 + } // L: 169 - if (var0 == 199) { // L: 95 - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { // L: 96 - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { // L: 97 - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { // L: 98 - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { // L: 99 - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { // L: 100 - return 'U'; - } - - if (var0 == 221) { // L: 101 - return 'Y'; - } - - if (var0 == 223) { // L: 102 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 103 - return 'a'; - } - - if (var0 == 231) { // L: 104 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 105 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; // L: 106 - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 107 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 108 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 109 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 110 - return 'y'; - } - } - - if (var0 == 338) { // L: 112 - return 'O'; - } else if (var0 == 339) { // L: 113 - return 'o'; - } else if (var0 == 376) { // L: 114 - return 'Y'; - } else { - return var0; // L: 115 - } - } + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(ILks;ZI)V", + garbageValue = "1109556006" + ) + static void method570(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = class21.getWorldMap().getMapArea(var0); // L: 4737 + int var4 = GrandExchangeEvents.localPlayer.plane; // L: 4738 + int var5 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 4739 + int var6 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 4740 + Coord var7 = new Coord(var4, var5, var6); // L: 4741 + class21.getWorldMap().method7231(var3, var7, var1, var2); // L: 4742 + } // L: 4743 } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 7ce0cdb422..f4d85f3651 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,92 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("iy") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("w") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -847164107 + intValue = -1042326033 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -940265289 + intValue = -1852780791 ) @Export("z") int z; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -198288323 + intValue = -1035014481 ) @Export("centerX") int centerX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 240672507 + intValue = -491615683 ) @Export("centerY") int centerY; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("renderable") public Renderable renderable; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1154324973 + intValue = 949419433 ) @Export("orientation") int orientation; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2061335069 + intValue = 341581995 ) @Export("startX") int startX; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1084984155 + intValue = -1189496713 ) @Export("endX") int endX; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1316603005 + intValue = 897314371 ) @Export("startY") int startY; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -609115179 + intValue = 1130692301 ) @Export("endY") int endY; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1379225673 + intValue = -278227507 ) - int field2639; - @ObfuscatedName("x") + int field2865; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 508066469 + intValue = 946452763 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -5816453776814421193L + longValue = 3413023011063757331L ) @Export("tag") public long tag; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1479412759 + intValue = -742925927 ) @Export("flags") int flags; @@ -99,32 +96,56 @@ public final class GameObject { this.flags = 0; // L: 17 } // L: 19 - @ObfuscatedName("fv") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1885717447" + descriptor = "(IIII)Lbd;", + garbageValue = "1018035869" ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); // L: 2538 - MouseHandler.method593(); // L: 2539 - FriendSystem.scene.clear(); // L: 2540 + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = TileItem.method2393(var1, var0); // L: 38 + Script var4 = UserComparator5.method2600(var3, var0); // L: 39 + if (var4 != null) { // L: 40 + return var4; // L: 41 + } else { + int var5 = (-3 - var2 << 8) + var0; // L: 45 + var4 = UserComparator5.method2600(var5, var0); // L: 48 + return var4 != null ? var4 : null; // L: 49 52 + } + } - for (int var0 = 0; var0 < 4; ++var0) { // L: 2541 - Client.collisionMaps[var0].clear(); + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIIZIB)J", + garbageValue = "119" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 69 + if (var3) { // L: 70 + var5 |= 65536L; } - System.gc(); // L: 2542 - class273.musicPlayerStatus = 1; // L: 2544 - class147.musicTrackArchive = null; // L: 2545 - ArchiveLoader.musicTrackGroupId = -1; // L: 2546 - class273.musicTrackFileId = -1; // L: 2547 - DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 2548 - class260.musicTrackBoolean = false; // L: 2549 - class273.pcmSampleLength = 2; // L: 2550 - Client.currentTrackGroupId = -1; // L: 2552 - Client.field731 = false; // L: 2553 - Players.method2419(); // L: 2554 - InterfaceParent.updateGameState(10); // L: 2555 - } // L: 2556 + return var5; // L: 71 + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "329658125" + ) + static int method5111(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2697 + if (var0 == 3702) { // L: 2702 + ++Interpreter.Interpreter_intStackSize; // L: 2703 + return 1; // L: 2704 + } else { + return 2; // L: 2706 + } + } else { + --Interpreter.Interpreter_intStackSize; // L: 2698 + --class122.Interpreter_stringStackSize; // L: 2699 + return 1; // L: 2700 + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index cfb3f7b5a7..4fbae5432e 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("lc") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("kk") + @ObfuscatedName("kd") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("hoveredItemContainer") static Widget hoveredItemContainer; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1523225447 + intValue = 2120306507 ) @Export("world") public final int world; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 9015686361858837737L + longValue = 4339962193294531453L ) @Export("age") public final long age; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "Llh;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("offerName") String offerName; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lpd;BI)V" + descriptor = "(Lpi;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -49,8 +49,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); // L: 115 int var5 = var1.readInt(); // L: 116 this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method6050(2); // L: 118 - this.grandExchangeOffer.method6053(var2); // L: 119 + this.grandExchangeOffer.method6018(2); // L: 118 + this.grandExchangeOffer.method6025(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -60,63 +60,21 @@ public class GrandExchangeEvent { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "38" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1933113552" ) @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "118" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2144874603" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; // L: 132 } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Llq;IIB)Z", - garbageValue = "8" - ) - static boolean method6045(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 154 - if (var3 == null) { // L: 155 - return false; - } else { - ClientPreferences.SpriteBuffer_decode(var3); // L: 156 - return true; // L: 157 - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1578334518" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1802 - Login.Login_response2 = var1; // L: 1803 - Login.Login_response3 = var2; // L: 1804 - } // L: 1805 - - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "(IZZZB)Llu;", - garbageValue = "80" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 1764 - if (JagexCache.JagexCache_dat2File != null) { // L: 1765 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class194.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, PcmPlayer.masterDisk, var0, var1, var2, var3); // L: 1766 - } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 4e1cf372f7..3e227ac765 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -6,23 +6,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ll") +@ObfuscatedName("lu") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + @Export("localPlayer") + static Player localPlayer; @ObfuscatedName("v") @Export("events") public final List events; @@ -36,7 +41,7 @@ public class GrandExchangeEvents { } // L: 67 @ObfuscatedSignature( - descriptor = "(Lpd;Z)V", + descriptor = "(Lpi;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -61,7 +66,7 @@ public class GrandExchangeEvents { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "1259206127" + garbageValue = "-1621230645" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -72,62 +77,4 @@ public class GrandExchangeEvents { } } // L: 101 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "1624825414" - ) - static int method5993(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1199 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1200 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemId; // L: 1201 - return 1; // L: 1202 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1204 - if (var3.itemId != -1) { // L: 1205 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1206 - } - - return 1; // L: 1207 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1209 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1210 - return 1; // L: 1211 - } else if (var0 == 1707) { // L: 1213 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.method5642() ? 1 : 0; // L: 1214 - return 1; // L: 1215 - } else if (var0 == 1708) { // L: 1217 - return class302.method5773(var3); // L: 1218 - } else { - return var0 == 1708 ? WorldMapSectionType.method4952(var3) : 2; // L: 1220 1221 1223 - } - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "([Lkn;Lkn;ZI)V", - garbageValue = "-1924378319" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 519655973 * 737180077 : var1.width * 1149774003 * -646003077; // L: 10149 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 590865599 * -4879553 : var1.height * -1323757205 * 1884328771; // L: 10150 - class65.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10151 - if (var1.children != null) { // L: 10152 - class65.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10153 - if (var5 != null) { // L: 10154 - int var6 = var5.group; // L: 10155 - if (MusicPatchNode2.loadInterface(var6)) { // L: 10157 - class65.resizeInterface(EnumComposition.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10158 - } - } - - if (var1.contentType == 1337) { // L: 10161 - } - - } // L: 10162 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 6e0df652c5..54ce9d075d 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,39 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("lh") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { + @ObfuscatedName("z") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; @ObfuscatedName("v") @Export("state") byte state; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 10431225 + intValue = 882617765 ) @Export("id") public int id; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 268603401 + intValue = 274655921 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2119681887 + intValue = -1718567641 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 151834997 + intValue = 781050121 ) @Export("currentQuantity") public int currentQuantity; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -92952021 + intValue = 1429654689 ) @Export("currentPrice") public int currentPrice; @@ -45,7 +48,7 @@ public class GrandExchangeOffer { } // L: 13 @ObfuscatedSignature( - descriptor = "(Lpd;Z)V", + descriptor = "(Lpi;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -57,32 +60,32 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1572624507" + descriptor = "(S)I", + garbageValue = "3324" ) @Export("status") public int status() { return this.state & 7; // L: 50 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2085742420" + descriptor = "(B)I", + garbageValue = "126" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-337380449" + garbageValue = "659147953" ) - void method6050(int var1) { + void method6018(int var1) { this.state &= -8; // L: 58 this.state = (byte)(this.state | var1 & 7); // L: 59 } // L: 60 @@ -90,9 +93,9 @@ public class GrandExchangeOffer { @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1896957082" + garbageValue = "1485129862" ) - void method6053(int var1) { + void method6025(int var1) { this.state &= -9; // L: 63 if (var1 == 1) { this.state = (byte)(this.state | 8); // L: 64 @@ -100,51 +103,12 @@ public class GrandExchangeOffer { } // L: 65 - @ObfuscatedName("d") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lbr;Lbr;IZI)I", - garbageValue = "1940653872" + descriptor = "(IB)I", + garbageValue = "41" ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { // L: 211 - int var4 = var0.population; // L: 212 - int var5 = var1.population; // L: 213 - if (!var3) { // L: 214 - if (var4 == -1) { // L: 215 - var4 = 2001; - } - - if (var5 == -1) { // L: 216 - var5 = 2001; - } - } - - return var4 - var5; // L: 218 - } else if (var2 == 2) { // L: 220 - return var0.location - var1.location; - } else if (var2 == 3) { // L: 221 - if (var0.activity.equals("-")) { // L: 222 - if (var1.activity.equals("-")) { // L: 223 - return 0; - } else { - return var3 ? -1 : 1; // L: 224 - } - } else if (var1.activity.equals("-")) { // L: 226 - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); // L: 227 - } - } else if (var2 == 4) { // L: 229 - return var0.method1612() ? (var1.method1612() ? 0 : 1) : (var1.method1612() ? -1 : 0); - } else if (var2 == 5) { // L: 230 - return var0.method1628() ? (var1.method1628() ? 0 : 1) : (var1.method1628() ? -1 : 0); - } else if (var2 == 6) { // L: 231 - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { // L: 232 - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; // L: 233 - } + static int method6032(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3837 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 4d31b37e76..e7acaf0de2 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -4,24 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("lq") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "Lky;" + ) + static Widget field4011; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "-653507530" + descriptor = "(Llc;Llc;B)I", + garbageValue = "1" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 21 } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 37208f9afa..2039b0f366 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -4,16 +4,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("li") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("f") - static byte[][][] field4010; + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "1967104437" + descriptor = "(Llc;Llc;B)I", + garbageValue = "-86" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index c1a21451a5..99fec4f967 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,65 +1,135 @@ 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("bq") +@ObfuscatedName("bf") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("fa") - @Export("worldHost") - static String worldHost; + @ObfuscatedName("bg") + @ObfuscatedGetter( + intValue = -1956561099 + ) + static int field483; + @ObfuscatedName("hn") + @ObfuscatedGetter( + intValue = -525655717 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("nk") + @ObfuscatedSignature( + descriptor = "Lky;" + ) + static Widget field486; @ObfuscatedName("v") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 12001 + } // L: 12705 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "-1877864830" + descriptor = "(Llc;Llc;B)I", + garbageValue = "1" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 12004 + if (var2.world == var1.world) { // L: 12708 return 0; } else { - if (this.filterWorlds) { // L: 12005 - if (Client.worldId == var1.world) { // L: 12006 + if (this.filterWorlds) { // L: 12709 + if (Client.worldId == var1.world) { // L: 12710 return -1; } - if (var2.world == Client.worldId) { // L: 12007 + if (var2.world == Client.worldId) { // L: 12711 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 12009 + return var1.world < var2.world ? -1 : 1; // L: 12713 } } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12013 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12717 } public boolean equals(Object var1) { - return super.equals(var1); // L: 12017 + return super.equals(var1); // L: 12721 } - @ObfuscatedName("go") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "212396676" + descriptor = "(II)Z", + garbageValue = "-2123450792" ) - static final int method1133() { - if (Interpreter.clientPreferences.method2255()) { // L: 4427 - return class160.Client_plane; - } else { - int var0 = Archive.getTileHeight(EnumComposition.cameraX, CollisionMap.cameraZ, class160.Client_plane); // L: 4428 - return var0 - FriendSystem.cameraY < 800 && (Tiles.Tiles_renderFlags[class160.Client_plane][EnumComposition.cameraX >> 7][CollisionMap.cameraZ >> 7] & 4) != 0 ? class160.Client_plane : 3; // L: 4429 4430 - } + public static boolean method1130(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field140[var0] : false; // L: 236 237 } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-121" + ) + public static boolean method1138(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field131[var0] : false; // L: 246 247 + } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1843908381" + ) + static final void method1128() { + int var0 = class286.field3274 * 128 + 64; // L: 3784 + int var1 = class54.field447 * 128 + 64; // L: 3785 + int var2 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - BZip2State.field4662; // L: 3786 + class13.method163(var0, var2, var1); // L: 3787 + var0 = class154.field1691 * 128 + 64; // L: 3788 + var1 = class67.field881 * 128 + 64; // L: 3789 + var2 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - DevicePcmPlayerProvider.field154; // L: 3790 + int var3 = var0 - WorldMapLabelSize.cameraX; // L: 3791 + int var4 = var2 - ItemContainer.cameraY; // L: 3792 + int var5 = var1 - class154.cameraZ; // L: 3793 + int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 3794 + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3795 + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3796 + WorldMapSectionType.method4308(var7, var8); // L: 3797 + } // L: 3798 + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(Lcz;III)V", + garbageValue = "1679635193" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 4236 + int var3 = class163.SequenceDefinition_get(var1).field2161; // L: 4237 + if (var3 == 1) { // L: 4238 + var0.sequenceFrame = 0; // L: 4239 + var0.sequenceFrameCycle = 0; // L: 4240 + var0.sequenceDelay = var2; // L: 4241 + var0.field1152 = 0; // L: 4242 + } + + if (var3 == 2) { // L: 4244 + var0.field1152 = 0; // L: 4245 + } + } else if (var1 == -1 || var0.sequence == -1 || class163.SequenceDefinition_get(var1).field2155 >= class163.SequenceDefinition_get(var0.sequence).field2155) { // L: 4248 + var0.sequence = var1; // L: 4249 + var0.sequenceFrame = 0; // L: 4250 + var0.sequenceFrameCycle = 0; // L: 4251 + var0.sequenceDelay = var2; // L: 4252 + var0.field1152 = 0; // L: 4253 + var0.field1170 = var0.pathLength; // L: 4254 + } + + } // L: 4256 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 8dcbb6404f..ef32161268 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -4,79 +4,75 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("lw") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "2027302078" + descriptor = "(Llc;Llc;I)I", + garbageValue = "-1618602527" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69 } + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } + public boolean equals(Object var1) { return super.equals(var1); // L: 77 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 - } - - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lfi;", - garbageValue = "1494157622" + descriptor = "(I)[Ldk;", + garbageValue = "1223848574" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 - if (var1 != null) { // L: 28 - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 - var1 = new KitDefinition(); // L: 30 - if (var2 != null) { // L: 31 - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 - } + static class119[] method5977() { + return new class119[]{class119.field1449, class119.field1439, class119.field1440, class119.field1441, class119.field1442, class119.field1446, class119.field1444, class119.field1443, class119.field1455, class119.field1447, class119.field1448, class119.field1451, class119.field1450, class119.field1445, class119.field1457, class119.field1452, class119.field1454}; // L: 73 } - @ObfuscatedName("v") - public static final void method6007(long var0) { - if (var0 > 0L) { // L: 9 - if (0L == var0 % 10L) { // L: 10 - FriendLoginUpdate.method6731(var0 - 1L); // L: 11 - FriendLoginUpdate.method6731(1L); // L: 12 - } else { - FriendLoginUpdate.method6731(var0); // L: 14 - } - - } - } // L: 15 - - @ObfuscatedName("jn") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(IS)Ljava/lang/String;", - garbageValue = "-9298" + descriptor = "(I)V", + garbageValue = "-1983287311" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 10119 + @Export("incrementMenuEntries") + static final void incrementMenuEntries() { + boolean var0 = false; // L: 9793 - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10120 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10121 + while (!var0) { // L: 9794 + var0 = true; // L: 9795 + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9796 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9797 + String var2 = Client.menuTargets[var1]; // L: 9798 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9799 + Client.menuTargets[var1 + 1] = var2; // L: 9800 + String var3 = Client.menuActions[var1]; // L: 9801 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9802 + Client.menuActions[var1 + 1] = var3; // L: 9803 + int var4 = Client.menuOpcodes[var1]; // L: 9804 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9805 + Client.menuOpcodes[var1 + 1] = var4; // L: 9806 + var4 = Client.menuArguments1[var1]; // L: 9807 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9808 + Client.menuArguments1[var1 + 1] = var4; // L: 9809 + var4 = Client.menuArguments2[var1]; // L: 9810 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9811 + Client.menuArguments2[var1 + 1] = var4; // L: 9812 + var4 = Client.menuIdentifiers[var1]; // L: 9813 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9814 + Client.menuIdentifiers[var1 + 1] = var4; // L: 9815 + boolean var5 = Client.menuShiftClick[var1]; // L: 9816 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9817 + Client.menuShiftClick[var1 + 1] = var5; // L: 9818 + var0 = false; // L: 9819 + } + } } - if (var1.length() > 9) { // L: 10123 - return " " + ChatChannel.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + ChatChannel.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ChatChannel.colorStartTag(16776960) + var1 + ""; // L: 10124 10125 - } - } + } // L: 9823 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 1ce2964e75..38b416beeb 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -4,39 +4,185 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("le") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("f") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "2043107163" + descriptor = "(Llc;Llc;B)I", + garbageValue = "2" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 51 } - @ObfuscatedName("v") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 + } + + @ObfuscatedName("hc") @ObfuscatedSignature( - descriptor = "(Llq;Llq;ZB)V", - garbageValue = "0" + descriptor = "(IIIIII)V", + garbageValue = "-1285875699" ) - public static void method6081(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; // L: 73 - class175.ObjectDefinition_modelsArchive = var1; // L: 74 - ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75 - } // L: 76 + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = ArchiveLoader.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5844 + int var7; + int var8; + int var9; + int var10; + int var14; + int var26; + if (var5 != 0L) { // L: 5845 + var7 = ArchiveLoader.scene.getObjectFlags(var0, var1, var2, var5); // L: 5846 + var8 = var7 >> 6 & 3; // L: 5847 + var9 = var7 & 31; // L: 5848 + var10 = var3; // L: 5849 + boolean var12 = var5 != 0L; // L: 5852 + if (var12) { // L: 5853 + boolean var13 = (int)(var5 >>> 16 & 1L) == 1; // L: 5856 + var12 = !var13; // L: 5858 + } + + if (var12) { // L: 5862 + var10 = var4; + } + + int[] var19 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 5863 + var26 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5864 + var14 = FileSystem.Entity_unpackID(var5); // L: 5865 + ObjectComposition var15 = class146.getObjectDefinition(var14); // L: 5866 + if (var15.mapSceneId != -1) { // L: 5867 + IndexedSprite var16 = GraphicsDefaults.mapSceneSprites[var15.mapSceneId]; // L: 5868 + if (var16 != null) { // L: 5869 + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5870 + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5871 + var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5872 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5876 + if (var8 == 0) { // L: 5877 + var19[var26] = var10; // L: 5878 + var19[var26 + 512] = var10; // L: 5879 + var19[var26 + 1024] = var10; // L: 5880 + var19[var26 + 1536] = var10; // L: 5881 + } else if (var8 == 1) { // L: 5883 + var19[var26] = var10; // L: 5884 + var19[var26 + 1] = var10; // L: 5885 + var19[var26 + 2] = var10; // L: 5886 + var19[var26 + 3] = var10; // L: 5887 + } else if (var8 == 2) { // L: 5889 + var19[var26 + 3] = var10; // L: 5890 + var19[var26 + 512 + 3] = var10; // L: 5891 + var19[var26 + 1024 + 3] = var10; // L: 5892 + var19[var26 + 1536 + 3] = var10; // L: 5893 + } else if (var8 == 3) { // L: 5895 + var19[var26 + 1536] = var10; // L: 5896 + var19[var26 + 1536 + 1] = var10; // L: 5897 + var19[var26 + 1536 + 2] = var10; // L: 5898 + var19[var26 + 1536 + 3] = var10; // L: 5899 + } + } + + if (var9 == 3) { // L: 5902 + if (var8 == 0) { // L: 5903 + var19[var26] = var10; + } else if (var8 == 1) { // L: 5904 + var19[var26 + 3] = var10; + } else if (var8 == 2) { // L: 5905 + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5906 + var19[var26 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5908 + if (var8 == 3) { // L: 5909 + var19[var26] = var10; // L: 5910 + var19[var26 + 512] = var10; // L: 5911 + var19[var26 + 1024] = var10; // L: 5912 + var19[var26 + 1536] = var10; // L: 5913 + } else if (var8 == 0) { // L: 5915 + var19[var26] = var10; // L: 5916 + var19[var26 + 1] = var10; // L: 5917 + var19[var26 + 2] = var10; // L: 5918 + var19[var26 + 3] = var10; // L: 5919 + } else if (var8 == 1) { // L: 5921 + var19[var26 + 3] = var10; // L: 5922 + var19[var26 + 512 + 3] = var10; // L: 5923 + var19[var26 + 1024 + 3] = var10; // L: 5924 + var19[var26 + 1536 + 3] = var10; // L: 5925 + } else if (var8 == 2) { // L: 5927 + var19[var26 + 1536] = var10; // L: 5928 + var19[var26 + 1536 + 1] = var10; // L: 5929 + var19[var26 + 1536 + 2] = var10; // L: 5930 + var19[var26 + 1536 + 3] = var10; // L: 5931 + } + } + } + } + + var5 = ArchiveLoader.scene.getGameObjectTag(var0, var1, var2); // L: 5936 + if (0L != var5) { // L: 5937 + var7 = ArchiveLoader.scene.getObjectFlags(var0, var1, var2, var5); // L: 5938 + var8 = var7 >> 6 & 3; // L: 5939 + var9 = var7 & 31; // L: 5940 + var10 = FileSystem.Entity_unpackID(var5); // L: 5941 + ObjectComposition var20 = class146.getObjectDefinition(var10); // L: 5942 + if (var20.mapSceneId != -1) { // L: 5943 + IndexedSprite var28 = GraphicsDefaults.mapSceneSprites[var20.mapSceneId]; // L: 5944 + if (var28 != null) { // L: 5945 + var26 = (var20.sizeX * 4 - var28.subWidth) / 2; // L: 5946 + var14 = (var20.sizeY * 4 - var28.subHeight) / 2; // L: 5947 + var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); // L: 5948 + } + } else if (var9 == 9) { // L: 5951 + int var25 = 15658734; // L: 5952 + boolean var27 = 0L != var5; // L: 5955 + if (var27) { // L: 5956 + boolean var21 = (int)(var5 >>> 16 & 1L) == 1; // L: 5959 + var27 = !var21; // L: 5961 + } + + if (var27) { // L: 5965 + var25 = 15597568; + } + + int[] var22 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 5966 + int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5967 + if (var8 != 0 && var8 != 2) { // L: 5968 + var22[var29] = var25; // L: 5975 + var22[var29 + 1 + 512] = var25; // L: 5976 + var22[var29 + 1024 + 2] = var25; // L: 5977 + var22[var29 + 1536 + 3] = var25; // L: 5978 + } else { + var22[var29 + 1536] = var25; // L: 5969 + var22[var29 + 1 + 1024] = var25; // L: 5970 + var22[var29 + 512 + 2] = var25; // L: 5971 + var22[var29 + 3] = var25; // L: 5972 + } + } + } + + var5 = ArchiveLoader.scene.getFloorDecorationTag(var0, var1, var2); // L: 5982 + if (var5 != 0L) { // L: 5983 + var7 = FileSystem.Entity_unpackID(var5); // L: 5984 + ObjectComposition var23 = class146.getObjectDefinition(var7); // L: 5985 + if (var23.mapSceneId != -1) { // L: 5986 + IndexedSprite var24 = GraphicsDefaults.mapSceneSprites[var23.mapSceneId]; // L: 5987 + if (var24 != null) { // L: 5988 + var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5989 + int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5990 + var24.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5991 + } + } + } + + } // L: 5995 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index fcd5c4e6e0..35f29fabdb 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -4,13 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lp") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;B)I", - garbageValue = "2" + descriptor = "(Llc;Llc;I)I", + garbageValue = "-468460476" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -24,4 +24,177 @@ final class GrandExchangeOfferWorldComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 36 } + + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "(Lcb;I)V", + garbageValue = "-1213322311" + ) + static final void method6006(Actor var0) { + var0.isWalking = false; // L: 4123 + SequenceDefinition var1; + int var2; + if (var0.movementSequence != -1) { // L: 4124 + var1 = class163.SequenceDefinition_get(var0.movementSequence); // L: 4125 + if (var1 != null) { // L: 4126 + if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 4127 + ++var0.movementFrameCycle; // L: 4128 + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4129 + var0.movementFrameCycle = 1; // L: 4130 + ++var0.movementFrame; // L: 4131 + Language.method6087(var1, var0.movementFrame, var0.x, var0.y); // L: 4132 + } + + if (var0.movementFrame >= var1.frameIds.length) { // L: 4134 + var0.movementFrameCycle = 0; // L: 4135 + var0.movementFrame = 0; // L: 4136 + Language.method6087(var1, var0.movementFrame, var0.x, var0.y); // L: 4137 + } + } else if (var1.isCachedModelIdSet()) { // L: 4140 + ++var0.movementFrame; // L: 4141 + var2 = var1.method3844(); // L: 4142 + if (var0.movementFrame < var2) { // L: 4143 + KeyHandler.method336(var1, var0.movementFrame, var0.x, var0.y); // L: 4144 + } else { + var0.movementFrameCycle = 0; // L: 4147 + var0.movementFrame = 0; // L: 4148 + KeyHandler.method336(var1, var0.movementFrame, var0.x, var0.y); // L: 4149 + } + } else { + var0.movementSequence = -1; // L: 4152 + } + } else { + var0.movementSequence = -1; // L: 4154 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1134) { // L: 4156 + if (var0.spotAnimationFrame < 0) { // L: 4157 + var0.spotAnimationFrame = 0; + } + + int var4 = ClientPreferences.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4158 + if (var4 != -1) { // L: 4159 + SequenceDefinition var5 = class163.SequenceDefinition_get(var4); // L: 4160 + if (var5 != null && var5.frameIds != null) { // L: 4161 + ++var0.spotAnimationFrameCycle; // L: 4162 + if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 4163 + var0.spotAnimationFrameCycle = 1; // L: 4164 + ++var0.spotAnimationFrame; // L: 4165 + Language.method6087(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4166 + } + + if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 4168 4169 + var0.spotAnimation = -1; + } + } else if (var5.isCachedModelIdSet()) { // L: 4172 + ++var0.spotAnimationFrame; // L: 4173 + int var3 = var5.method3844(); // L: 4174 + if (var0.spotAnimationFrame < var3) { // L: 4175 + KeyHandler.method336(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4176 + } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 4179 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 4182 + } + } else { + var0.spotAnimation = -1; // L: 4184 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4186 + var1 = class163.SequenceDefinition_get(var0.sequence); // L: 4187 + if (var1.field2159 == 1 && var0.field1170 > 0 && var0.field1143 <= Client.cycle && var0.field1163 < Client.cycle) { // L: 4188 4189 + var0.sequenceDelay = 1; // L: 4190 + return; // L: 4191 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4195 + var1 = class163.SequenceDefinition_get(var0.sequence); // L: 4196 + if (var1 != null) { // L: 4197 + if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 4198 + ++var0.sequenceFrameCycle; // L: 4199 + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4200 + var0.sequenceFrameCycle = 1; // L: 4201 + ++var0.sequenceFrame; // L: 4202 + Language.method6087(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4203 + } + + if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4205 + var0.sequenceFrame -= var1.frameCount; // L: 4206 + ++var0.field1152; // L: 4207 + if (var0.field1152 >= var1.field2138) { // L: 4208 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4209 + Language.method6087(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4210 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field2154; // L: 4212 + } else if (var1.isCachedModelIdSet()) { // L: 4214 + ++var0.sequenceFrame; // L: 4215 + var2 = var1.method3801().method2762(); // L: 4216 + if (var0.sequenceFrame < var2) { // L: 4217 + KeyHandler.method336(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4218 + } else { + var0.sequenceFrame -= var1.frameCount; // L: 4221 + ++var0.field1152; // L: 4222 + if (var0.field1152 >= var1.field2138) { // L: 4223 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 4224 + KeyHandler.method336(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4225 + } else { + var0.sequence = -1; + } + } + } else { + var0.sequence = -1; // L: 4228 + } + } else { + var0.sequence = -1; // L: 4230 + } + } + + if (var0.sequenceDelay > 0) { // L: 4232 + --var0.sequenceDelay; + } + + } // L: 4233 + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIII)V", + garbageValue = "1469705502" + ) + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + PendingSpawn var9 = null; // L: 7693 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7694 7695 7700 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7696 + var9 = var10; // L: 7697 + break; + } + } + + if (var9 == null) { // L: 7702 + var9 = new PendingSpawn(); // L: 7703 + var9.plane = var0; // L: 7704 + var9.type = var3; // L: 7705 + var9.x = var1; // L: 7706 + var9.y = var2; // L: 7707 + class163.method3315(var9); // L: 7708 + Client.pendingSpawns.addFirst(var9); // L: 7709 + } + + var9.id = var4; // L: 7711 + var9.field1107 = var5; // L: 7712 + var9.orientation = var6; // L: 7713 + var9.delay = var7; // L: 7714 + var9.hitpoints = var8; // L: 7715 + } // L: 7716 } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 60741ed4eb..4f211243ba 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ne") +@ObfuscatedName("nc") @Implements("GraphicsDefaults") public class GraphicsDefaults { + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "[Lqq;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -704834319 + intValue = 1328751771 ) @Export("compass") public int compass; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1922444497 + intValue = 741115861 ) - public int field4315; - @ObfuscatedName("h") + public int field4314; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1875507179 + intValue = -104742867 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -353257845 + intValue = 1903880711 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -275374313 + intValue = 1153445431 ) - public int field4318; + public int field4322; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1613214609 + intValue = 693600925 + ) + public int field4318; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 2085695885 ) public int field4319; - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 917016199 + intValue = -1059199103 ) public int field4320; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1746195409 + intValue = 218263637 ) public int field4321; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1104227617 + intValue = 1626482123 ) - public int field4317; + public int field4315; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 45523845 + intValue = 922588741 ) - public int field4314; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1959240211 - ) - public int field4324; + public int field4323; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field4315 = -1; // L: 8 + this.field4314 = -1; // L: 8 this.mapScenes = -1; // L: 9 this.headIconsPk = -1; // L: 10 - this.field4318 = -1; // L: 11 - this.field4319 = -1; // L: 12 - this.field4320 = -1; // L: 13 - this.field4321 = -1; // L: 14 - this.field4317 = -1; // L: 15 - this.field4314 = -1; // L: 16 - this.field4324 = -1; // L: 17 + this.field4322 = -1; // L: 11 + this.field4318 = -1; // L: 12 + this.field4319 = -1; // L: 13 + this.field4320 = -1; // L: 14 + this.field4321 = -1; // L: 15 + this.field4315 = -1; // L: 16 + this.field4323 = -1; // L: 17 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;I)V", - garbageValue = "2120567441" + descriptor = "(Lln;I)V", + garbageValue = "-689748439" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4313.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4311.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -98,21 +104,483 @@ public class GraphicsDefaults { switch(var4) { // L: 25 case 1: - var3.readMedium(); // L: 28 + var3.readMedium(); // L: 43 break; case 2: - this.compass = var3.method7742(); // L: 33 - this.field4315 = var3.method7742(); // L: 34 - this.mapScenes = var3.method7742(); // L: 35 - this.headIconsPk = var3.method7742(); // L: 36 - this.field4318 = var3.method7742(); // L: 37 - this.field4319 = var3.method7742(); // L: 38 - this.field4320 = var3.method7742(); // L: 39 - this.field4321 = var3.method7742(); // L: 40 - this.field4317 = var3.method7742(); // L: 41 - this.field4314 = var3.method7742(); // L: 42 - this.field4324 = var3.method7742(); // L: 43 + this.compass = var3.method7692(); // L: 28 + this.field4314 = var3.method7692(); // L: 29 + this.mapScenes = var3.method7692(); // L: 30 + this.headIconsPk = var3.method7692(); // L: 31 + this.field4322 = var3.method7692(); // L: 32 + this.field4318 = var3.method7692(); // L: 33 + this.field4319 = var3.method7692(); // L: 34 + this.field4320 = var3.method7692(); // L: 35 + this.field4321 = var3.method7692(); // L: 36 + this.field4315 = var3.method7692(); // L: 37 + this.field4323 = var3.method7692(); // L: 38 } } } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lhv;[Lgv;I)V", + garbageValue = "200441934" + ) + static final void method6939(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 581 + for (var3 = 0; var3 < 104; ++var3) { // L: 582 + for (var4 = 0; var4 < 104; ++var4) { // L: 583 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 584 + var5 = var2; // L: 585 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 586 + var5 = var2 - 1; + } + + if (var5 >= 0) { // L: 587 + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } + } + + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 592 + if (Tiles.rndHue < -8) { // L: 593 + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { // L: 594 + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 595 + if (Tiles.rndLightness < -16) { // L: 596 + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { // L: 597 + Tiles.rndLightness = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { // L: 598 + byte[][] var42 = class392.field4374[var2]; // L: 599 + var9 = (int)Math.sqrt(5100.0D); // L: 605 + var10 = var9 * 768 >> 8; // L: 606 + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 607 + for (var12 = 1; var12 < 103; ++var12) { // L: 608 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 609 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 610 + var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 611 + var16 = (var13 << 8) / var15; // L: 612 + var17 = 65536 / var15; // L: 613 + var18 = (var14 << 8) / var15; // L: 614 + var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; // L: 615 + var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 616 + Tiles.field998[var12][var11] = var19 - var20; // L: 617 + } + } + + for (var11 = 0; var11 < 104; ++var11) { // L: 620 + BufferedNetSocket.Tiles_hue[var11] = 0; // L: 621 + class116.Tiles_saturation[var11] = 0; // L: 622 + Tiles.Tiles_lightness[var11] = 0; // L: 623 + class357.Tiles_hueMultiplier[var11] = 0; // L: 624 + class361.field4213[var11] = 0; // L: 625 + } + + for (var11 = -5; var11 < 109; ++var11) { // L: 627 + for (var12 = 0; var12 < 104; ++var12) { // L: 628 + var13 = var11 + 5; // L: 629 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 630 + var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 631 + if (var14 > 0) { // L: 632 + FloorUnderlayDefinition var44 = class123.method2806(var14 - 1); // L: 633 + var10000 = BufferedNetSocket.Tiles_hue; // L: 634 + var10000[var12] += var44.hue; + var10000 = class116.Tiles_saturation; // L: 635 + var10000[var12] += var44.saturation; + var10000 = Tiles.Tiles_lightness; // L: 636 + var10000[var12] += var44.lightness; + var10000 = class357.Tiles_hueMultiplier; // L: 637 + var10000[var12] += var44.hueMultiplier; + var10002 = class361.field4213[var12]++; // L: 638 + } + } + + var14 = var11 - 5; // L: 641 + if (var14 >= 0 && var14 < 104) { // L: 642 + var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 643 + if (var15 > 0) { // L: 644 + FloorUnderlayDefinition var45 = class123.method2806(var15 - 1); // L: 645 + var10000 = BufferedNetSocket.Tiles_hue; // L: 646 + var10000[var12] -= var45.hue; + var10000 = class116.Tiles_saturation; // L: 647 + var10000[var12] -= var45.saturation; + var10000 = Tiles.Tiles_lightness; // L: 648 + var10000[var12] -= var45.lightness; + var10000 = class357.Tiles_hueMultiplier; // L: 649 + var10000[var12] -= var45.hueMultiplier; + var10002 = class361.field4213[var12]--; // L: 650 + } + } + } + + if (var11 >= 1 && var11 < 103) { // L: 654 + var12 = 0; // L: 655 + var13 = 0; // L: 656 + var14 = 0; // L: 657 + var15 = 0; // L: 658 + var16 = 0; // L: 659 + + for (var17 = -5; var17 < 109; ++var17) { // L: 660 + var18 = var17 + 5; // L: 661 + if (var18 >= 0 && var18 < 104) { // L: 662 + var12 += BufferedNetSocket.Tiles_hue[var18]; // L: 663 + var13 += class116.Tiles_saturation[var18]; // L: 664 + var14 += Tiles.Tiles_lightness[var18]; // L: 665 + var15 += class357.Tiles_hueMultiplier[var18]; // L: 666 + var16 += class361.field4213[var18]; // L: 667 + } + + var19 = var17 - 5; // L: 669 + if (var19 >= 0 && var19 < 104) { // L: 670 + var12 -= BufferedNetSocket.Tiles_hue[var19]; // L: 671 + var13 -= class116.Tiles_saturation[var19]; // L: 672 + var14 -= Tiles.Tiles_lightness[var19]; // L: 673 + var15 -= class357.Tiles_hueMultiplier[var19]; // L: 674 + var16 -= class361.field4213[var19]; // L: 675 + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 677 678 679 680 + if (var2 < Tiles.Tiles_minPlane) { // L: 683 + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 684 + int var21 = class14.Tiles_overlays[var2][var11][var17] & 255; // L: 685 + if (var20 > 0 || var21 > 0) { // L: 686 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 687 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 688 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 689 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 690 + int var26 = Tiles.field998[var11][var17]; // L: 691 + int var27 = Tiles.field998[var11 + 1][var17]; // L: 692 + int var28 = Tiles.field998[var11 + 1][var17 + 1]; // L: 693 + int var29 = Tiles.field998[var11][var17 + 1]; // L: 694 + int var30 = -1; // L: 695 + int var31 = -1; // L: 696 + int var32; + int var33; + if (var20 > 0) { // L: 697 + var32 = var12 * 256 / var15; // L: 698 + var33 = var13 / var16; // L: 699 + int var34 = var14 / var16; // L: 700 + var30 = class162.hslToRgb(var32, var33, var34); // L: 701 + var32 = var32 + Tiles.rndHue & 255; // L: 702 + var34 += Tiles.rndLightness; // L: 703 + if (var34 < 0) { // L: 704 + var34 = 0; + } else if (var34 > 255) { // L: 705 + var34 = 255; + } + + var31 = class162.hslToRgb(var32, var33, var34); // L: 706 + } + + if (var2 > 0) { // L: 708 + boolean var47 = true; // L: 709 + if (var20 == 0 && class147.Tiles_shapes[var2][var11][var17] != 0) { // L: 710 + var47 = false; + } + + if (var21 > 0 && !Clock.method3349(var21 - 1).hideUnderlay) { // L: 711 + var47 = false; + } + + if (var47 && var22 == var23 && var24 == var22 && var25 == var22) { // L: 712 713 + var10000 = class420.field4545[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; // L: 716 + if (var31 != -1) { // L: 717 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[SoundCache.method772(var31, 96)]; + } + + if (var21 == 0) { // L: 718 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, SoundCache.method772(var30, var26), SoundCache.method772(var30, var27), SoundCache.method772(var30, var28), SoundCache.method772(var30, var29), 0, 0, 0, 0, var32, 0); // L: 719 + } else { + var33 = class147.Tiles_shapes[var2][var11][var17] + 1; // L: 722 + byte var48 = Tiles.field983[var2][var11][var17]; // L: 723 + FloorOverlayDefinition var35 = Clock.method3349(var21 - 1); // L: 724 + int var36 = var35.texture; // L: 725 + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { // L: 728 + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 729 + var37 = -1; // L: 730 + } else if (var35.primaryRgb == 16711935) { // L: 733 + var37 = -2; // L: 734 + var36 = -1; // L: 735 + var38 = -2; // L: 736 + } else { + var37 = class162.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 739 + var39 = var35.hue + Tiles.rndHue & 255; // L: 740 + var40 = var35.lightness + Tiles.rndLightness; // L: 741 + if (var40 < 0) { // L: 742 + var40 = 0; + } else if (var40 > 255) { // L: 743 + var40 = 255; + } + + var38 = class162.hslToRgb(var39, var35.saturation, var40); // L: 744 + } + + var39 = 0; // L: 747 + if (var38 != -2) { // L: 748 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[ClanSettings.method3028(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 749 + var40 = var35.secondaryHue + Tiles.rndHue & 255; // L: 750 + int var41 = var35.secondaryLightness + Tiles.rndLightness; // L: 751 + if (var41 < 0) { // L: 752 + var41 = 0; + } else if (var41 > 255) { // L: 753 + var41 = 255; + } + + var38 = class162.hslToRgb(var40, var35.secondarySaturation, var41); // L: 754 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[ClanSettings.method3028(var38, 96)]; // L: 755 + } + + var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, SoundCache.method772(var30, var26), SoundCache.method772(var30, var27), SoundCache.method772(var30, var28), SoundCache.method772(var30, var29), ClanSettings.method3028(var37, var26), ClanSettings.method3028(var37, var27), ClanSettings.method3028(var37, var28), ClanSettings.method3028(var37, var29), var32, var39); // L: 757 + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { // L: 764 + for (var12 = 1; var12 < 103; ++var12) { // L: 765 + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 772 + var17 = 0; // L: 773 + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 776 + var17 = var2 - 1; // L: 777 + } else { + var17 = var2; // L: 780 + } + + var0.setTileMinPlane(var2, var12, var11, var17); // L: 782 + } + } + + Tiles.Tiles_underlays[var2] = null; // L: 785 + class14.Tiles_overlays[var2] = null; // L: 786 + class147.Tiles_shapes[var2] = null; // L: 787 + Tiles.field983[var2] = null; // L: 788 + class392.field4374[var2] = null; // L: 789 + } + + var0.method4762(-50, -10, -50); // L: 791 + + for (var2 = 0; var2 < 104; ++var2) { // L: 792 + for (var3 = 0; var3 < 104; ++var3) { // L: 793 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 794 + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; // L: 797 + var3 = 2; // L: 798 + var4 = 4; // L: 799 + + for (var5 = 0; var5 < 4; ++var5) { // L: 800 + if (var5 > 0) { // L: 801 + var2 <<= 3; // L: 802 + var3 <<= 3; // L: 803 + var4 <<= 3; // L: 804 + } + + for (int var6 = 0; var6 <= var5; ++var6) { // L: 806 + for (int var7 = 0; var7 <= 104; ++var7) { // L: 807 + for (int var8 = 0; var8 <= 104; ++var8) { // L: 808 + short var46; + if ((class420.field4545[var6][var8][var7] & var2) != 0) { // L: 809 + var9 = var7; // L: 810 + var10 = var7; // L: 811 + var11 = var6; // L: 812 + + for (var12 = var6; var9 > 0 && (class420.field4545[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 813 814 + } + + while (var10 < 104 && (class420.field4545[var6][var8][var10 + 1] & var2) != 0) { // L: 815 + ++var10; + } + + label432: + while (var11 > 0) { // L: 816 + for (var13 = var9; var13 <= var10; ++var13) { // L: 817 + if ((class420.field4545[var11 - 1][var8][var13] & var2) == 0) { + break label432; + } + } + + --var11; // L: 818 + } + + label421: + while (var12 < var5) { // L: 820 + for (var13 = var9; var13 <= var10; ++var13) { // L: 821 + if ((class420.field4545[var12 + 1][var8][var13] & var2) == 0) { + break label421; + } + } + + ++var12; // L: 822 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 824 + if (var13 >= 8) { // L: 825 + var46 = 240; // L: 826 + var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; // L: 827 + var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 828 + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 829 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 830 + for (var18 = var9; var18 <= var10; ++var18) { // L: 831 + var10000 = class420.field4545[var17][var8]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((class420.field4545[var6][var8][var7] & var3) != 0) { // L: 835 + var9 = var8; // L: 836 + var10 = var8; // L: 837 + var11 = var6; // L: 838 + + for (var12 = var6; var9 > 0 && (class420.field4545[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 839 840 + } + + while (var10 < 104 && (class420.field4545[var6][var10 + 1][var7] & var3) != 0) { // L: 841 + ++var10; + } + + label485: + while (var11 > 0) { // L: 842 + for (var13 = var9; var13 <= var10; ++var13) { // L: 843 + if ((class420.field4545[var11 - 1][var13][var7] & var3) == 0) { + break label485; + } + } + + --var11; // L: 844 + } + + label474: + while (var12 < var5) { // L: 846 + for (var13 = var9; var13 <= var10; ++var13) { // L: 847 + if ((class420.field4545[var12 + 1][var13][var7] & var3) == 0) { + break label474; + } + } + + ++var12; // L: 848 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 850 + if (var13 >= 8) { // L: 851 + var46 = 240; // L: 852 + var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; // L: 853 + var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 854 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 855 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 856 + for (var18 = var9; var18 <= var10; ++var18) { // L: 857 + var10000 = class420.field4545[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((class420.field4545[var6][var8][var7] & var4) != 0) { // L: 861 + var9 = var8; // L: 862 + var10 = var8; // L: 863 + var11 = var7; // L: 864 + + for (var12 = var7; var11 > 0 && (class420.field4545[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 865 866 + } + + while (var12 < 104 && (class420.field4545[var6][var8][var12 + 1] & var4) != 0) { // L: 867 + ++var12; + } + + label538: + while (var9 > 0) { // L: 868 + for (var13 = var11; var13 <= var12; ++var13) { // L: 869 + if ((class420.field4545[var6][var9 - 1][var13] & var4) == 0) { + break label538; + } + } + + --var9; // L: 870 + } + + label527: + while (var10 < 104) { // L: 872 + for (var13 = var11; var13 <= var12; ++var13) { // L: 873 + if ((class420.field4545[var6][var10 + 1][var13] & var4) == 0) { + break label527; + } + } + + ++var10; // L: 874 + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 876 + var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 877 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 878 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 879 + for (var15 = var11; var15 <= var12; ++var15) { // L: 880 + var10000 = class420.field4545[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } // L: 888 } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index de5a7680ec..bc142a2069 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,74 +1,73 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bn") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1439234169 + intValue = 633552685 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1478236205 + intValue = -1513105003 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -242268233 + intValue = -809996185 ) @Export("plane") int plane; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 857822113 + intValue = 1383105845 ) @Export("x") int x; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 998647145 + intValue = -2057789727 ) @Export("y") int y; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1200688575 + intValue = -1487431233 ) @Export("z") int z; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lgw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -250349479 + intValue = 1421112585 ) @Export("frame") int frame; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1301659841 + intValue = -1965539669 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("isFinished") boolean isFinished; GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { this.frame = 0; // L: 16 - this.frameCycle = 0; + this.frameCycle = 0; // L: 17 this.isFinished = false; // L: 18 this.id = var1; // L: 21 this.plane = var2; // L: 22 @@ -76,10 +75,10 @@ public class GraphicsObject extends Renderable { this.y = var4; // L: 24 this.z = var5; // L: 25 this.cycleStart = var7 + var6; // L: 26 - int var8 = class6.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + int var8 = ClientPreferences.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { // L: 28 this.isFinished = false; // L: 29 - this.sequenceDefinition = ItemContainer.SequenceDefinition_get(var8); // L: 30 + this.sequenceDefinition = class163.SequenceDefinition_get(var8); // L: 30 } else { this.isFinished = true; // L: 32 } @@ -88,8 +87,8 @@ public class GraphicsObject extends Renderable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "18366" + descriptor = "(IB)V", + garbageValue = "79" ) @Export("advance") final void advance(int var1) { @@ -106,7 +105,7 @@ public class GraphicsObject extends Renderable { } } else { this.frame += var1; // L: 49 - if (this.frame >= this.sequenceDefinition.method3827()) { // L: 50 + if (this.frame >= this.sequenceDefinition.method3844()) { // L: 50 this.isFinished = true; } } @@ -114,14 +113,14 @@ public class GraphicsObject extends Renderable { } } // L: 52 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" + descriptor = "(B)Liq;", + garbageValue = "103" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class6.SpotAnimationDefinition_get(this.id); // L: 55 + SpotAnimationDefinition var1 = ClientPreferences.SpotAnimationDefinition_get(this.id); // L: 55 Model var2; if (!this.isFinished) { // L: 57 var2 = var1.getModel(this.frame); @@ -132,56 +131,6 @@ public class GraphicsObject extends Renderable { return var2 == null ? null : var2; // L: 59 } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Lcp;", - garbageValue = "-18" - ) - static class83[] method1866() { - return new class83[]{class83.field1075, class83.field1078, class83.field1077, class83.field1074, class83.field1081, class83.field1076}; // L: 17 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/util/Date;S)Z", - garbageValue = "4749" - ) - static boolean method1864(Date var0) { - Date var1 = class250.method5137(); // L: 1246 - return var0.after(var1); // L: 1247 - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1790654907" - ) - static int method1865(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field842 - 7.0D) * 256.0D); // L: 3841 - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(Lcw;IILgv;B)V", - garbageValue = "2" - ) - static final void method1860(Player var0, int var1, int var2, class193 var3) { - int var4 = var0.pathX[0]; // L: 7995 - int var5 = var0.pathY[0]; // L: 7996 - int var6 = var0.transformedSize(); // L: 7997 - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 7998 - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 7999 - int var7 = ArchiveLoader.method2075(var4, var5, var0.transformedSize(), WorldMapSectionType.method4954(var1, var2), Client.collisionMaps[var0.plane], true, Client.field743, Client.field670); // L: 8000 - if (var7 >= 1) { // L: 8001 - for (int var8 = 0; var8 < var7 - 1; ++var8) { // L: 8002 - var0.method2149(Client.field743[var8], Client.field670[var8], var3); - } - - } - } - } - } // L: 8003 - public GraphicsObject() { } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index fdb9c9a60c..dbd587defa 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,35 +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("cc") +@ObfuscatedName("ci") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("f") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1015592217 - ) - static int field1251; - @ObfuscatedName("h") + @ObfuscatedName("bc") + @Export("otp") + static String otp; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfy;" + descriptor = "Lfv;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llk;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lfy;)V" + descriptor = "(Lfv;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 @@ -39,7 +33,7 @@ public class HealthBar extends Node { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIIB)V", - garbageValue = "-121" + garbageValue = "-72" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -50,40 +44,40 @@ public class HealthBar extends Node { ++var6; // L: 22 if (var7.cycle == var1) { // L: 23 var7.set(var1, var2, var3, var4); // L: 24 - return; + return; // L: 25 } - if (var7.cycle <= var1) { + if (var7.cycle <= var1) { // L: 27 var5 = var7; } } - if (var5 == null) { - if (var6 < 4) { + if (var5 == null) { // L: 29 + if (var6 < 4) { // L: 30 this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } } else { - IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); + IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); // L: 33 if (var6 >= 4) { - this.updates.last().remove(); + this.updates.last().remove(); // L: 34 } } - } + } // L: 31 35 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Lcu;", - garbageValue = "62" + descriptor = "(II)Lcp;", + garbageValue = "675782761" ) @Export("get") HealthBarUpdate get(int var1) { - HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); - if (var2 != null && var2.cycle <= var1) { - for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { // L: 40 + HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); // L: 38 + if (var2 != null && var2.cycle <= var1) { // L: 39 + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { // L: 40 41 var2.remove(); // L: 42 - var2 = var3; + var2 = var3; // L: 43 } if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { // L: 47 @@ -97,42 +91,87 @@ public class HealthBar extends Node { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "82" + garbageValue = "-107" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method6269(); // L: 55 + return this.updates.method6164(); // L: 55 } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1836952304" + descriptor = "(IB)I", + garbageValue = "-31" ) - static void method2351() { - class113.field1387 = new int[2000]; // L: 25 - int var0 = 0; // L: 26 - int var1 = 240; // L: 27 + public static int method2344(int var0) { + return class400.field4389[var0 & 16383]; // L: 28 + } - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 - var3 = class92.method2373((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var0 / 16.0F + 0.075F)); // L: 30 - class113.field1387[var0] = var3; // L: 31 - ++var0; // L: 29 + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1491549945" + ) + static int method2343(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4511 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4512 + return 1; // L: 4513 + } else if (var0 != 6801 && var0 != 6802) { // L: 4515 + if (var0 == 6850) { // L: 4519 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4520 + return 1; // L: 4521 + } else if (var0 != 6851 && var0 != 6852) { // L: 4523 + if (var0 == 6853) { // L: 4527 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4528 + return 1; // L: 4529 + } else { + return 2; // L: 4531 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4524 + return 1; // L: 4525 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4516 + return 1; // L: 4517 } + } - var1 = 48; // L: 33 - - for (int var5 = var1 / 6; var0 < class113.field1387.length; var1 -= var5) { // L: 34 35 41 - var3 = var0 * 2; // L: 36 - - for (int var4 = class92.method2373((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class113.field1387.length; ++var0) { // L: 37 38 - class113.field1387[var0] = var4; // L: 39 + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1357746428" + ) + static final void method2330(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8655 + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8656 + Client.field715[var4] = true; } } - } // L: 43 + } // L: 8658 + + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-66" + ) + static final void method2328(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class21.guestClanChannel; // L: 12409 + if (var2 != null && var1 >= 0 && var1 < var2.method3119()) { // L: 12410 + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12411 + if (var3.rank == -1) { + String var4 = var3.username.getName(); // L: 12413 + PacketBufferNode var5 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2900, Client.packetWriter.isaacCipher); // L: 12414 + var5.packetBuffer.writeByte(3 + class425.stringCp1252NullTerminatedByteSize(var4)); // L: 12415 + var5.packetBuffer.writeByte(var0); // L: 12416 + var5.packetBuffer.writeShort(var1); // L: 12417 + var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12418 + Client.packetWriter.addNode(var5); // L: 12419 + } + } + } // L: 12412 12420 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 0a8eb3be41..6fe4819207 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,87 +4,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fv") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("HealthBarDefinition_archive") - public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) - public static AbstractArchive field1867; - @ObfuscatedName("h") + static AbstractArchive field1863; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("HealthBarDefinition_cached") - static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("g") + public static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -325466885 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 522457699 + ) + public int field1862; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1957048791 - ) - public int field1871; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -283973337 + intValue = 685524889 ) @Export("int1") public int int1; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 694103189 + intValue = -1399118515 ) @Export("int2") public int int2; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 177796267 + intValue = 1978967279 ) @Export("int3") public int int3; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1297607601 + intValue = 1746211851 ) - public int field1876; - @ObfuscatedName("x") + public int field1866; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2023566389 + intValue = -660483005 ) @Export("int5") public int int5; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1796071987 + intValue = 1226121631 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -723325657 + intValue = -1146936599 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1781778827 + intValue = -1563343657 ) @Export("width") public int width; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1386746085 + intValue = 1571067937 ) @Export("widthPadding") public int widthPadding; @@ -98,135 +104,140 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; // L: 19 this.int2 = 255; // L: 20 this.int3 = -1; // L: 21 - this.field1876 = 1; // L: 22 + this.field1866 = 1; // L: 22 this.int5 = 70; // L: 23 - this.frontSpriteID = -1; - this.backSpriteID = -1; - this.width = 30; + this.frontSpriteID = -1; // L: 24 + this.backSpriteID = -1; // L: 25 + this.width = 30; // L: 26 this.widthPadding = 0; // L: 27 - } + } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1589397026" + descriptor = "(Lpi;I)V", + garbageValue = "-1265984356" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 43 - if (var2 == 0) { // L: 44 - return; // L: 47 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 45 + this.decodeNext(var1, var2); } } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "1030861965" + descriptor = "(Lpi;IB)V", + garbageValue = "7" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 50 - var1.readUnsignedShort(); // L: 51 - } else if (var2 == 2) { // L: 53 + if (var2 == 1) { // L: 55 + var1.readUnsignedShort(); + } else if (var2 == 2) { // L: 58 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 54 + } else if (var2 == 3) { // L: 59 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { // L: 55 + } else if (var2 == 4) { // L: 60 this.int3 = 0; - } else if (var2 == 5) { // L: 56 + } else if (var2 == 5) { // L: 61 this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 57 - var1.readUnsignedByte(); // L: 58 - } else if (var2 == 7) { // L: 60 - this.frontSpriteID = var1.method7742(); - } else if (var2 == 8) { // L: 61 - this.backSpriteID = var1.method7742(); - } else if (var2 == 11) { // L: 62 + } else if (var2 == 6) { // L: 62 + var1.readUnsignedByte(); // L: 63 + } else if (var2 == 7) { // L: 65 + this.frontSpriteID = var1.method7692(); + } else if (var2 == 8) { // L: 66 + this.backSpriteID = var1.method7692(); + } else if (var2 == 11) { // L: 67 this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 63 + } else if (var2 == 14) { // L: 68 this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 64 + } else if (var2 == 15) { // L: 69 this.widthPadding = var1.readUnsignedByte(); } - } // L: 66 + } // L: 71 - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Lql;", - garbageValue = "-249328234" + descriptor = "(I)Lqi;", + garbageValue = "1780689910" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 69 + if (this.frontSpriteID < 0) { // L: 74 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75 if (var1 != null) { - return var1; // L: 71 + return var1; // L: 76 } else { - var1 = InterfaceParent.SpriteBuffer_getSprite(field1867, this.frontSpriteID, 0); // L: 72 + var1 = class6.SpriteBuffer_getSprite(field1863, this.frontSpriteID, 0); // L: 77 if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 73 + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 78 } - return var1; // L: 75 + return var1; // L: 80 } } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lql;", - garbageValue = "618558112" + descriptor = "(I)Lqi;", + garbageValue = "-1861454537" ) @Export("getBackSprite") public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 79 + if (this.backSpriteID < 0) { // L: 84 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85 if (var1 != null) { - return var1; // L: 81 + return var1; // L: 86 } else { - var1 = InterfaceParent.SpriteBuffer_getSprite(field1867, this.backSpriteID, 0); // L: 82 - if (var1 != null) { // L: 83 - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + var1 = class6.SpriteBuffer_getSprite(field1863, this.backSpriteID, 0); // L: 87 + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 88 } - return var1; // L: 85 + return var1; // L: 90 } } } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lnu;", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1984956667" ) - public static class387 method3428() { - synchronized(class387.field4344) { - if (class387.field4346 == 0) { // L: 26 - return new class387(); - } else { - class387.field4344[--class387.field4346].method7061(); // L: 28 - return class387.field4344[class387.field4346]; // L: 29 - } + public static void method3473() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 45 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 46 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 47 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 48 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 49 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 50 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 51 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 52 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 53 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 54 } - } + } // L: 56 - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)F", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "14" ) - public static float method3433(int var0) { - var0 &= 16383; // L: 24 - return (float)((double)((float)var0 / 16384.0F) * 6.283185307179586D); // L: 25 - } + public static void method3466() { + ObjectComposition.ObjectDefinition_cached.clear(); // L: 437 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 438 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 439 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 440 + } // L: 441 } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index eafd131742..201d500183 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -3,50 +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("cu") +@ObfuscatedName("cp") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { + @ObfuscatedName("rg") + @ObfuscatedSignature( + descriptor = "Lqi;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1067255387 + ) + public static int field1189; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -285078811 + intValue = 1328246863 ) @Export("cycle") int cycle; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1160559969 + intValue = 399035073 ) @Export("health") int health; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -93193481 + intValue = 573948343 ) @Export("health2") int health2; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2006973369 + intValue = 2144773551 ) @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; // L: 12 - this.health = var2; // L: 13 - this.health2 = var3; // L: 14 - this.cycleOffset = var4; // L: 15 - } // L: 16 + this.cycle = var1; + this.health = var2; + this.health2 = var3; + this.cycleOffset = var4; + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1575098257" + garbageValue = "-1624379348" ) @Export("set") void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; // L: 19 + this.cycle = var1; this.health = var2; // L: 20 this.health2 = var3; this.cycleOffset = var4; @@ -54,272 +66,133 @@ public class HealthBarUpdate extends Node { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;I)V", - garbageValue = "-241424449" + descriptor = "(Lln;Lln;IZB)Lim;", + garbageValue = "-50" ) - public static void method2217(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } + public static Frames method2185(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; // L: 11 + int[] var5 = var0.getGroupFileIds(var2); // L: 12 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2004197987" - ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 - if (var2 == null) { // L: 22 - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lpy;ILcw;II)V", - garbageValue = "-1310765413" - ) - static final void method2213(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = class193.field2192.field2194; // L: 453 - if ((var3 & 8192) != 0) { // L: 454 - var2.field1133 = Client.cycle + var0.method7935(); // L: 455 - var2.field1185 = Client.cycle + var0.method7798(); // L: 456 - var2.field1146 = var0.method7955(); // L: 457 - var2.field1187 = var0.method7955(); // L: 458 - var2.field1188 = var0.method7925(); // L: 459 - var2.field1189 = (byte)var0.method7790(); // L: 460 - } - - if ((var3 & 256) != 0) { // L: 462 - var4 = var0.method7925(); // L: 463 - } - - int var5; - int var8; - int var9; - int var12; - if ((var3 & 1) != 0) { // L: 465 - var5 = var0.method7798(); // L: 466 - PlayerType var6 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var0.readUnsignedByte()); // L: 467 - boolean var7 = var0.method7927() == 1; // L: 468 - var8 = var0.method7927(); // L: 469 - var9 = var0.offset; // L: 470 - if (var2.username != null && var2.appearance != null) { // L: 471 - boolean var10 = false; // L: 472 - if (var6.isUser && class155.friendSystem.isIgnored(var2.username)) { // L: 473 474 - var10 = true; - } - - if (!var10 && Client.field603 == 0 && !var2.isHidden) { // L: 476 - Players.field1299.offset = 0; // L: 477 - var0.method7812(Players.field1299.array, 0, var8); // L: 478 - Players.field1299.offset = 0; // L: 479 - String var11 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(Players.field1299))); // L: 480 - var2.overheadText = var11.trim(); // L: 481 - var2.overheadTextColor = var5 >> 8; // L: 482 - var2.overheadTextEffect = var5 & 255; // L: 483 - var2.overheadTextCyclesRemaining = 150; // L: 484 - var2.isAutoChatting = var7; // L: 485 - var2.field1152 = var2 != class19.localPlayer && var6.isUser && "" != Client.field712 && var11.toLowerCase().indexOf(Client.field712) == -1; // L: 486 - if (var6.isPrivileged) { // L: 488 - var12 = var7 ? 91 : 1; - } else { - var12 = var7 ? 90 : 2; // L: 489 - } - - if (var6.modIcon != -1) { // L: 490 - Login.addGameMessage(var12, class351.method6579(var6.modIcon) + var2.username.getName(), var11); - } else { - Login.addGameMessage(var12, var2.username.getName(), var11); // L: 491 - } - } - } - - var0.offset = var8 + var9; // L: 494 - } - - if ((var3 & 2048) != 0) { // L: 496 - for (var5 = 0; var5 < 3; ++var5) { // L: 497 - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 4096) != 0) { // L: 499 - var2.spotAnimation = var0.method7798(); // L: 500 - var5 = var0.method7889(); // L: 501 - var2.spotAnimationHeight = var5 >> 16; // L: 502 - var2.field1173 = (var5 & 65535) + Client.cycle; // L: 503 - var2.spotAnimationFrame = 0; // L: 504 - var2.spotAnimationFrameCycle = 0; // L: 505 - if (var2.field1173 > Client.cycle) { // L: 506 - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { // L: 507 - var2.spotAnimation = -1; - } - } - - if ((var3 & 128) != 0) { // L: 509 - var5 = var0.method7927(); // L: 510 - byte[] var17 = new byte[var5]; // L: 511 - Buffer var13 = new Buffer(var17); // L: 512 - var0.method7812(var17, 0, var5); // L: 513 - Players.field1289[var1] = var13; // L: 514 - var2.read(var13); // L: 515 - } - - if ((var3 & 512) != 0) { // L: 517 - var2.field1175 = var0.method7792(); // L: 518 - var2.field1177 = var0.readByte(); // L: 519 - var2.field1176 = var0.method7925(); // L: 520 - var2.field1178 = var0.method7955(); // L: 521 - var2.field1179 = var0.method7935() + Client.cycle; // L: 522 - var2.field1180 = var0.method7971() + Client.cycle; // L: 523 - var2.field1181 = var0.method7798(); // L: 524 - if (var2.field1109) { // L: 525 - var2.field1175 += var2.tileX; // L: 526 - var2.field1177 += var2.tileY; // L: 527 - var2.field1176 += var2.tileX; // L: 528 - var2.field1178 += var2.tileY; // L: 529 - var2.pathLength = 0; // L: 530 + for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 + byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 + if (var7 == null) { // L: 15 + var4 = false; // L: 16 } else { - var2.field1175 += var2.pathX[0]; // L: 533 - var2.field1177 += var2.pathY[0]; // L: 534 - var2.field1176 += var2.pathX[0]; // L: 535 - var2.field1178 += var2.pathY[0]; // L: 536 - var2.pathLength = 1; // L: 537 - } - - var2.field1134 = 0; // L: 539 - } - - if ((var3 & 16) != 0) { // L: 541 - var2.field1160 = var0.readUnsignedShort(); // L: 542 - if (var2.pathLength == 0) { // L: 543 - var2.orientation = var2.field1160; // L: 544 - var2.field1160 = -1; // L: 545 - } - } - - if ((var3 & 2) != 0) { // L: 548 - var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 549 - if (var2.overheadText.charAt(0) == '~') { // L: 550 - var2.overheadText = var2.overheadText.substring(1); // L: 551 - Login.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 552 - } else if (var2 == class19.localPlayer) { // L: 554 - Login.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 555 - } - - var2.isAutoChatting = false; // L: 557 - var2.overheadTextColor = 0; // L: 558 - var2.overheadTextEffect = 0; // L: 559 - var2.overheadTextCyclesRemaining = 150; // L: 560 - } - - int var14; - if ((var3 & 8) != 0) { // L: 562 - var5 = var0.method7971(); // L: 563 - if (var5 == 65535) { // L: 564 - var5 = -1; - } - - var14 = var0.method7927(); // L: 565 - KeyHandler.performPlayerAnimation(var2, var5, var14); // L: 566 - } - - if ((var3 & 16384) != 0) { // L: 568 - Players.field1285[var1] = (class193)ChatChannel.findEnumerated(class124.method2801(), var0.method7955()); // L: 569 - } - - if ((var3 & 32) != 0) { // L: 571 - var2.targetIndex = var0.method7798(); // L: 572 - if (var2.targetIndex == 65535) { // L: 573 - var2.targetIndex = -1; - } - } - - if ((var3 & 4) != 0) { // L: 575 - var5 = var0.method7790(); // L: 576 - int var16; - int var18; - int var19; - if (var5 > 0) { // L: 577 - for (var14 = 0; var14 < var5; ++var14) { // L: 578 - var8 = -1; // L: 580 - var9 = -1; // L: 581 - var19 = -1; // L: 582 - var18 = var0.readUShortSmart(); // L: 583 - if (var18 == 32767) { // L: 584 - var18 = var0.readUShortSmart(); // L: 585 - var9 = var0.readUShortSmart(); // L: 586 - var8 = var0.readUShortSmart(); // L: 587 - var19 = var0.readUShortSmart(); // L: 588 - } else if (var18 != 32766) { // L: 590 - var9 = var0.readUShortSmart(); // L: 591 - } else { - var18 = -1; // L: 593 - } - - var16 = var0.readUShortSmart(); // L: 594 - var2.addHitSplat(var18, var9, var8, var19, Client.cycle, var16); // L: 595 - } - } - - var14 = var0.readUnsignedByte(); // L: 598 - if (var14 > 0) { // L: 599 - for (var18 = 0; var18 < var14; ++var18) { // L: 600 - var8 = var0.readUShortSmart(); // L: 601 - var9 = var0.readUShortSmart(); // L: 602 - if (var9 != 32767) { // L: 603 - var19 = var0.readUShortSmart(); // L: 604 - var16 = var0.readUnsignedByte(); // L: 605 - var12 = var9 > 0 ? var0.method7790() : var16; // L: 606 - var2.addHealthBar(var8, Client.cycle, var9, var19, var16, var12); // L: 607 - } else { - var2.removeHealthBar(var8); // L: 609 - } - } - } - } - - if (var2.field1109) { // L: 613 - if (var4 == 127) { // L: 614 - var2.resetPath(var2.tileX, var2.tileY); - } else { - class193 var15; - if (var4 != class193.field2192.field2194) { // L: 617 - var15 = (class193)ChatChannel.findEnumerated(class124.method2801(), var4); + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 + byte[] var9; + if (var3) { // L: 21 + var9 = var1.getFile(0, var8); } else { - var15 = Players.field1285[var1]; // L: 618 + var9 = var1.getFile(var8, 0); // L: 22 } - var2.method2144(var2.tileX, var2.tileY, var15); // L: 619 + if (var9 == null) { // L: 23 + var4 = false; + } } } - } // L: 623 - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "921137815" - ) - static void method2210(int var0, int var1, int var2) { - if (var0 != 0) { // L: 3315 - int var3 = var0 >> 8; // L: 3316 - int var4 = var0 >> 4 & 7; // L: 3317 - int var5 = var0 & 15; // L: 3318 - Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 3319 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 3320 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3321 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3322 - int var6 = (var1 - 64) / 128; // L: 3323 - int var7 = (var2 - 64) / 128; // L: 3324 - Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 3325 - ++Client.soundEffectCount; // L: 3326 + if (!var4) { // L: 25 + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); // L: 27 + } catch (Exception var11) { // L: 29 + return null; // L: 30 + } } - } // L: 3327 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "-30" + ) + static int method2186(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269 + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286 + var7 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1287 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1288 + if (var4 >= 1 && var4 <= 10) { // L: 1289 + class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292 + Interpreter.field843.add(var8); // L: 1293 + return 1; // L: 1294 + } else { + throw new RuntimeException(); // L: 1290 + } + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296 + Interpreter.Interpreter_intStackSize -= 3; // L: 1297 + int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1298 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1299 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1300 + if (var5 >= 1 && var5 <= 10) { // L: 1301 + class93 var6 = new class93(var5, var3, var4, class127.getWidget(var3).itemId); // L: 1304 + Interpreter.field843.add(var6); // L: 1305 + return 1; // L: 1306 + } else { + throw new RuntimeException(); // L: 1302 + } + } else { + return 2; // L: 1308 + } + } else if (Interpreter.field844 >= 10) { // L: 1270 + throw new RuntimeException(); // L: 1271 + } else { + if (var0 >= 2000) { // L: 1274 + var7 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1275 + } else { + var7 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1277 + } + + if (var7.onResize == null) { // L: 1278 + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); // L: 1279 + var9.widget = var7; // L: 1280 + var9.args = var7.onResize; // L: 1281 + var9.field1031 = Interpreter.field844 + 1; // L: 1282 + Client.scriptEvents.addFirst(var9); // L: 1283 + return 1; // L: 1284 + } + } + } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(Lky;III)V", + garbageValue = "-1103204446" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10840 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10841 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10842 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10843 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10844 + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10845 + } + + if (var0.yAlignment == 0) { // L: 10846 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10847 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10848 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10849 + } else if (var0.yAlignment == 4) { // L: 10850 + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10851 + } + + } // L: 10852 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index fa24add0d6..5672f76a29 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -3,117 +3,110 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gj") +@ObfuscatedName("gs") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("HitSplatDefinition_archive") - public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("h") + static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("HitSplatDefinition_cached") - static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("HitSplatDefinition_cachedSprites") - static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("HitSplatDefinition_cachedFonts") - static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("x") + public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1926287649 + intValue = -78193355 ) @Export("fontId") int fontId; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1728432001 + intValue = -867488021 ) @Export("textColor") public int textColor; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 670201833 + intValue = 566909491 ) - public int field2025; - @ObfuscatedName("p") + public int field1998; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2088614137 + intValue = 2072278043 ) - int field2018; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1486126739 - ) - int field2015; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 463403451 - ) - int field2014; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1913451591 - ) - int field2003; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1607995829 - ) - public int field2016; + int field1999; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 304686181 + intValue = -367586383 ) - public int field2017; - @ObfuscatedName("q") + int field2000; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 686533415 + intValue = 530891065 + ) + int field2001; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1859926009 + ) + int field2002; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 621557545 + ) + public int field2003; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1339697259 + ) + public int field2004; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 2090677099 ) public int field2005; @ObfuscatedName("y") - String field2019; - @ObfuscatedName("z") + String field2010; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -731376779 + intValue = 859094637 ) - public int field2020; + public int field2007; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1728160459 + intValue = 494157579 ) - public int field2021; - @ObfuscatedName("t") + public int field2011; + @ObfuscatedName("z") @Export("transforms") public int[] transforms; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1797964889 + intValue = -608530201 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 602971365 + intValue = -1991065381 ) @Export("transformVarp") int transformVarp; @@ -127,497 +120,274 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; // L: 26 this.textColor = 16777215; // L: 27 - this.field2025 = 70; // L: 28 - this.field2018 = -1; // L: 29 - this.field2015 = -1; // L: 30 - this.field2014 = -1; // L: 31 - this.field2003 = -1; - this.field2016 = 0; - this.field2017 = 0; - this.field2005 = -1; - this.field2019 = ""; - this.field2020 = -1; - this.field2021 = 0; + this.field1998 = 70; // L: 28 + this.field1999 = -1; // L: 29 + this.field2000 = -1; // L: 30 + this.field2001 = -1; // L: 31 + this.field2002 = -1; // L: 32 + this.field2003 = 0; // L: 33 + this.field2004 = 0; // L: 34 + this.field2005 = -1; // L: 35 + this.field2010 = ""; // L: 36 + this.field2007 = -1; // L: 37 + this.field2011 = 0; // L: 38 this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 } // L: 43 - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-766688511" + descriptor = "(Lpi;I)V", + garbageValue = "1833933416" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 57 - if (var2 == 0) { // L: 58 - return; // L: 61 + int var2 = var1.readUnsignedByte(); // L: 63 + if (var2 == 0) { // L: 64 + return; // L: 67 } - this.decodeNext(var1, var2); // L: 59 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-907720149" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 64 - this.fontId = var1.method7742(); - } else if (var2 == 2) { // L: 65 - this.textColor = var1.readMedium(); - } else if (var2 == 3) { // L: 66 - this.field2018 = var1.method7742(); - } else if (var2 == 4) { // L: 67 - this.field2014 = var1.method7742(); - } else if (var2 == 5) { // L: 68 - this.field2015 = var1.method7742(); - } else if (var2 == 6) { // L: 69 - this.field2003 = var1.method7742(); - } else if (var2 == 7) { // L: 70 - this.field2016 = var1.readShort(); - } else if (var2 == 8) { // L: 71 - this.field2019 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { // L: 72 - this.field2025 = var1.readUnsignedShort(); - } else if (var2 == 10) { // L: 73 - this.field2017 = var1.readShort(); - } else if (var2 == 11) { // L: 74 - this.field2005 = 0; - } else if (var2 == 12) { // L: 75 - this.field2020 = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 76 - this.field2021 = var1.readShort(); - } else if (var2 == 14) { - this.field2005 = var1.readUnsignedShort(); // L: 77 - } else if (var2 == 17 || var2 == 18) { // L: 78 - this.transformVarbit = var1.readUnsignedShort(); // L: 79 - if (this.transformVarbit == 65535) { // L: 80 - this.transformVarbit = -1; - } - - this.transformVarp = var1.readUnsignedShort(); // L: 81 - if (this.transformVarp == 65535) { // L: 82 - this.transformVarp = -1; - } - - int var3 = -1; // L: 83 - if (var2 == 18) { // L: 84 - var3 = var1.readUnsignedShort(); // L: 85 - if (var3 == 65535) { // L: 86 - var3 = -1; - } - } - - int var4 = var1.readUnsignedByte(); // L: 88 - this.transforms = new int[var4 + 2]; // L: 89 - - for (int var5 = 0; var5 <= var4; ++var5) { // L: 90 - this.transforms[var5] = var1.readUnsignedShort(); // L: 91 - if (this.transforms[var5] == 65535) { // L: 92 - this.transforms[var5] = -1; - } - } - - this.transforms[var4 + 1] = var3; // L: 94 - } - - } // L: 97 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-1523162219" - ) - @Export("transform") - public final HitSplatDefinition transform() { - int var1 = -1; // L: 100 - if (this.transformVarbit != -1) { // L: 101 - var1 = WorldMapRegion.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 102 - var1 = Varps.Varps_main[this.transformVarp]; - } - - int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 104 - var2 = this.transforms[var1]; // L: 105 - } else { - var2 = this.transforms[this.transforms.length - 1]; - } - - return var2 != -1 ? GameEngine.method589(var2) : null; // L: 106 107 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-2040807148" - ) - @Export("getString") - public String getString(int var1) { - String var2 = this.field2019; // L: 111 - - while (true) { - int var3 = var2.indexOf("%1"); // L: 113 - if (var3 < 0) { // L: 114 - return var2; // L: 117 - } - - var2 = var2.substring(0, var3) + JagexCache.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Lql;", - garbageValue = "-817208999" - ) - public SpritePixels method3611() { - if (this.field2018 < 0) { // L: 121 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2018); // L: 122 - if (var1 != null) { - return var1; // L: 123 - } else { - var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2018, 0); // L: 124 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2018); // L: 125 - } - - return var1; // L: 127 - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(S)Lql;", - garbageValue = "6554" - ) - public SpritePixels method3620() { - if (this.field2015 < 0) { // L: 131 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2015); // L: 132 - if (var1 != null) { // L: 133 - return var1; - } else { - var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2015, 0); // L: 134 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2015); // L: 135 - } - - return var1; // L: 137 - } + this.decodeNext(var1, var2); // L: 65 } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Lql;", - garbageValue = "8947" + descriptor = "(Lpi;II)V", + garbageValue = "127877365" ) - public SpritePixels method3613() { - if (this.field2014 < 0) { // L: 141 + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 70 + this.fontId = var1.method7692(); + } else if (var2 == 2) { // L: 71 + this.textColor = var1.readMedium(); + } else if (var2 == 3) { // L: 72 + this.field1999 = var1.method7692(); + } else if (var2 == 4) { // L: 73 + this.field2001 = var1.method7692(); + } else if (var2 == 5) { // L: 74 + this.field2000 = var1.method7692(); + } else if (var2 == 6) { // L: 75 + this.field2002 = var1.method7692(); + } else if (var2 == 7) { // L: 76 + this.field2003 = var1.readShort(); + } else if (var2 == 8) { // L: 77 + this.field2010 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { // L: 78 + this.field1998 = var1.readUnsignedShort(); + } else if (var2 == 10) { // L: 79 + this.field2004 = var1.readShort(); + } else if (var2 == 11) { // L: 80 + this.field2005 = 0; + } else if (var2 == 12) { // L: 81 + this.field2007 = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 82 + this.field2011 = var1.readShort(); + } else if (var2 == 14) { + this.field2005 = var1.readUnsignedShort(); // L: 83 + } else if (var2 == 17 || var2 == 18) { // L: 84 + this.transformVarbit = var1.readUnsignedShort(); // L: 85 + if (this.transformVarbit == 65535) { // L: 86 + this.transformVarbit = -1; + } + + this.transformVarp = var1.readUnsignedShort(); // L: 87 + if (this.transformVarp == 65535) { // L: 88 + this.transformVarp = -1; + } + + int var3 = -1; // L: 89 + if (var2 == 18) { // L: 90 + var3 = var1.readUnsignedShort(); // L: 91 + if (var3 == 65535) { // L: 92 + var3 = -1; + } + } + + int var4 = var1.readUnsignedByte(); // L: 94 + this.transforms = new int[var4 + 2]; // L: 95 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 96 + this.transforms[var5] = var1.readUnsignedShort(); // L: 97 + if (this.transforms[var5] == 65535) { // L: 98 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 100 + } + + } // L: 103 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Lgs;", + garbageValue = "-505226354" + ) + @Export("transform") + public final HitSplatDefinition transform() { + int var1 = -1; // L: 106 + if (this.transformVarbit != -1) { // L: 107 + var1 = SecureRandomCallable.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 108 + var1 = Varps.Varps_main[this.transformVarp]; + } + + int var2; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 110 + var2 = this.transforms[var1]; // L: 111 + } else { + var2 = this.transforms[this.transforms.length - 1]; + } + + return var2 != -1 ? UserComparator3.method2602(var2) : null; // L: 112 113 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "864399323" + ) + @Export("getString") + public String getString(int var1) { + String var2 = this.field2010; // L: 117 + + while (true) { + int var3 = var2.indexOf("%1"); // L: 119 + if (var3 < 0) { // L: 120 + return var2; // L: 123 + } + + var2 = var2.substring(0, var3) + ItemLayer.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Lqi;", + garbageValue = "872036041" + ) + public SpritePixels method3625() { + if (this.field1999 < 0) { // L: 127 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2014); // L: 142 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1999); // L: 128 if (var1 != null) { - return var1; // L: 143 + return var1; // L: 129 } else { - var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2014, 0); // L: 144 - if (var1 != null) { // L: 145 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2014); + var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field1999, 0); // L: 130 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1999); // L: 131 } - return var1; // L: 147 + return var1; // L: 133 } } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lql;", - garbageValue = "-2026619889" + descriptor = "(I)Lqi;", + garbageValue = "-1662028806" ) - public SpritePixels method3614() { - if (this.field2003 < 0) { // L: 151 + public SpritePixels method3640() { + if (this.field2000 < 0) { // L: 137 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2003); // L: 152 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2000); // L: 138 if (var1 != null) { - return var1; // L: 153 + return var1; // L: 139 } else { - var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2003, 0); // L: 154 - if (var1 != null) { // L: 155 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2003); + var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2000, 0); // L: 140 + if (var1 != null) { // L: 141 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2000); } - return var1; // L: 157 + return var1; // L: 143 + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Lqi;", + garbageValue = "927571164" + ) + public SpritePixels method3626() { + if (this.field2001 < 0) { // L: 147 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2001); // L: 148 + if (var1 != null) { + return var1; // L: 149 + } else { + var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2001, 0); // L: 150 + if (var1 != null) { // L: 151 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2001); + } + + return var1; // L: 153 + } + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lqi;", + garbageValue = "-1943622040" + ) + public SpritePixels method3627() { + if (this.field2002 < 0) { // L: 157 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2002); // L: 158 + if (var1 != null) { // L: 159 + return var1; + } else { + var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2002, 0); // L: 160 + if (var1 != null) { // L: 161 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2002); + } + + return var1; // L: 163 } } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Lmr;", - garbageValue = "95" + descriptor = "(I)Lmd;", + garbageValue = "-1180066279" ) @Export("getFont") public Font getFont() { - if (this.fontId == -1) { // L: 161 + if (this.fontId == -1) { // L: 167 return null; } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 162 - if (var1 != null) { // L: 163 + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168 + if (var1 != null) { // L: 169 return var1; } else { - var1 = class19.method319(class20.field101, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 164 + var1 = class163.method3322(class282.field3261, class349.HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170 if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 165 + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171 } - return var1; // L: 167 + return var1; // L: 173 } } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lfy;", - garbageValue = "346076354" + descriptor = "(IB)I", + garbageValue = "12" ) - public static HealthBarDefinition method3619(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32 - if (var1 != null) { // L: 33 - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34 - var1 = new HealthBarDefinition(); // L: 35 - if (var2 != null) { // L: 36 - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37 - return var1; // L: 38 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Lkj;", - garbageValue = "945276935" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.field3919, PlayerType.field3931, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.field3926, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman}; // L: 22 - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-213160896" - ) - static int method3642(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3917 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = MusicPatch.loadWorlds() ? 1 : 0; // L: 3918 - return 1; // L: 3919 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3921 - var9 = FloorDecoration.worldListStart(); // L: 3922 - if (var9 != null) { // L: 3923 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.id; // L: 3924 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.properties; // L: 3925 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.activity; // L: 3926 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.location; // L: 3927 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.population; // L: 3928 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.host; // L: 3929 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3932 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3933 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3934 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3935 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3936 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3937 - } - - return 1; // L: 3939 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3941 - var9 = WallDecoration.getNextWorldListWorld(); // L: 3942 - if (var9 != null) { // L: 3943 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.id; // L: 3944 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.properties; // L: 3945 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.activity; // L: 3946 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.location; // L: 3947 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.population; // L: 3948 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.host; // L: 3949 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3952 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3953 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3954 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3955 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3956 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3957 - } - - return 1; // L: 3959 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3961 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3962 - var7 = null; // L: 3963 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3964 - if (var3 == World.World_worlds[var8].id) { // L: 3965 - var7 = World.World_worlds[var8]; // L: 3966 - break; - } - } - - if (var7 != null) { // L: 3970 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.id; // L: 3971 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.properties; // L: 3972 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.activity; // L: 3973 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.location; // L: 3974 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.population; // L: 3975 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.host; // L: 3976 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3979 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3980 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3981 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3982 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3983 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3984 - } - - return 1; // L: 3986 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3988 - class295.Interpreter_intStackSize -= 4; // L: 3989 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3990 - boolean var10 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 3991 - var8 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3992 - boolean var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3] == 1; // L: 3993 - FriendsList.sortWorldList(var3, var10, var8, var6); // L: 3994 - return 1; // L: 3995 - } else if (var0 != 6511) { // L: 3997 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4018 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 4019 - return 1; // L: 4020 - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4022 - class295.Interpreter_intStackSize -= 2; // L: 4023 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4024 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4025 - var5 = class182.getParamDefinition(var4); // L: 4026 - if (var5.isString()) { // L: 4027 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class9.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4028 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class9.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4031 - } - - return 1; // L: 4033 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4035 - class295.Interpreter_intStackSize -= 2; // L: 4036 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4037 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4038 - var5 = class182.getParamDefinition(var4); // L: 4039 - if (var5.isString()) { // L: 4040 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class116.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4041 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class116.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4044 - } - - return 1; // L: 4046 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4048 - class295.Interpreter_intStackSize -= 2; // L: 4049 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4050 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4051 - var5 = class182.getParamDefinition(var4); // L: 4052 - if (var5.isString()) { // L: 4053 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class67.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4054 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4057 - } - - return 1; // L: 4059 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4061 - class295.Interpreter_intStackSize -= 2; // L: 4062 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4063 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4064 - var5 = class182.getParamDefinition(var4); // L: 4065 - if (var5.isString()) { // L: 4066 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class114.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4067 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class114.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4070 - } - - return 1; // L: 4072 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4074 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4075 - return 1; // L: 4076 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4078 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.clientType; // L: 4079 - return 1; // L: 4080 - } else if (var0 == 6520) { // L: 4082 - return 1; // L: 4083 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4085 - return 1; // L: 4086 - } else if (var0 == 6522) { // L: 4088 - --ChatChannel.Interpreter_stringStackSize; // L: 4089 - --class295.Interpreter_intStackSize; // L: 4090 - return 1; // L: 4091 - } else if (var0 == 6523) { // L: 4093 - --ChatChannel.Interpreter_stringStackSize; // L: 4094 - --class295.Interpreter_intStackSize; // L: 4095 - return 1; // L: 4096 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4098 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4099 - return 1; // L: 4100 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4102 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 4103 - return 1; // L: 4104 - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4106 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 4107 - return 1; // L: 4108 - } else if (var0 == 6527) { // L: 4110 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.field486; // L: 4111 - return 1; // L: 4112 - } else { - return 2; // L: 4114 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3998 - if (var3 >= 0 && var3 < World.World_count) { // L: 3999 - var7 = World.World_worlds[var3]; // L: 4000 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.id; // L: 4001 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.properties; // L: 4002 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.activity; // L: 4003 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.location; // L: 4004 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.population; // L: 4005 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.host; // L: 4006 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4009 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4010 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4011 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4012 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4013 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4014 - } - - return 1; // L: 4016 - } - } - } + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 + return var1 == null ? 0 : var1.size(); // L: 45 46 } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index eef795473f..fbe5b0156e 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -3,465 +3,103 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("fg") +@ObfuscatedName("fw") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfw;" ) - field1900(0, 0), - @ObfuscatedName("o") + field1889(2, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfw;" ) @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(1, 1), - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfw;" ) - field1904(2, 2); + field1890(0, 2); - @ObfuscatedName("k") + @ObfuscatedName("px") @ObfuscatedSignature( - descriptor = "Lqx;" + descriptor = "Loa;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("g") + static class391 field1885; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 819776149 + intValue = 544424349 ) @Export("value") public final int value; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 66971335 + intValue = -801699883 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 24 - } + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lkn;", - garbageValue = "2113988657" + descriptor = "(B)I", + garbageValue = "16" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 220 - int var2 = var0 & 65535; // L: 221 - if (EnumComposition.Widget_interfaceComponents[var1] == null || EnumComposition.Widget_interfaceComponents[var1][var2] == null) { // L: 222 - boolean var3 = MusicPatchNode2.loadInterface(var1); // L: 223 - if (!var3) { // L: 224 - return null; - } - } - - return EnumComposition.Widget_interfaceComponents[var1][var2]; // L: 226 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 19 } - @ObfuscatedName("fz") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "22" + descriptor = "(I)Lqq;", + garbageValue = "2022945893" ) - @Export("load") - static void load() { - int var23; - if (Client.titleLoadingStage == 0) { // L: 1381 - FriendSystem.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1382 + public static IndexedSprite method3492() { + IndexedSprite var0 = new IndexedSprite(); // L: 155 + var0.width = class451.SpriteBuffer_spriteWidth; // L: 156 + var0.height = class451.SpriteBuffer_spriteHeight; // L: 157 + var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 158 + var0.yOffset = class271.SpriteBuffer_yOffsets[0]; // L: 159 + var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 160 + var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 161 + var0.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 162 + var0.pixels = FriendLoginUpdate.SpriteBuffer_pixels[0]; // L: 163 + ArchiveDiskActionHandler.method5813(); // L: 164 + return var0; // L: 165 + } - for (var23 = 0; var23 < 4; ++var23) { // L: 1383 - Client.collisionMaps[var23] = new CollisionMap(104, 104); - } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;B)[F", + garbageValue = "-127" + ) + static float[] method3495(JSONObject var0, String var1) throws JSONException { + float[] var2 = new float[4]; // L: 307 - MusicPatchNode2.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1384 - Login.Login_loadingText = "Starting game engine..."; // L: 1385 - Login.Login_loadingPercent = 5; // L: 1386 - Client.titleLoadingStage = 20; // L: 1387 - } else if (Client.titleLoadingStage == 20) { // L: 1390 - Login.Login_loadingText = "Prepared visibility map"; // L: 1391 - Login.Login_loadingPercent = 10; // L: 1392 - Client.titleLoadingStage = 30; // L: 1393 - } else if (Client.titleLoadingStage == 30) { // L: 1396 - TileItem.archive0 = GrandExchangeEvent.newArchive(0, false, true, true); // L: 1397 - class321.archive1 = GrandExchangeEvent.newArchive(1, false, true, true); // L: 1398 - FloorOverlayDefinition.archive2 = GrandExchangeEvent.newArchive(2, true, false, true); // L: 1399 - class121.archive3 = GrandExchangeEvent.newArchive(3, false, true, true); // L: 1400 - MouseHandler.archive4 = GrandExchangeEvent.newArchive(4, false, true, true); // L: 1401 - class302.archive5 = GrandExchangeEvent.newArchive(5, true, true, true); // L: 1402 - ArchiveLoader.archive6 = GrandExchangeEvent.newArchive(6, true, true, true); // L: 1403 - class145.archive7 = GrandExchangeEvent.newArchive(7, false, true, true); // L: 1404 - WorldMapData_1.archive8 = GrandExchangeEvent.newArchive(8, false, true, true); // L: 1405 - class132.archive9 = GrandExchangeEvent.newArchive(9, false, true, true); // L: 1406 - World.archive10 = GrandExchangeEvent.newArchive(10, false, true, true); // L: 1407 - class268.archive11 = GrandExchangeEvent.newArchive(11, false, true, true); // L: 1408 - class135.archive12 = GrandExchangeEvent.newArchive(12, false, true, true); // L: 1409 - class4.archive13 = GrandExchangeEvent.newArchive(13, true, false, true); // L: 1410 - DevicePcmPlayerProvider.archive14 = GrandExchangeEvent.newArchive(14, false, true, true); // L: 1411 - ViewportMouse.archive15 = GrandExchangeEvent.newArchive(15, false, true, true); // L: 1412 - ArchiveLoader.archive17 = GrandExchangeEvent.newArchive(17, true, true, true); // L: 1413 - JagexCache.archive18 = GrandExchangeEvent.newArchive(18, false, true, true); // L: 1414 - class202.archive19 = GrandExchangeEvent.newArchive(19, false, true, true); // L: 1415 - ReflectionCheck.archive20 = GrandExchangeEvent.newArchive(20, false, true, true); // L: 1416 - Login.Login_loadingText = "Connecting to update server"; // L: 1417 - Login.Login_loadingPercent = 20; // L: 1418 - Client.titleLoadingStage = 40; // L: 1419 - } else if (Client.titleLoadingStage == 40) { // L: 1422 - byte var33 = 0; // L: 1423 - var23 = var33 + TileItem.archive0.percentage() * 4 / 100; // L: 1424 - var23 += class321.archive1.percentage() * 4 / 100; // L: 1425 - var23 += FloorOverlayDefinition.archive2.percentage() * 2 / 100; // L: 1426 - var23 += class121.archive3.percentage() * 2 / 100; // L: 1427 - var23 += MouseHandler.archive4.percentage() * 6 / 100; // L: 1428 - var23 += class302.archive5.percentage() * 4 / 100; // L: 1429 - var23 += ArchiveLoader.archive6.percentage() * 2 / 100; // L: 1430 - var23 += class145.archive7.percentage() * 56 / 100; // L: 1431 - var23 += WorldMapData_1.archive8.percentage() * 2 / 100; // L: 1432 - var23 += class132.archive9.percentage() * 2 / 100; // L: 1433 - var23 += World.archive10.percentage() * 2 / 100; // L: 1434 - var23 += class268.archive11.percentage() * 2 / 100; // L: 1435 - var23 += class135.archive12.percentage() * 2 / 100; // L: 1436 - var23 += class4.archive13.percentage() * 2 / 100; // L: 1437 - var23 += DevicePcmPlayerProvider.archive14.percentage() * 2 / 100; // L: 1438 - var23 += ViewportMouse.archive15.percentage() * 2 / 100; // L: 1439 - var23 += class202.archive19.percentage() / 100; // L: 1440 - var23 += JagexCache.archive18.percentage() / 100; // L: 1441 - var23 += ReflectionCheck.archive20.percentage() / 100; // L: 1442 - var23 += ArchiveLoader.archive17.method5819() && ArchiveLoader.archive17.isFullyLoaded() ? 1 : 0; // L: 1443 - if (var23 != 100) { // L: 1444 - if (var23 != 0) { // L: 1445 - Login.Login_loadingText = "Checking for updates - " + var23 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 1446 - } else { - ItemLayer.method3895(TileItem.archive0, "Animations"); // L: 1449 - ItemLayer.method3895(class321.archive1, "Skeletons"); // L: 1450 - ItemLayer.method3895(MouseHandler.archive4, "Sound FX"); // L: 1451 - ItemLayer.method3895(class302.archive5, "Maps"); // L: 1452 - ItemLayer.method3895(ArchiveLoader.archive6, "Music Tracks"); // L: 1453 - ItemLayer.method3895(class145.archive7, "Models"); // L: 1454 - ItemLayer.method3895(WorldMapData_1.archive8, "Sprites"); // L: 1455 - ItemLayer.method3895(class268.archive11, "Music Jingles"); // L: 1456 - ItemLayer.method3895(DevicePcmPlayerProvider.archive14, "Music Samples"); // L: 1457 - ItemLayer.method3895(ViewportMouse.archive15, "Music Patches"); // L: 1458 - ItemLayer.method3895(class202.archive19, "World Map"); // L: 1459 - ItemLayer.method3895(JagexCache.archive18, "World Map Geography"); // L: 1460 - ItemLayer.method3895(ReflectionCheck.archive20, "World Map Ground"); // L: 1461 - PendingSpawn.spriteIds = new GraphicsDefaults(); // L: 1462 - PendingSpawn.spriteIds.decode(ArchiveLoader.archive17); // L: 1463 - Login.Login_loadingText = "Loaded update list"; // L: 1464 - Login.Login_loadingPercent = 30; // L: 1465 - Client.titleLoadingStage = 45; // L: 1466 - } - } else { - Archive var24; - Archive var25; - Archive var26; - if (Client.titleLoadingStage == 45) { // L: 1469 - class67.method1881(22050, !Client.isLowDetail, 2); // L: 1470 - MidiPcmStream var30 = new MidiPcmStream(); // L: 1471 - var30.method5281(9, 128); // L: 1472 - class290.pcmPlayer0 = AbstractWorldMapData.method4986(class434.taskHandler, 0, 22050); // L: 1473 - class290.pcmPlayer0.setStream(var30); // L: 1474 - var24 = ViewportMouse.archive15; // L: 1475 - var25 = DevicePcmPlayerProvider.archive14; // L: 1476 - var26 = MouseHandler.archive4; // L: 1477 - class273.musicPatchesArchive = var24; // L: 1479 - class273.musicSamplesArchive = var25; // L: 1480 - class273.soundEffectsArchive = var26; // L: 1481 - WorldMapEvent.midiPcmStream = var30; // L: 1482 - class182.pcmPlayer1 = AbstractWorldMapData.method4986(class434.taskHandler, 1, 2048); // L: 1484 - WorldMapIcon_1.pcmStreamMixer = new PcmStreamMixer(); // L: 1485 - class182.pcmPlayer1.setStream(WorldMapIcon_1.pcmStreamMixer); // L: 1486 - LoginScreenAnimation.decimator = new Decimator(22050, SecureRandomFuture.field949); // L: 1487 - Login.Login_loadingText = "Prepared sound engine"; // L: 1488 - Login.Login_loadingPercent = 35; // L: 1489 - Client.titleLoadingStage = 50; // L: 1490 - class267.WorldMapElement_fonts = new Fonts(WorldMapData_1.archive8, class4.archive13); // L: 1491 - } else { - int var1; - if (Client.titleLoadingStage == 50) { // L: 1494 - FontName[] var29 = new FontName[]{FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_plain12}; // L: 1497 - var1 = var29.length; // L: 1499 - Fonts var31 = class267.WorldMapElement_fonts; // L: 1500 - FontName[] var32 = new FontName[]{FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_plain12}; // L: 1503 - Client.fontsMap = var31.createMap(var32); // L: 1505 - if (Client.fontsMap.size() < var1) { // L: 1506 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1507 - Login.Login_loadingPercent = 40; // L: 1508 - } else { - TextureProvider.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1511 - ViewportMouse.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1512 - FloorOverlayDefinition.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1513 - UserComparator2.platformInfo = Client.platformInfoProvider.get(); // L: 1514 - Login.Login_loadingText = "Loaded fonts"; // L: 1515 - Login.Login_loadingPercent = 40; // L: 1516 - Client.titleLoadingStage = 60; // L: 1517 - } - } else if (Client.titleLoadingStage == 60) { // L: 1520 - var23 = Skeleton.method4118(World.archive10, WorldMapData_1.archive8); // L: 1521 - var1 = BufferedFile.method7626(); // L: 1522 - if (var23 < var1) { // L: 1523 - Login.Login_loadingText = "Loading title screen - " + var23 * 100 / var1 + "%"; // L: 1524 - Login.Login_loadingPercent = 50; // L: 1525 - } else { - Login.Login_loadingText = "Loaded title screen"; // L: 1528 - Login.Login_loadingPercent = 50; // L: 1529 - InterfaceParent.updateGameState(5); // L: 1530 - Client.titleLoadingStage = 70; // L: 1531 - } - } else if (Client.titleLoadingStage == 70) { // L: 1534 - if (!FloorOverlayDefinition.archive2.isFullyLoaded()) { // L: 1535 - Login.Login_loadingText = "Loading config - " + FloorOverlayDefinition.archive2.loadPercent() + "%"; // L: 1536 - Login.Login_loadingPercent = 60; // L: 1537 - } else { - NetFileRequest.method5867(FloorOverlayDefinition.archive2); // L: 1540 - HealthBarUpdate.method2217(FloorOverlayDefinition.archive2); // L: 1541 - Archive var28 = FloorOverlayDefinition.archive2; // L: 1542 - var24 = class145.archive7; // L: 1543 - KitDefinition.KitDefinition_archive = var28; // L: 1545 - KitDefinition.KitDefinition_modelsArchive = var24; // L: 1546 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1547 - GrandExchangeOfferUnitPriceComparator.method6081(FloorOverlayDefinition.archive2, class145.archive7, Client.isLowDetail); // L: 1549 - class299.method5766(FloorOverlayDefinition.archive2, class145.archive7); // L: 1550 - class166.method3310(FloorOverlayDefinition.archive2); // L: 1551 - Login.method1944(FloorOverlayDefinition.archive2, class145.archive7, Client.isMembersWorld, TextureProvider.fontPlain11); // L: 1552 - var25 = FloorOverlayDefinition.archive2; // L: 1553 - var26 = TileItem.archive0; // L: 1554 - Archive var27 = class321.archive1; // L: 1555 - class282.SequenceDefinition_archive = var25; // L: 1557 - SequenceDefinition.SequenceDefinition_animationsArchive = var26; // L: 1558 - DevicePcmPlayerProvider.SequenceDefinition_skeletonsArchive = var27; // L: 1559 - Archive var5 = FloorOverlayDefinition.archive2; // L: 1561 - Archive var6 = class145.archive7; // L: 1562 - SpotAnimationDefinition.SpotAnimationDefinition_archive = var5; // L: 1564 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var6; // L: 1565 - Archive var7 = FloorOverlayDefinition.archive2; // L: 1567 - VarbitComposition.VarbitDefinition_archive = var7; // L: 1569 - Archive var8 = FloorOverlayDefinition.archive2; // L: 1571 - VarpDefinition.VarpDefinition_archive = var8; // L: 1573 - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1574 - Archive var9 = class121.archive3; // L: 1576 - Archive var10 = class145.archive7; // L: 1577 - Archive var11 = WorldMapData_1.archive8; // L: 1578 - Archive var12 = class4.archive13; // L: 1579 - class122.Widget_archive = var9; // L: 1581 - BoundaryObject.Widget_modelsArchive = var10; // L: 1582 - WorldMapLabel.Widget_spritesArchive = var11; // L: 1583 - Client.Widget_fontsArchive = var12; // L: 1584 - EnumComposition.Widget_interfaceComponents = new Widget[class122.Widget_archive.getGroupCount()][]; // L: 1585 - Frames.Widget_loadedInterfaces = new boolean[class122.Widget_archive.getGroupCount()]; // L: 1586 - StudioGame.method5783(FloorOverlayDefinition.archive2); // L: 1588 - Archive var13 = FloorOverlayDefinition.archive2; // L: 1589 - JagexCache.EnumDefinition_archive = var13; // L: 1591 - class268.method5226(FloorOverlayDefinition.archive2); // L: 1593 - class115.method2685(FloorOverlayDefinition.archive2); // L: 1594 - Canvas.method390(FloorOverlayDefinition.archive2); // L: 1595 - ScriptEvent.HitSplatDefinition_cachedSprites = new class426(Login.field917, 54, FriendSystem.clientLanguage, FloorOverlayDefinition.archive2); // L: 1596 - FontName.HitSplatDefinition_cached = new class426(Login.field917, 47, FriendSystem.clientLanguage, FloorOverlayDefinition.archive2); // L: 1597 - JagexCache.varcs = new Varcs(); // L: 1598 - Archive var14 = FloorOverlayDefinition.archive2; // L: 1599 - Archive var15 = WorldMapData_1.archive8; // L: 1600 - Archive var16 = class4.archive13; // L: 1601 - HitSplatDefinition.HitSplatDefinition_archive = var14; // L: 1603 - class20.field101 = var15; // L: 1604 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var16; // L: 1605 - Archive var17 = FloorOverlayDefinition.archive2; // L: 1607 - Archive var18 = WorldMapData_1.archive8; // L: 1608 - HealthBarDefinition.HealthBarDefinition_archive = var17; // L: 1610 - HealthBarDefinition.field1867 = var18; // L: 1611 - Archive var19 = FloorOverlayDefinition.archive2; // L: 1613 - Archive var20 = WorldMapData_1.archive8; // L: 1614 - WorldMapElement.WorldMapElement_archive = var20; // L: 1616 - if (var19.isFullyLoaded()) { // L: 1617 - class132.WorldMapElement_count = var19.getGroupFileCount(35); // L: 1620 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[class132.WorldMapElement_count]; // L: 1621 - - for (int var21 = 0; var21 < class132.WorldMapElement_count; ++var21) { // L: 1622 - byte[] var22 = var19.takeFile(35, var21); // L: 1623 - WorldMapElement.WorldMapElement_cached[var21] = new WorldMapElement(var21); // L: 1624 - if (var22 != null) { // L: 1625 - WorldMapElement.WorldMapElement_cached[var21].decode(new Buffer(var22)); // L: 1626 - WorldMapElement.WorldMapElement_cached[var21].method3383(); // L: 1627 - } - } - } - - Login.Login_loadingText = "Loaded config"; // L: 1631 - Login.Login_loadingPercent = 60; // L: 1632 - Client.titleLoadingStage = 80; // L: 1633 - } - } else if (Client.titleLoadingStage == 80) { // L: 1636 - var23 = 0; // L: 1637 - if (class14.compass == null) { // L: 1638 - class14.compass = InterfaceParent.SpriteBuffer_getSprite(WorldMapData_1.archive8, PendingSpawn.spriteIds.compass, 0); - } else { - ++var23; // L: 1639 - } - - if (Huffman.redHintArrowSprite == null) { // L: 1640 - Huffman.redHintArrowSprite = InterfaceParent.SpriteBuffer_getSprite(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4315, 0); - } else { - ++var23; // L: 1641 - } - - if (Message.mapSceneSprites == null) { // L: 1642 - Message.mapSceneSprites = WallDecoration.method4516(WorldMapData_1.archive8, PendingSpawn.spriteIds.mapScenes, 0); - } else { - ++var23; // L: 1643 - } - - if (Bounds.headIconPkSprites == null) { // L: 1644 - Bounds.headIconPkSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.headIconsPk, 0); - } else { - ++var23; // L: 1645 - } - - if (DynamicObject.headIconPrayerSprites == null) { // L: 1646 - DynamicObject.headIconPrayerSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4318, 0); - } else { - ++var23; // L: 1647 - } - - if (VarpDefinition.headIconHintSprites == null) { // L: 1648 - VarpDefinition.headIconHintSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4319, 0); - } else { - ++var23; // L: 1649 - } - - if (class17.mapMarkerSprites == null) { // L: 1650 - class17.mapMarkerSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4320, 0); - } else { - ++var23; // L: 1651 - } - - if (Client.crossSprites == null) { // L: 1652 - Client.crossSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4321, 0); - } else { - ++var23; // L: 1653 - } - - if (class142.mapDotSprites == null) { // L: 1654 - class142.mapDotSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4317, 0); - } else { - ++var23; // L: 1655 - } - - if (class268.scrollBarSprites == null) { // L: 1656 - class268.scrollBarSprites = WallDecoration.method4516(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4314, 0); - } else { - ++var23; // L: 1657 - } - - if (UserComparator8.modIconSprites == null) { // L: 1658 - UserComparator8.modIconSprites = WallDecoration.method4516(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4324, 0); - } else { - ++var23; // L: 1659 - } - - if (var23 < 11) { // L: 1660 - Login.Login_loadingText = "Loading sprites - " + var23 * 100 / 12 + "%"; // L: 1661 - Login.Login_loadingPercent = 70; // L: 1662 - } else { - AbstractFont.AbstractFont_modIconSprites = UserComparator8.modIconSprites; // L: 1665 - Huffman.redHintArrowSprite.normalize(); // L: 1666 - var1 = (int)(Math.random() * 21.0D) - 10; // L: 1667 - int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1668 - int var3 = (int)(Math.random() * 21.0D) - 10; // L: 1669 - int var4 = (int)(Math.random() * 41.0D) - 20; // L: 1670 - Message.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var2, var4 + var3); // L: 1671 - Login.Login_loadingText = "Loaded sprites"; // L: 1672 - Login.Login_loadingPercent = 70; // L: 1673 - Client.titleLoadingStage = 90; // L: 1674 - } - } else if (Client.titleLoadingStage == 90) { // L: 1677 - if (!class132.archive9.isFullyLoaded()) { // L: 1678 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1679 - Login.Login_loadingPercent = 90; // L: 1680 - } else { - class33.textureProvider = new TextureProvider(class132.archive9, WorldMapData_1.archive8, 20, Interpreter.clientPreferences.method2266(), Client.isLowDetail ? 64 : 128); // L: 1683 - Rasterizer3D.Rasterizer3D_setTextureLoader(class33.textureProvider); // L: 1684 - Rasterizer3D.Rasterizer3D_setBrightness(Interpreter.clientPreferences.method2266()); // L: 1685 - Client.titleLoadingStage = 100; // L: 1686 - } - } else if (Client.titleLoadingStage == 100) { // L: 1689 - var23 = class33.textureProvider.getLoadedPercentage(); // L: 1690 - if (var23 < 100) { // L: 1691 - Login.Login_loadingText = "Loading textures - " + var23 + "%"; // L: 1692 - Login.Login_loadingPercent = 90; // L: 1693 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 1696 - Login.Login_loadingPercent = 90; // L: 1697 - Client.titleLoadingStage = 110; // L: 1698 - } - } else if (Client.titleLoadingStage == 110) { // L: 1701 - BuddyRankComparator.mouseRecorder = new MouseRecorder(); // L: 1702 - class434.taskHandler.newThreadTask(BuddyRankComparator.mouseRecorder, 10); // L: 1703 - Login.Login_loadingText = "Loaded input handler"; // L: 1704 - Login.Login_loadingPercent = 92; // L: 1705 - Client.titleLoadingStage = 120; // L: 1706 - } else if (Client.titleLoadingStage == 120) { // L: 1709 - if (!World.archive10.tryLoadFileByNames("huffman", "")) { // L: 1710 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1711 - Login.Login_loadingPercent = 94; // L: 1712 - } else { - Huffman var0 = new Huffman(World.archive10.takeFileByNames("huffman", "")); // L: 1715 - VertexNormal.method4496(var0); // L: 1716 - Login.Login_loadingText = "Loaded wordpack"; // L: 1717 - Login.Login_loadingPercent = 94; // L: 1718 - Client.titleLoadingStage = 130; // L: 1719 - } - } else if (Client.titleLoadingStage == 130) { // L: 1722 - if (!class121.archive3.isFullyLoaded()) { // L: 1723 - Login.Login_loadingText = "Loading interfaces - " + class121.archive3.loadPercent() * 4 / 5 + "%"; // L: 1724 - Login.Login_loadingPercent = 96; // L: 1725 - } else if (!class135.archive12.isFullyLoaded()) { // L: 1728 - Login.Login_loadingText = "Loading interfaces - " + (80 + class135.archive12.loadPercent() / 6) + "%"; // L: 1729 - Login.Login_loadingPercent = 96; // L: 1730 - } else if (!class4.archive13.isFullyLoaded()) { // L: 1733 - Login.Login_loadingText = "Loading interfaces - " + (96 + class4.archive13.loadPercent() / 50) + "%"; // L: 1734 - Login.Login_loadingPercent = 96; // L: 1735 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 1738 - Login.Login_loadingPercent = 98; // L: 1739 - Client.titleLoadingStage = 140; // L: 1740 - } - } else if (Client.titleLoadingStage == 140) { // L: 1743 - Login.Login_loadingPercent = 100; // L: 1744 - if (!class202.archive19.tryLoadGroupByName(WorldMapCacheName.field2849.name)) { // L: 1745 - Login.Login_loadingText = "Loading world map - " + class202.archive19.groupLoadPercentByName(WorldMapCacheName.field2849.name) / 10 + "%"; // L: 1746 - } else { - if (ClanChannel.worldMap == null) { // L: 1749 - ClanChannel.worldMap = new WorldMap(); // L: 1750 - ClanChannel.worldMap.init(class202.archive19, JagexCache.archive18, ReflectionCheck.archive20, FloorOverlayDefinition.fontBold12, Client.fontsMap, Message.mapSceneSprites); // L: 1751 - } - - Login.Login_loadingText = "Loaded world map"; // L: 1753 - Client.titleLoadingStage = 150; // L: 1754 - } - } else if (Client.titleLoadingStage == 150) { // L: 1757 - InterfaceParent.updateGameState(10); // L: 1758 - } - } + try { + JSONArray var3 = var0.getJSONArray(var1); // L: 309 + var2[0] = (float)var3.optDouble(0, 0.0D); // L: 310 + var2[1] = (float)var3.optDouble(1, 0.0D); // L: 311 + var2[2] = (float)var3.optDouble(2, 1.0D); // L: 312 + var2[3] = (float)var3.optDouble(3, 1.0D); // L: 313 + } catch (JSONException var4) { // L: 315 + var2[0] = 0.0F; // L: 316 + var2[1] = 0.0F; // L: 317 + var2[2] = 1.0F; // L: 318 + var2[3] = 1.0F; // L: 319 } - } // L: 1388 1394 1420 1447 1467 1492 1509 1518 1526 1532 1538 1634 1663 1675 1681 1687 1694 1699 1707 1713 1720 1726 1731 1736 1741 1747 1755 1759 1761 + + return var2; // L: 321 + } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index d74cb26109..b0b7b67fd0 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,22 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("jx") @Implements("Huffman") public class Huffman { - @ObfuscatedName("ij") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lpi;" ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; + @Export("NetCache_reference") + public static Buffer NetCache_reference; @ObfuscatedName("v") @Export("masks") int[] masks; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("bits") byte[] bits; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("keys") int[] keys; @@ -108,7 +108,7 @@ public class Huffman { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "-1242413440" + garbageValue = "1922986790" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -126,7 +126,7 @@ public class Huffman { int var11 = var7 >> 3; // L: 71 int var12 = var7 & 7; // L: 72 var6 &= -var12 >> 31; // L: 73 - int var13 = (var10 + var12 - 1 >> 3) + var11; // L: 74 + int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74 var12 += 24; // L: 76 var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 if (var11 < var13) { // L: 78 @@ -156,10 +156,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BI[BIIB)I", - garbageValue = "3" + descriptor = "([BI[BIII)I", + garbageValue = "-1823769978" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -218,8 +218,8 @@ public class Huffman { var6 = 0; // L: 127 } - if ((var8 & 16) != 0) { - var6 = this.keys[var6]; // L: 129 + if ((var8 & 16) != 0) { // L: 129 + var6 = this.keys[var6]; } else { ++var6; // L: 130 } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 75db21faf8..403db018fb 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("mw") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lpa;)V" + descriptor = "(Lpe;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 13 @@ -23,68 +23,68 @@ public class IgnoreList extends UserList { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lnc;", - garbageValue = "-1289438305" + descriptor = "(I)Lnn;", + garbageValue = "-2105397576" ) @Export("newInstance") User newInstance() { - return new Ignored(); // L: 19 + return new Ignored(); // L: 18 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Lnc;", - garbageValue = "-1075861644" + descriptor = "(II)[Lnn;", + garbageValue = "1888809026" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; // L: 24 + return new Ignored[var1]; // L: 22 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-1154440804" + descriptor = "(Lpi;IS)V", + garbageValue = "-22904" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { // L: 28 - int var3 = var1.readUnsignedByte(); // L: 29 - boolean var4 = (var3 & 1) == 1; // L: 30 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 31 - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 32 - var1.readStringCp1252NullTerminated(); // L: 33 - if (var5 != null && var5.hasCleanName()) { // L: 34 - Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 35 - if (var4) { // L: 36 - Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 37 - if (var8 != null && var7 != var8) { // L: 38 - if (var7 != null) { // L: 39 - this.remove(var8); // L: 40 + if (var1.offset < var2) { // L: 26 + int var3 = var1.readUnsignedByte(); // L: 27 + boolean var4 = (var3 & 1) == 1; // L: 28 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29 + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 30 + var1.readStringCp1252NullTerminated(); // L: 31 + if (var5 != null && var5.hasCleanName()) { // L: 32 + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 33 + if (var4) { // L: 34 + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 35 + if (var8 != null && var8 != var7) { // L: 36 + if (var7 != null) { // L: 37 + this.remove(var8); // L: 38 } else { - var7 = var8; // L: 43 + var7 = var8; // L: 41 } } } - if (var7 != null) { // L: 47 - this.changeName(var7, var5, var6); // L: 48 + if (var7 != null) { // L: 45 + this.changeName(var7, var5, var6); // L: 46 continue; } - if (this.getSize() < 400) { // L: 50 - int var9 = this.getSize(); // L: 51 - var7 = (Ignored)this.addLast(var5, var6); // L: 52 - var7.id = var9; // L: 53 + if (this.getSize() < 400) { // L: 48 + int var9 = this.getSize(); // L: 49 + var7 = (Ignored)this.addLast(var5, var6); // L: 50 + var7.id = var9; // L: 51 } continue; } - throw new IllegalStateException(); // L: 56 + throw new IllegalStateException(); // L: 54 } - return; // L: 57 + return; // L: 55 } } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 6a413f8ca5..92377a87bb 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Ignored extends User { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -291144419 + intValue = -60193045 ) @Export("id") int id; @@ -19,18 +19,18 @@ public class Ignored extends User { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lng;I)I", - garbageValue = "-264858177" + descriptor = "(Lng;B)I", + garbageValue = "-48" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnc;S)I", - garbageValue = "-8912" + descriptor = "(Lnn;I)I", + garbageValue = "842367957" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -40,4 +40,15 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); // L: 17 } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "127" + ) + static void method6828(int var0) { + if (var0 != Login.loginIndex) { // L: 1852 + Login.loginIndex = var0; // L: 1853 + } + } // L: 1854 } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 8570f70aad..f67fa583bb 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,37 +2,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qx") +@ObfuscatedName("qq") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("v") @Export("pixels") public byte[] pixels; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("palette") public int[] palette; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("subWidth") public int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("subHeight") public int subHeight; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("xOffset") public int xOffset; @ObfuscatedName("n") @Export("yOffset") public int yOffset; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("width") public int width; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("height") public int height; - IndexedSprite() { - } // L: 15 - @ObfuscatedName("v") @Export("normalize") public void normalize() { @@ -54,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 @@ -87,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 @@ -133,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("l") - public void method8161(int var1, int var2, int var3, int var4) { + @ObfuscatedName("b") + public void method8054(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; // L: 116 int var6 = this.subHeight; // L: 117 int var7 = 0; // L: 118 @@ -195,7 +192,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 88 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 2f2f15c920..abb93c7043 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("bl") +@ObfuscatedName("bj") @Implements("Instrument") public class Instrument { - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Instrument_sine") static int[] Instrument_sine; @ObfuscatedName("y") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("Instrument_delays") static int[] Instrument_delays; @ObfuscatedName("e") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("delayTime") int delayTime; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("delayDecay") int delayDecay; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Laa;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Lag;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("duration") int duration; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("offset") int offset; @@ -289,7 +289,6 @@ public class Instrument { ++var14; // L: 139 } - boolean var21 = true; // L: 146 var15 = 128; // L: 147 while (true) { @@ -354,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 @@ -368,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -422,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); // L: 228 this.filter = new AudioFilter(); // L: 229 this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method1065(var1, this.filterEnvelope); // L: 231 + this.filter.method1044(var1, this.filterEnvelope); // L: 231 } // L: 232 } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index ddee0c5268..4c53738775 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qt") +@ObfuscatedName("qc") @Implements("IntHashTable") public class IntHashTable { @ObfuscatedName("v") @@ -34,8 +34,8 @@ public class IntHashTable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "513345996" + descriptor = "(IB)I", + garbageValue = "83" ) @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 be938fd4d0..c4cbcbb7b7 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oj") +@ObfuscatedName("og") @Implements("IntegerNode") public class IntegerNode extends Node { @ObfuscatedName("v") diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index afe9ce8a5b..51af637e3f 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,912 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("cc") @Implements("InterfaceParent") public class InterfaceParent extends Node { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1008979943 + intValue = -457481163 ) @Export("group") int group; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1548121 + intValue = 327822779 ) @Export("type") int type; - @ObfuscatedName("h") - boolean field1039; + @ObfuscatedName("i") + boolean field1028; InterfaceParent() { - this.field1039 = false; // L: 8 - } // L: 10 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Llq;III)Lql;", - garbageValue = "-1036793338" - ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !GrandExchangeEvent.method6045(var0, var1, var2) ? null : ScriptFrame.method1084(); // L: 55 56 + this.field1028 = false; } - @ObfuscatedName("ej") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "-886747176" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1145 - if (Client.gameState == 0) { // L: 1146 - UserComparator10.client.method481(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1147 - UrlRequester.method2533(0); // L: 1148 - Client.field513 = 0; // L: 1149 - Client.field742 = 0; // L: 1150 - Client.timer.method6596(var0); // L: 1151 - if (var0 != 20) { // L: 1152 - Varcs.method2462(false); - } - } - - if (var0 != 20 && var0 != 40 && BuddyRankComparator.field1378 != null) { // L: 1154 1155 - BuddyRankComparator.field1378.close(); // L: 1156 - BuddyRankComparator.field1378 = null; // L: 1157 - } - - if (Client.gameState == 25) { // L: 1160 - Client.field545 = 0; // L: 1161 - Client.field541 = 0; // L: 1162 - Client.field558 = 1; // L: 1163 - Client.field543 = 0; // L: 1164 - Client.field679 = 1; // L: 1165 - } - - if (var0 != 5 && var0 != 10) { // L: 1167 - if (var0 == 20) { // L: 1175 - int var3 = Client.gameState == 11 ? 4 : 0; // L: 1176 - class321.method6031(World.archive10, WorldMapData_1.archive8, false, var3); // L: 1177 - } else if (var0 == 11) { // L: 1179 - class321.method6031(World.archive10, WorldMapData_1.archive8, false, 4); // L: 1180 - } else if (var0 == 50) { // L: 1182 - GrandExchangeEvent.setLoginResponseString("", "Updating date of birth...", ""); // L: 1183 - class321.method6031(World.archive10, WorldMapData_1.archive8, false, 7); // L: 1184 - } else { - class20.method327(); // L: 1186 - } - } else { - boolean var1 = Interpreter.clientPreferences.method2268() >= Client.field484; // L: 1170 - int var2 = var1 ? 0 : 12; // L: 1172 - class321.method6031(World.archive10, WorldMapData_1.archive8, true, var2); // L: 1173 - } - - Client.gameState = var0; // L: 1187 - } - } // L: 1188 - - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - static int method2103() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1368 - int var0 = 0; // L: 1369 - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1370 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1371 - } - - return var0 * 10000 / Client.field767; // L: 1373 + public static Object method2084(byte[] var0, boolean var1) { + if (var0 == null) { // L: 7 + return null; + } else if (var0.length > 136) { // L: 8 + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 + var2.set(var0); // L: 11 + return var2; // L: 12 } else { - return 10000; + return var0; // L: 16 } } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1236451858" - ) - static final void method2100(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; // L: 4876 - boolean var4 = false; // L: 4877 - int var5 = -1; // L: 4878 - int var6 = -1; // L: 4879 - int var7 = Players.Players_count; // L: 4880 - int[] var8 = Players.Players_indices; // L: 4881 - - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4882 - Object var20; - if (var9 < var7) { // L: 4884 - var20 = Client.players[var8[var9]]; // L: 4885 - if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4886 - var4 = true; // L: 4887 - var5 = var9; // L: 4888 - continue; - } - - if (var20 == class19.localPlayer) { // L: 4891 - var6 = var9; // L: 4892 - continue; // L: 4893 - } - } else { - var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4896 - } - - class116.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4897 - } - - if (Client.renderSelf && var6 != -1) { // L: 4899 - class116.drawActor2d(class19.localPlayer, var6, var0, var1, var2, var3); // L: 4900 - } - - if (var4) { // L: 4902 - class116.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4903 - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4905 - int var10 = Client.overheadTextXs[var9]; // L: 4906 - int var11 = Client.overheadTextYs[var9]; // L: 4907 - int var12 = Client.overheadTextXOffsets[var9]; // L: 4908 - int var13 = Client.overheadTextAscents[var9]; // L: 4909 - boolean var14 = true; // L: 4910 - - while (var14) { - var14 = false; // L: 4912 - - for (int var19 = 0; var19 < var9; ++var19) { // L: 4913 - if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXOffsets[var19] + Client.overheadTextXs[var19] && var10 + var12 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4914 4915 - var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4916 - var14 = true; // L: 4917 - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4922 - Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4923 - String var15 = Client.overheadText[var9]; // L: 4924 - if (Client.chatEffects == 0) { // L: 4925 - int var16 = 16776960; // L: 4926 - if (Client.overheadTextColors[var9] < 6) { // L: 4927 - var16 = Client.field709[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { // L: 4928 - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { // L: 4929 - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { // L: 4930 - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { // L: 4931 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4932 - if (var17 < 50) { // L: 4933 - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { // L: 4934 - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 4935 - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { // L: 4937 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4938 - if (var17 < 50) { // L: 4939 - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { // L: 4940 - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 4941 - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { // L: 4943 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4944 - if (var17 < 50) { // L: 4945 - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { // L: 4946 - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { // L: 4947 - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { // L: 4949 - FloorOverlayDefinition.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { // L: 4950 - FloorOverlayDefinition.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { // L: 4951 - FloorOverlayDefinition.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { // L: 4952 - FloorOverlayDefinition.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { // L: 4953 - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (FloorOverlayDefinition.fontBold12.stringWidth(var15) + 100) / 150; // L: 4954 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4955 - FloorOverlayDefinition.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4956 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4957 - } - - if (Client.overheadTextEffects[var9] == 5) { // L: 4959 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4960 - int var18 = 0; // L: 4961 - if (var17 < 25) { // L: 4962 - var18 = var17 - 25; - } else if (var17 > 125) { // L: 4963 - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - FloorOverlayDefinition.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4964 - FloorOverlayDefinition.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4965 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4966 - } - } else { - FloorOverlayDefinition.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4970 - } - } - - } // L: 4973 - - @ObfuscatedName("ib") - @ObfuscatedSignature( - descriptor = "([Lkn;IIIIIIIII)V", - garbageValue = "210982413" - ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9607 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9608 - - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9609 - Widget var10 = var0[var9]; // L: 9610 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9611 9612 - int var11; - if (var8 == -1) { // L: 9614 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9615 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9616 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9617 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9618 - var11 = ++Client.rootWidgetCount - 1; // L: 9619 - } else { - var11 = var8; // L: 9621 - } - - var10.rootIndex = var11; // L: 9622 - var10.cycle = Client.cycle; // L: 9623 - if (!var10.isIf3 || !class263.isComponentHidden(var10)) { // L: 9624 - if (var10.contentType > 0) { // L: 9625 - class120.method2755(var10); - } - - int var12 = var10.x + var6; // L: 9626 - int var13 = var7 + var10.y; // L: 9627 - int var14 = var10.transparencyTop; // L: 9628 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 9629 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9630 - ClanSettings.field1622 = var0; // L: 9631 - NPC.field1253 = var6; // L: 9632 - Projectile.field944 = var7; // L: 9633 - continue; // L: 9634 - } - - if (Client.isDraggingWidget && Client.field668) { // L: 9636 - var15 = MouseHandler.MouseHandler_x; // L: 9637 - var16 = MouseHandler.MouseHandler_y; // L: 9638 - var15 -= Client.widgetClickX; // L: 9639 - var16 -= Client.widgetClickY; // L: 9640 - if (var15 < Client.field669) { // L: 9641 - var15 = Client.field669; - } - - if (var15 + var10.width > Client.field669 + Client.clickedWidgetParent.width) { // L: 9642 - var15 = Client.field669 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field628) { // L: 9643 - var16 = Client.field628; - } - - if (var16 + var10.height > Client.field628 + Client.clickedWidgetParent.height) { // L: 9644 - var16 = Client.field628 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 9645 - var13 = var16; // L: 9646 - } - - if (!var10.isScrollBar) { // L: 9648 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 9654 - var15 = var2; // L: 9655 - var16 = var3; // L: 9656 - var17 = var4; // L: 9657 - var18 = var5; // L: 9658 - } else if (var10.type == 9) { // L: 9660 - var19 = var12; // L: 9661 - var20 = var13; // L: 9662 - var21 = var12 + var10.width; // L: 9663 - var22 = var13 + var10.height; // L: 9664 - if (var21 < var12) { // L: 9665 - var19 = var21; // L: 9667 - var21 = var12; // L: 9668 - } - - if (var22 < var13) { // L: 9670 - var20 = var22; // L: 9672 - var22 = var13; // L: 9673 - } - - ++var21; // L: 9675 - ++var22; // L: 9676 - var15 = var19 > var2 ? var19 : var2; // L: 9677 - var16 = var20 > var3 ? var20 : var3; // L: 9678 - var17 = var21 < var4 ? var21 : var4; // L: 9679 - var18 = var22 < var5 ? var22 : var5; // L: 9680 - } else { - var19 = var12 + var10.width; // L: 9683 - var20 = var13 + var10.height; // L: 9684 - var15 = var12 > var2 ? var12 : var2; // L: 9685 - var16 = var13 > var3 ? var13 : var3; // L: 9686 - var17 = var19 < var4 ? var19 : var4; // L: 9687 - var18 = var20 < var5 ? var20 : var5; // L: 9688 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9690 - if (var10.contentType != 0) { // L: 9691 - if (var10.contentType == 1336) { // L: 9692 - if (Interpreter.clientPreferences.method2251()) { // L: 9693 - var13 += 15; // L: 9694 - ViewportMouse.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9695 - var13 += 15; // L: 9696 - Runtime var42 = Runtime.getRuntime(); // L: 9697 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9698 - var21 = 16776960; // L: 9699 - if (var20 > 327680 && !Client.isLowDetail) { // L: 9700 - var21 = 16711680; - } - - ViewportMouse.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9701 - var13 += 15; // L: 9702 - } - continue; - } - - if (var10.contentType == 1337) { // L: 9706 - Client.viewportX = var12; // L: 9707 - Client.viewportY = var13; // L: 9708 - NPC.drawEntities(var12, var13, var10.width, var10.height); // L: 9709 - Client.field564[var10.rootIndex] = true; // L: 9710 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9711 - continue; // L: 9712 - } - - if (var10.contentType == 1338) { // L: 9714 - WorldMapLabelSize.drawMinimap(var10, var12, var13, var11); // L: 9715 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9716 - continue; // L: 9717 - } - - if (var10.contentType == 1339) { // L: 9719 - CollisionMap.drawCompass(var10, var12, var13, var11); // L: 9720 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9721 - continue; // L: 9722 - } - - if (var10.contentType == 1400) { // L: 9724 - ClanChannel.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9725 - } - - if (var10.contentType == 1401) { // L: 9727 - ClanChannel.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9728 - } - - if (var10.contentType == 1402) { // L: 9730 - Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9731 - } - } - - if (var10.type == 0) { // L: 9734 - if (!var10.isIf3 && class263.isComponentHidden(var10) && var10 != Player.mousedOverWidgetIf1) { // L: 9735 - continue; - } - - if (!var10.isIf3) { // L: 9736 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9737 - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { // L: 9738 - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9740 - if (var10.children != null) { // L: 9741 - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9742 - if (var30 != null) { // L: 9743 - class11.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9744 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9746 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9747 - } else if (var10.type == 11) { // L: 9749 - if (class263.isComponentHidden(var10) && var10 != Player.mousedOverWidgetIf1) { // L: 9750 - continue; - } - - if (var10.children != null) { // L: 9751 - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9752 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9753 - } - - if (Client.isResizable || Client.field576[var11] || Client.gameDrawingMode > 1) { // L: 9755 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9756 9757 - class193.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 9759 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 9762 - var19 = 0; // L: 9763 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9764 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9765 - var22 = var12 + var21 * (var10.paddingX + 32); // L: 9766 - var23 = var20 * (var10.paddingY + 32) + var13; // L: 9767 - if (var19 < 20) { // L: 9768 - var22 += var10.inventoryXOffsets[var19]; // L: 9769 - var23 += var10.inventoryYOffsets[var19]; // L: 9770 - } - - if (var10.itemIds[var19] <= 0) { // L: 9772 - if (var10.inventorySprites != null && var19 < 20) { // L: 9817 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 9818 - if (var46 != null) { // L: 9819 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field3368) { // L: 9820 - class290.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 9773 - boolean var38 = false; // L: 9774 - var26 = var10.itemIds[var19] - 1; // L: 9775 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == FloorDecoration.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9776 - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == class19.selectedItemSlot && var10.id == PendingSpawn.selectedItemWidget) { // L: 9778 - var35 = WorldMapCacheName.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = WorldMapCacheName.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9779 - } - - if (var35 != null) { // L: 9780 - if (var10 == FloorDecoration.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9781 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9782 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9783 - if (var24 < 5 && var24 > -5) { // L: 9784 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 9785 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 9786 - var24 = 0; // L: 9787 - var25 = 0; // L: 9788 - } - - var35.drawTransAt(var24 + var22, var25 + var23, 128); // L: 9790 - if (var1 != -1) { // L: 9791 - Widget var28 = var0[var1 & 65535]; // L: 9792 - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9793 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field550 / 3; // L: 9794 - if (var29 > Client.field550 * 10) { // L: 9795 - var29 = Client.field550 * 10; - } - - if (var29 > var28.scrollY) { // L: 9796 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 9797 - Client.draggedWidgetY += var29; // L: 9798 - class290.invalidateWidget(var28); // L: 9799 - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9801 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field550 / 3; // L: 9802 - if (var29 > Client.field550 * 10) { // L: 9803 - var29 = Client.field550 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9804 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 9805 - Client.draggedWidgetY -= var29; // L: 9806 - class290.invalidateWidget(var28); // L: 9807 - } - } - } else if (var10 == class12.field64 && var19 == Client.field741) { // L: 9811 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 9812 - } - } else { - class290.invalidateWidget(var10); // L: 9814 - } - } - } - - ++var19; // L: 9822 - } - } - } else if (var10.type == 3) { // L: 9827 - if (PacketWriter.runCs1(var10)) { // L: 9829 - var19 = var10.color2; // L: 9830 - if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9831 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 9834 - if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9835 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 9837 - switch(var10.fillMode.field4696) { // L: 9838 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9847 - break; // L: 9848 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9840 - break; // L: 9841 - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); // L: 9843 - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9844 - } - } - } else if (var14 == 0) { // L: 9852 - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9853 - } - } else { - Font var39; - if (var10.type == 4) { // L: 9857 - var39 = var10.getFont(); // L: 9858 - if (var39 == null) { // L: 9859 - if (Widget.field3368) { // L: 9860 - class290.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 9864 - if (PacketWriter.runCs1(var10)) { // L: 9865 - var20 = var10.color2; // L: 9866 - if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9867 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 9868 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 9871 - if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9872 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 9874 - ItemComposition var45 = class67.ItemDefinition_get(var10.itemId); // L: 9875 - var44 = var45.name; // L: 9876 - if (var44 == null) { // L: 9877 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9878 - var44 = ChatChannel.colorStartTag(16748608) + var44 + "" + " " + 'x' + GrandExchangeOfferTotalQuantityComparator.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 9880 - var44 = "Please wait..."; // L: 9881 - var20 = var10.color; // L: 9882 - } - - if (!var10.isIf3) { // L: 9884 - var44 = class11.method114(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9885 - } - } else if (var10.type == 5) { // L: 9888 - SpritePixels var40; - if (!var10.isIf3) { // L: 9889 - var40 = var10.getSprite(PacketWriter.runCs1(var10), UserComparator9.urlRequester); // L: 9890 - if (var40 != null) { // L: 9891 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field3368) { // L: 9892 - class290.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 9896 - var40 = WorldMapCacheName.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false, UserComparator9.urlRequester); // L: 9897 - } - - if (var40 == null) { // L: 9898 - if (Widget.field3368) { // L: 9922 - class290.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 9899 - var21 = var40.height; // L: 9900 - if (!var10.spriteTiling) { // L: 9901 - var22 = var10.width * 4096 / var20; // L: 9915 - if (var10.spriteAngle != 0) { // L: 9916 - var40.method8207(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 9917 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 9918 - var40.drawTransBgAt(var12, var13); // L: 9919 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9902 - var22 = (var20 - 1 + var10.width) / var20; // L: 9903 - var23 = (var21 - 1 + var10.height) / var21; // L: 9904 - - for (var24 = 0; var24 < var22; ++var24) { // L: 9905 - for (var25 = 0; var25 < var23; ++var25) { // L: 9906 - if (var10.spriteAngle != 0) { // L: 9907 - var40.method8207(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 9908 - var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); // L: 9909 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9912 - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { // L: 9926 - boolean var36 = PacketWriter.runCs1(var10); // L: 9927 - if (var36) { // L: 9929 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 9930 - } - - Model var41 = null; // L: 9931 - var22 = 0; // L: 9932 - if (var10.itemId != -1) { // L: 9933 - var33 = class67.ItemDefinition_get(var10.itemId); // L: 9934 - if (var33 != null) { // L: 9935 - var33 = var33.getCountObj(var10.itemQuantity); // L: 9936 - var41 = var33.getModel(1); // L: 9937 - if (var41 != null) { // L: 9938 - var41.calculateBoundsCylinder(); // L: 9939 - var22 = var41.height / 2; // L: 9940 - } else { - class290.invalidateWidget(var10); // L: 9942 - } - } - } else if (var10.modelType == 5) { // L: 9945 - if (var10.modelId == 0) { // L: 9946 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class19.localPlayer.getModel(); // L: 9947 - } - } else if (var20 == -1) { // L: 9949 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class19.localPlayer.appearance); // L: 9950 - if (var41 == null && Widget.field3368) { // L: 9951 - class290.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = ItemContainer.SequenceDefinition_get(var20); // L: 9954 - var41 = var10.getModel(var47, var10.modelFrame, var36, class19.localPlayer.appearance); // L: 9955 - if (var41 == null && Widget.field3368) { // L: 9956 - class290.invalidateWidget(var10); - } - } - - Rasterizer3D.method3997(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9958 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9959 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9960 - if (var41 != null) { // L: 9961 - if (!var10.isIf3) { // L: 9962 - var41.method4376(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 9964 - if (var10.modelOrthog) { // L: 9965 - var41.method4366(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method4376(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9966 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 9969 - } else { - if (var10.type == 7) { // L: 9972 - var39 = var10.getFont(); // L: 9973 - if (var39 == null) { // L: 9974 - if (Widget.field3368) { // L: 9975 - class290.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 9978 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9979 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9980 - if (var10.itemIds[var20] > 0) { // L: 9981 - var33 = class67.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9982 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9984 - var34 = ChatChannel.colorStartTag(16748608) + var33.name + ""; // L: 9985 - } else { - var34 = ChatChannel.colorStartTag(16748608) + var33.name + "" + " " + 'x' + GrandExchangeOfferTotalQuantityComparator.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; // L: 9986 - var26 = (var10.paddingY + 12) * var21 + var13; // L: 9987 - if (var10.textXAlignment == 0) { // L: 9988 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 9989 - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9990 - } - } - - ++var20; // L: 9992 - } - } - } - - if (var10.type == 8 && var10 == class160.field1750 && Client.field641 == Client.field642) { // L: 9996 9997 - var19 = 0; // L: 9998 - var20 = 0; // L: 9999 - Font var31 = ViewportMouse.fontPlain12; // L: 10000 - String var32 = var10.text; // L: 10001 - - String var43; - for (var32 = class11.method114(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10003 10004 10016 - var24 = var32.indexOf("
"); // L: 10005 - if (var24 != -1) { // L: 10006 - var43 = var32.substring(0, var24); // L: 10007 - var32 = var32.substring(var24 + 4); // L: 10008 - } else { - var43 = var32; // L: 10011 - var32 = ""; // L: 10012 - } - - var25 = var31.stringWidth(var43); // L: 10014 - if (var25 > var19) { // L: 10015 - var19 = var25; - } - } - - var19 += 6; // L: 10018 - var20 += 7; // L: 10019 - var24 = var12 + var10.width - 5 - var19; // L: 10020 - var25 = var13 + var10.height + 5; // L: 10021 - if (var24 < var12 + 5) { // L: 10022 - var24 = var12 + 5; - } - - if (var19 + var24 > var4) { // L: 10023 - var24 = var4 - var19; - } - - if (var25 + var20 > var5) { // L: 10024 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10025 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10026 - var32 = var10.text; // L: 10027 - var26 = var25 + var31.ascent + 2; // L: 10028 - - for (var32 = class11.method114(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10029 10030 10041 - int var27 = var32.indexOf("
"); // L: 10031 - if (var27 != -1) { // L: 10032 - var43 = var32.substring(0, var27); // L: 10033 - var32 = var32.substring(var27 + 4); // L: 10034 - } else { - var43 = var32; // L: 10037 - var32 = ""; // L: 10038 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10040 - } - } - - if (var10.type == 9) { // L: 10045 - if (var10.field3491) { // L: 10050 - var19 = var12; // L: 10051 - var20 = var13 + var10.height; // L: 10052 - var21 = var12 + var10.width; // L: 10053 - var22 = var13; // L: 10054 - } else { - var19 = var12; // L: 10057 - var20 = var13; // L: 10058 - var21 = var12 + var10.width; // L: 10059 - var22 = var13 + var10.height; // L: 10060 - } - - if (var10.lineWid == 1) { // L: 10062 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10063 - } else { - class127.method2827(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10066 - } - } - } - } - } - } - } - } - } - } - } - - } // L: 10071 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 6f10e747c6..eab0d19ca5 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,111 +1,540 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.ArrayList; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bf") +@ObfuscatedName("bg") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("uu") - @ObfuscatedSignature( - descriptor = "Lcv;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("l") + @ObfuscatedName("rm") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("b") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; @ObfuscatedName("n") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("r") + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -264358279 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("o") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1239743013 + intValue = -552565383 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lbt;" + descriptor = "[Lbl;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("a") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lky;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("g") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; @ObfuscatedName("y") - static boolean field837; - @ObfuscatedName("z") - static boolean field838; + static boolean field841; + @ObfuscatedName("j") + static boolean field842; @ObfuscatedName("e") - static ArrayList field839; - @ObfuscatedName("t") + static ArrayList field843; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1884784675 + intValue = 1021880361 ) - static int field827; - @ObfuscatedName("ay") - static final double field842; - @ObfuscatedName("cw") + static int field844; + @ObfuscatedName("aw") + static final double field845; + @ObfuscatedName("nh") @ObfuscatedSignature( - descriptor = "Lqx;" + descriptor = "Lba;" ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; + @Export("tempMenuAction") + static MenuAction tempMenuAction; static { - Interpreter_arrayLengths = new int[5]; - Interpreter_arrays = new int[5][5000]; - Interpreter_intStack = new int[1000]; + Interpreter_arrayLengths = new int[5]; // L: 75 + Interpreter_arrays = new int[5][5000]; // L: 76 + Interpreter_intStack = new int[1000]; // L: 77 Interpreter_stringStack = new String[1000]; // L: 79 Interpreter_frameDepth = 0; // L: 81 Interpreter_frames = new ScriptFrame[50]; // L: 82 Interpreter_calendar = java.util.Calendar.getInstance(); // L: 88 Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 91 - field837 = false; // L: 94 - field838 = false; // L: 95 - field839 = new ArrayList(); // L: 96 - field827 = 0; // L: 97 - field842 = Math.log(2.0D); // L: 101 + field841 = false; // L: 94 + field842 = false; // L: 95 + field843 = new ArrayList(); // L: 96 + field844 = 0; // L: 97 + field845 = Math.log(2.0D); // L: 101 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "8" + descriptor = "([BB)Lqi;", + garbageValue = "-84" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; // L: 63 - int[] var3 = new int[4]; // L: 64 - var2[0] = var0; // L: 65 - var3[0] = var1; // L: 66 - int var4 = 1; // L: 67 + public static final SpritePixels method1889(byte[] var0) { + BufferedImage var1 = null; - for (int var5 = 0; var5 < 4; ++var5) { // L: 68 - if (World.World_sortOption1[var5] != var0) { // L: 69 - var2[var4] = World.World_sortOption1[var5]; // L: 70 - var3[var4] = World.World_sortOption2[var5]; // L: 71 - ++var4; // L: 72 - } + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[var2 * var3]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new SpritePixels(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 } - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - WorldMapDecorationType.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 + return new SpritePixels(0, 0); // L: 32 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BI)Lhn;", + garbageValue = "-1771552883" + ) + static WorldMapSprite method1798(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(method1889(var0).pixels); // L: 19 20 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lch;III)V", + garbageValue = "-1891697067" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 112 + Script var4; + int var20; + if (class17.isWorldMapEvent(var0.type)) { // L: 114 + SpotAnimationDefinition.worldMapEvent = (WorldMapEvent)var3[0]; // L: 115 + WorldMapElement var5 = UserComparator7.WorldMapElement_get(SpotAnimationDefinition.worldMapEvent.mapElement); // L: 116 + var4 = GameObject.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 117 + } else { + var20 = (Integer)var3[0]; // L: 120 + var4 = ClanChannel.getScript(var20); // L: 121 + } + + if (var4 != null) { // L: 123 + Interpreter_intStackSize = 0; // L: 126 + class122.Interpreter_stringStackSize = 0; // L: 127 + var20 = -1; // L: 128 + int[] var6 = var4.opcodes; // L: 129 + int[] var7 = var4.intOperands; // L: 130 + byte var8 = -1; // L: 131 + Interpreter_frameDepth = 0; // L: 132 + field841 = false; // L: 133 + boolean var9 = false; // L: 134 + int var10 = 0; // L: 135 + boolean var30 = false; + + label950: { + label951: { + try { + int var13; + try { + var30 = true; // L: 137 + GrandExchangeOfferNameComparator.Interpreter_intLocals = new int[var4.localIntCount]; // L: 138 + int var11 = 0; // L: 139 + Interpreter_stringLocals = new String[var4.localStringCount]; // L: 140 + int var12 = 0; + + int var14; + String var21; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 141 + if (var3[var13] instanceof Integer) { // L: 142 + var14 = (Integer)var3[var13]; // L: 143 + if (var14 == -2147483647) { // L: 144 + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { // L: 145 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 146 + var14 = var0.widget != null ? var0.widget.id * 1389111653 * 785571949 : -1; + } + + if (var14 == -2147483644) { // L: 147 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 148 + var14 = var0.widget != null ? var0.widget.childIndex * -1989091849 * -1317080121 : -1; + } + + if (var14 == -2147483642) { // L: 149 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 1389111653 * 785571949 : -1; + } + + if (var14 == -2147483641) { // L: 150 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1989091849 * -1317080121 : -1; + } + + if (var14 == -2147483640) { // L: 151 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 152 + var14 = var0.keyPressed; + } + + GrandExchangeOfferNameComparator.Interpreter_intLocals[var11++] = var14; // L: 153 + } else if (var3[var13] instanceof String) { // L: 155 + var21 = (String)var3[var13]; // L: 156 + if (var21.equals("event_opbase")) { // L: 157 + var21 = var0.targetName; + } + + Interpreter_stringLocals[var12++] = var21; // L: 158 + } + } + + field844 = var0.field1031; // L: 162 + + while (true) { + ++var10; // L: 164 + if (var10 > var1) { // L: 165 + throw new RuntimeException(); + } + + ++var20; // L: 166 + int var33 = var6[var20]; + if (var33 >= 100) { // L: 167 + boolean var35; + if (var4.intOperands[var20] == 1) { // L: 385 + var35 = true; + } else { + var35 = false; // L: 386 + } + + var14 = MouseHandler.method613(var33, var4, var35); // L: 387 + switch(var14) { // L: 388 + case 0: + var30 = false; + break label951; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 395 + } + } else if (var33 == 0) { // L: 168 + Interpreter_intStack[++Interpreter_intStackSize - 1] = var7[var20]; // L: 169 + } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 172 + var13 = var7[var20]; // L: 173 + Interpreter_intStack[++Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 174 + } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 177 + var13 = var7[var20]; // L: 178 + Varps.Varps_main[var13] = Interpreter_intStack[--Interpreter_intStackSize]; // L: 179 + WorldMapLabel.changeGameOptions(var13); // L: 180 + } else if (var33 == ScriptOpcodes.SCONST) { // L: 183 + Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 184 + } else if (var33 == ScriptOpcodes.JUMP) { // L: 187 + var20 += var7[var20]; // L: 188 + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 191 + Interpreter_intStackSize -= 2; // L: 192 + if (Interpreter_intStack[Interpreter_intStackSize] != Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 193 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 196 + Interpreter_intStackSize -= 2; // L: 197 + if (Interpreter_intStack[Interpreter_intStackSize] == Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 198 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 201 + Interpreter_intStackSize -= 2; // L: 202 + if (Interpreter_intStack[Interpreter_intStackSize] < Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 203 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 206 + Interpreter_intStackSize -= 2; // L: 207 + if (Interpreter_intStack[Interpreter_intStackSize] > Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 208 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.RETURN) { // L: 211 + if (Interpreter_frameDepth == 0) { // L: 212 + var30 = false; + break label950; + } + + ScriptFrame var40 = Interpreter_frames[--Interpreter_frameDepth]; // L: 213 + var4 = var40.script; // L: 214 + var6 = var4.opcodes; // L: 215 + var7 = var4.intOperands; // L: 216 + var20 = var40.pc; // L: 217 + GrandExchangeOfferNameComparator.Interpreter_intLocals = var40.intLocals; // L: 218 + Interpreter_stringLocals = var40.stringLocals; // L: 219 + } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 222 + var13 = var7[var20]; // L: 223 + Interpreter_intStack[++Interpreter_intStackSize - 1] = SecureRandomCallable.getVarbit(var13); // L: 224 + } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 227 + var13 = var7[var20]; // L: 228 + Renderable.method4926(var13, Interpreter_intStack[--Interpreter_intStackSize]); // L: 229 + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 232 + Interpreter_intStackSize -= 2; // L: 233 + if (Interpreter_intStack[Interpreter_intStackSize] <= Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 234 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 237 + Interpreter_intStackSize -= 2; // L: 238 + if (Interpreter_intStack[Interpreter_intStackSize] >= Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 239 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.ILOAD) { // L: 242 + Interpreter_intStack[++Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.Interpreter_intLocals[var7[var20]]; // L: 243 + } else if (var33 == ScriptOpcodes.ISTORE) { // L: 246 + GrandExchangeOfferNameComparator.Interpreter_intLocals[var7[var20]] = Interpreter_intStack[--Interpreter_intStackSize]; // L: 247 + } else if (var33 == ScriptOpcodes.SLOAD) { // L: 250 + Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Interpreter_stringLocals[var7[var20]]; // L: 251 + } else if (var33 == ScriptOpcodes.SSTORE) { // L: 254 + Interpreter_stringLocals[var7[var20]] = Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 255 + } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 258 + var13 = var7[var20]; // L: 259 + class122.Interpreter_stringStackSize -= var13; // L: 260 + var21 = StudioGame.method5780(Interpreter_stringStack, class122.Interpreter_stringStackSize, var13); // L: 261 + Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var21; // L: 262 + } else if (var33 == ScriptOpcodes.POP_INT) { // L: 265 + --Interpreter_intStackSize; // L: 266 + } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 269 + --class122.Interpreter_stringStackSize; // L: 270 + } else { + int var17; + if (var33 != ScriptOpcodes.INVOKE) { // L: 273 + if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 296 + Interpreter_intStack[++Interpreter_intStackSize - 1] = class160.varcs.getInt(var7[var20]); // L: 297 + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 300 + class160.varcs.setInt(var7[var20], Interpreter_intStack[--Interpreter_intStackSize]); // L: 301 + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 304 + var13 = var7[var20] >> 16; // L: 305 + var14 = var7[var20] & 65535; // L: 306 + int var24 = Interpreter_intStack[--Interpreter_intStackSize]; // L: 307 + if (var24 < 0 || var24 > 5000) { // L: 308 + throw new RuntimeException(); // L: 309 + } + + Interpreter_arrayLengths[var13] = var24; // L: 311 + byte var25 = -1; // L: 312 + if (var14 == 105) { // L: 313 + var25 = 0; + } + + for (var17 = 0; var17 < var24; ++var17) { // L: 314 + Interpreter_arrays[var13][var17] = var25; + } + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 317 + var13 = var7[var20]; // L: 318 + var14 = Interpreter_intStack[--Interpreter_intStackSize]; // L: 319 + if (var14 < 0 || var14 >= Interpreter_arrayLengths[var13]) { // L: 320 + throw new RuntimeException(); // L: 321 + } + + Interpreter_intStack[++Interpreter_intStackSize - 1] = Interpreter_arrays[var13][var14]; // L: 323 + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 326 + var13 = var7[var20]; // L: 327 + Interpreter_intStackSize -= 2; // L: 328 + var14 = Interpreter_intStack[Interpreter_intStackSize]; // L: 329 + if (var14 < 0 || var14 >= Interpreter_arrayLengths[var13]) { // L: 330 + throw new RuntimeException(); // L: 331 + } + + Interpreter_arrays[var13][var14] = Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 333 + } else { + String var22; + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 336 + var22 = class160.varcs.getStringOld(var7[var20]); // L: 337 + if (var22 == null) { // L: 338 + var22 = "null"; + } + + Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var22; // L: 339 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 342 + class160.varcs.setStringOld(var7[var20], Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 343 + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 346 + var22 = class160.varcs.getString(var7[var20]); // L: 347 + Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var22; // L: 348 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 351 + class160.varcs.setString(var7[var20], Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 352 + } else if (var33 == ScriptOpcodes.SWITCH) { // L: 355 + IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 356 + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter_intStack[--Interpreter_intStackSize]); // L: 357 + if (var37 != null) { // L: 358 + var20 += var37.integer; + } + } else { + Integer var39; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 361 + var39 = Calendar.field3269.getTitleGroupValue(var7[var20]); // L: 362 + if (var39 == null) { // L: 363 + Interpreter_intStack[++Interpreter_intStackSize - 1] = -1; // L: 364 + } else { + Interpreter_intStack[++Interpreter_intStackSize - 1] = var39; // L: 367 + } + } else { + if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 371 + throw new IllegalStateException(); // L: 381 + } + + var39 = HorizontalAlignment.field1885.method7105(var7[var20]); // L: 372 + if (var39 == null) { // L: 373 + Interpreter_intStack[++Interpreter_intStackSize - 1] = -1; // L: 374 + } else { + Interpreter_intStack[++Interpreter_intStackSize - 1] = var39; // L: 377 + } + } + } + } + } else { + var13 = var7[var20]; // L: 274 + Script var36 = ClanChannel.getScript(var13); // L: 275 + int[] var15 = new int[var36.localIntCount]; // L: 276 + String[] var16 = new String[var36.localStringCount]; // L: 277 + + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 278 + var15[var17] = Interpreter_intStack[var17 + (Interpreter_intStackSize - var36.intArgumentCount)]; + } + + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 279 + var16[var17] = Interpreter_stringStack[var17 + (class122.Interpreter_stringStackSize - var36.stringArgumentCount)]; + } + + Interpreter_intStackSize -= var36.intArgumentCount; // L: 280 + class122.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 281 + ScriptFrame var23 = new ScriptFrame(); // L: 282 + var23.script = var4; // L: 283 + var23.pc = var20; // L: 284 + var23.intLocals = GrandExchangeOfferNameComparator.Interpreter_intLocals; // L: 285 + var23.stringLocals = Interpreter_stringLocals; // L: 286 + Interpreter_frames[++Interpreter_frameDepth - 1] = var23; // L: 287 + var4 = var36; // L: 288 + var6 = var36.opcodes; // L: 289 + var7 = var36.intOperands; // L: 290 + var20 = -1; // L: 291 + GrandExchangeOfferNameComparator.Interpreter_intLocals = var15; // L: 292 + Interpreter_stringLocals = var16; // L: 293 + } + } + } + } catch (Exception var31) { // L: 401 + var9 = true; // L: 402 + StringBuilder var27 = new StringBuilder(30); // L: 404 + var27.append("").append(var4.key).append(" "); // L: 405 + var13 = Interpreter_frameDepth - 1; // L: 406 + + while (true) { + if (var13 < 0) { + var27.append("").append(var8); // L: 407 + Widget.RunException_sendStackTrace(var27.toString(), var31); // L: 408 + var30 = false; + break; + } + + var27.append("").append(Interpreter_frames[var13].script.key).append(" "); + --var13; + } + } + } finally { + if (var30) { + while (field843.size() > 0) { + class93 var19 = (class93)field843.remove(0); // L: 413 + WorldMapLabelSize.widgetDefaultMenuAction(var19.method2370(), var19.method2380(), var19.method2372(), var19.method2373(), ""); + } + + if (field841) { // L: 416 + field841 = false; // L: 417 + class20.method294(); // L: 418 + } + + if (!var9 && var2 > 0 && var10 >= var2) { + Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + + while (field843.size() > 0) { // L: 412 + class93 var26 = (class93)field843.remove(0); + WorldMapLabelSize.widgetDefaultMenuAction(var26.method2370(), var26.method2380(), var26.method2372(), var26.method2373(), ""); + } + + if (field841) { + field841 = false; + class20.method294(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; // L: 424 + } + + while (field843.size() > 0) { + class93 var34 = (class93)field843.remove(0); + WorldMapLabelSize.widgetDefaultMenuAction(var34.method2370(), var34.method2380(), var34.method2372(), var34.method2373(), ""); // L: 414 + } + + if (field841) { + field841 = false; + class20.method294(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { // L: 420 + Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 421 + } + + return; + } + + while (field843.size() > 0) { + class93 var41 = (class93)field843.remove(0); + WorldMapLabelSize.widgetDefaultMenuAction(var41.method2370(), var41.method2380(), var41.method2372(), var41.method2373(), ""); + } + + if (field841) { + field841 = false; + class20.method294(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } // L: 124 } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index dad7454fb7..d8ac0a147e 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -4,29 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fl") @Implements("InvDefinition") public class InvDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - static IndexedSprite field1814; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 502676217 + intValue = -93299941 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 852719865 ) @Export("size") public int size; @@ -39,10 +46,10 @@ public class InvDefinition extends DualNode { this.size = 0; // L: 12 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-119" + descriptor = "(Lpi;I)V", + garbageValue = "1907022215" ) @Export("decode") void decode(Buffer var1) { @@ -56,10 +63,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "3" + descriptor = "(Lpi;II)V", + garbageValue = "83857260" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -68,46 +75,4 @@ public class InvDefinition extends DualNode { } } // L: 41 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "302508640" - ) - static final int method3334(int var0, int var1) { - if (var0 == -2) { // L: 1021 - return 12345678; - } else if (var0 == -1) { // L: 1022 - if (var1 < 2) { // L: 1023 - var1 = 2; - } else if (var1 > 126) { // L: 1024 - var1 = 126; - } - - return var1; // L: 1025 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 1027 - if (var1 < 2) { // L: 1028 - var1 = 2; - } else if (var1 > 126) { // L: 1029 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 1030 - } - } - - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(Lkn;S)Ljava/lang/String;", - garbageValue = "13721" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var0)) == 0) { // L: 11807 - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11808 11809 11811 - } - } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index f619e0adf7..728e3da149 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("qo") +@ObfuscatedName("qv") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 199959097 + intValue = -1838109149 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("results") int[] results; @ObfuscatedName("n") @Export("mm") int[] mm; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2008572503 + intValue = 2051010735 ) @Export("aa") int aa; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1933722691 + intValue = 1769663053 ) @Export("bb") int bb; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -429317105 + intValue = 742763113 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; // L: 18 } - this.method8332(); // L: 20 + this.method8226(); // L: 20 } // L: 21 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-63" + descriptor = "(I)I", + garbageValue = "2059570032" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-271911971" ) - public final int method8330() { + public final int method8224() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1764147348" + garbageValue = "-994226167" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,12 +109,12 @@ public final class IsaacCipher { } // L: 58 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "78" + garbageValue = "10" ) - final void method8332() { + final void method8226() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index ee5da37a5e..0c1b8a76ca 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -4,273 +4,286 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gf") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("r") + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1304511159 + ) + static int field2076; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ItemDefinition_cached") public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ItemDefinition_cachedModels") public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("j") + @ObfuscatedName("ci") + public static char field2121; + @ObfuscatedName("mo") @ObfuscatedGetter( - intValue = -1424786403 + intValue = 879723765 + ) + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1358562449 ) @Export("id") public int id; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1291049625 + intValue = 1795914843 ) @Export("model") int model; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("name") public String name; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1089547483 + intValue = 196878577 ) @Export("zoom2d") public int zoom2d; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2132200919 + intValue = -665001803 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 414158331 + intValue = -2086760217 ) @Export("yan2d") public int yan2d; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1333380267 + intValue = 273423951 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -23856347 + intValue = 371108815 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1059420037 + intValue = -1462314207 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -255409775 + intValue = 1832984021 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1263710905 + intValue = -152346525 ) @Export("price") public int price; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("at") + @ObfuscatedName("ak") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1456259873 + intValue = -822939591 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1418259267 + intValue = 378265163 ) @Export("maleModel") int maleModel; - @ObfuscatedName("ab") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -743899863 + intValue = -1588045303 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1028842285 + intValue = 570767097 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2010302793 + intValue = -950675371 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 2125070369 + intValue = 1339664031 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -347919981 + intValue = -1567941563 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1552154783 + intValue = 707810015 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1453565087 + intValue = 1223715049 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -825371741 + intValue = -1614579943 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1673807591 + intValue = -880790519 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -237546465 + intValue = 1611595155 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1334231601 + intValue = -112485395 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("al") + @ObfuscatedName("ai") @Export("countobj") int[] countobj; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("countco") int[] countco; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1260944307 + intValue = 1339927085 ) @Export("note") public int note; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1173128683 + intValue = -1457384295 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("af") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -960009279 + intValue = 533172981 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ap") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 660120769 + intValue = -696696217 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1619595717 + intValue = -2002126289 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bk") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1280760379 + intValue = -999686443 ) @Export("ambient") public int ambient; - @ObfuscatedName("bz") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -653241173 + intValue = -606259097 ) @Export("contrast") public int contrast; - @ObfuscatedName("bl") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1399712671 + intValue = 1632999251 ) @Export("team") public int team; - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("ba") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 2142919937 + intValue = 815357649 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -97110731 + intValue = 715906289 ) @Export("notedId") int notedId; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 511512867 + intValue = -1861125713 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("br") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -399396833 + intValue = 1550899901 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -294,8 +307,8 @@ public class ItemComposition extends DualNode { this.isMembersOnly = false; // L: 47 this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48 this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49 - this.shiftClickIndex = -2; - this.maleModel = -1; + this.shiftClickIndex = -2; // L: 51 + this.maleModel = -1; // L: 52 this.maleModel1 = -1; // L: 53 this.maleOffset = 0; // L: 54 this.femaleModel = -1; // L: 55 @@ -322,19 +335,19 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; // L: 79 } // L: 81 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-40965747" + garbageValue = "1176456710" ) @Export("post") void post() { } // L: 129 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-2138867228" + descriptor = "(Lpi;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { @@ -348,10 +361,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-1448342708" + descriptor = "(Lpi;II)V", + garbageValue = "-46032280" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -473,58 +486,58 @@ public class ItemComposition extends DualNode { this.placeholder = var1.readUnsignedShort(); } else if (var2 == 149) { // L: 225 this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 226 - this.params = NetFileRequest.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { + this.params = class214.readStringIntParameters(var1, this.params); } } - } // L: 228 + } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lgz;Lgz;I)V", - garbageValue = "2121998029" + descriptor = "(Lgf;Lgf;B)V", + garbageValue = "8" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 231 - this.zoom2d = var1.zoom2d; // L: 232 - this.xan2d = var1.xan2d; // L: 233 - this.yan2d = var1.yan2d; // L: 234 + this.model = var1.model; + this.zoom2d = var1.zoom2d; + this.xan2d = var1.xan2d; + this.yan2d = var1.yan2d; this.zan2d = var1.zan2d; // L: 235 - this.offsetX2d = var1.offsetX2d; // L: 236 - this.offsetY2d = var1.offsetY2d; // L: 237 - this.recolorFrom = var1.recolorFrom; // L: 238 - this.recolorTo = var1.recolorTo; // L: 239 - this.retextureFrom = var1.retextureFrom; // L: 240 - this.retextureTo = var1.retextureTo; // L: 241 - this.name = var2.name; // L: 242 - this.isMembersOnly = var2.isMembersOnly; // L: 243 - this.price = var2.price; // L: 244 - this.isStackable = 1; // L: 245 - } // L: 246 + this.offsetX2d = var1.offsetX2d; + this.offsetY2d = var1.offsetY2d; + this.recolorFrom = var1.recolorFrom; + this.recolorTo = var1.recolorTo; + this.retextureFrom = var1.retextureFrom; + this.retextureTo = var1.retextureTo; + this.name = var2.name; + this.isMembersOnly = var2.isMembersOnly; + this.price = var2.price; + this.isStackable = 1; + } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgz;Lgz;I)V", - garbageValue = "1223500684" + descriptor = "(Lgf;Lgf;I)V", + garbageValue = "-1718664847" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 249 - this.zoom2d = var1.zoom2d; // L: 250 - this.xan2d = var1.xan2d; // L: 251 - this.yan2d = var1.yan2d; // L: 252 - this.zan2d = var1.zan2d; // L: 253 - this.offsetX2d = var1.offsetX2d; // L: 254 - this.offsetY2d = var1.offsetY2d; // L: 255 + this.model = var1.model; + this.zoom2d = var1.zoom2d; + this.xan2d = var1.xan2d; + this.yan2d = var1.yan2d; + this.zan2d = var1.zan2d; + this.offsetX2d = var1.offsetX2d; + this.offsetY2d = var1.offsetY2d; this.recolorFrom = var2.recolorFrom; // L: 256 - this.recolorTo = var2.recolorTo; // L: 257 + this.recolorTo = var2.recolorTo; this.retextureFrom = var2.retextureFrom; // L: 258 this.retextureTo = var2.retextureTo; // L: 259 this.name = var2.name; // L: 260 this.isMembersOnly = var2.isMembersOnly; // L: 261 - this.isStackable = var2.isStackable; // L: 262 + this.isStackable = var2.isStackable; this.maleModel = var2.maleModel; // L: 263 this.maleModel1 = var2.maleModel1; // L: 264 this.maleModel2 = var2.maleModel2; // L: 265 @@ -548,10 +561,10 @@ public class ItemComposition extends DualNode { this.price = 0; // L: 278 } // L: 279 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgz;Lgz;I)V", - garbageValue = "312351702" + descriptor = "(Lgf;Lgf;B)V", + garbageValue = "72" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { @@ -573,10 +586,10 @@ public class ItemComposition extends DualNode { this.isTradable = false; // L: 297 } // L: 298 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)Lgt;", - garbageValue = "0" + descriptor = "(IB)Lhc;", + garbageValue = "-88" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -591,11 +604,11 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { // L: 306 - return class67.ItemDefinition_get(var2).getModelData(1); + return class19.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, this.model, 0); // L: 308 + ModelData var4 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, this.model, 0); // L: 308 if (var4 == null) { // L: 309 return null; } else { @@ -619,10 +632,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lhx;", - garbageValue = "-63" + descriptor = "(II)Liq;", + garbageValue = "973895006" ) @Export("getModel") public final Model getModel(int var1) { @@ -636,7 +649,7 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { // L: 330 - return class67.ItemDefinition_get(var2).getModel(1); + return class19.ItemDefinition_get(var2).getModel(1); } } @@ -644,7 +657,7 @@ public class ItemComposition extends DualNode { if (var5 != null) { // L: 333 return var5; } else { - ModelData var6 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, this.model, 0); // L: 334 + ModelData var6 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, this.model, 0); // L: 334 if (var6 == null) { // L: 335 return null; } else { @@ -673,10 +686,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)Lgz;", - garbageValue = "-275581318" + descriptor = "(II)Lgf;", + garbageValue = "215636085" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { @@ -684,23 +697,23 @@ public class ItemComposition extends DualNode { int var2 = -1; // L: 355 for (int var3 = 0; var3 < 10; ++var3) { // L: 356 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; // L: 357 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 357 + var2 = this.countobj[var3]; } } if (var2 != -1) { // L: 359 - return class67.ItemDefinition_get(var2); + return class19.ItemDefinition_get(var2); } } return this; // L: 361 } - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-1169753555" + garbageValue = "-480177998" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -717,15 +730,15 @@ public class ItemComposition extends DualNode { return true; } else { boolean var5 = true; // L: 455 - if (!GameEngine.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 456 + if (!AttackOption.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 456 var5 = false; } - if (var3 != -1 && !GameEngine.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 457 + if (var3 != -1 && !AttackOption.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 457 var5 = false; } - if (var4 != -1 && !GameEngine.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 458 + if (var4 != -1 && !AttackOption.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 458 var5 = false; } @@ -733,12 +746,12 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ZB)Lgt;", - garbageValue = "-116" + descriptor = "(ZI)Lhc;", + garbageValue = "1919870676" ) - public final ModelData method3693(boolean var1) { + public final ModelData method3719(boolean var1) { int var2 = this.maleModel; // L: 463 int var3 = this.maleModel1; // L: 464 int var4 = this.maleModel2; // L: 465 @@ -751,11 +764,11 @@ public class ItemComposition extends DualNode { if (var2 == -1) { // L: 471 return null; } else { - ModelData var5 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var2, 0); // L: 472 + ModelData var5 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var2, 0); // L: 472 if (var3 != -1) { // L: 473 - ModelData var6 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var3, 0); // L: 474 + ModelData var6 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var3, 0); // L: 474 if (var4 != -1) { // L: 475 - ModelData var7 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var4, 0); // L: 476 + ModelData var7 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var4, 0); // L: 476 ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 477 var5 = new ModelData(var8, 3); // L: 478 } else { @@ -789,12 +802,12 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-2071485201" + garbageValue = "1863743835" ) - public final boolean method3748(boolean var1) { + public final boolean method3723(boolean var1) { int var2 = this.maleHeadModel; // L: 501 int var3 = this.maleHeadModel2; // L: 502 if (var1) { // L: 503 @@ -806,11 +819,11 @@ public class ItemComposition extends DualNode { return true; } else { boolean var4 = true; // L: 508 - if (!GameEngine.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 509 + if (!AttackOption.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 509 var4 = false; } - if (var3 != -1 && !GameEngine.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 510 + if (var3 != -1 && !AttackOption.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 510 var4 = false; } @@ -818,12 +831,12 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ZI)Lgt;", - garbageValue = "2006094113" + descriptor = "(ZI)Lhc;", + garbageValue = "-1677053945" ) - public final ModelData method3730(boolean var1) { + public final ModelData method3718(boolean var1) { int var2 = this.maleHeadModel; // L: 515 int var3 = this.maleHeadModel2; // L: 516 if (var1) { // L: 517 @@ -834,9 +847,9 @@ public class ItemComposition extends DualNode { if (var2 == -1) { // L: 521 return null; } else { - ModelData var4 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var2, 0); // L: 522 + ModelData var4 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var2, 0); // L: 522 if (var3 != -1) { // L: 523 - ModelData var5 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var3, 0); // L: 524 + ModelData var5 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var3, 0); // L: 524 ModelData[] var6 = new ModelData[]{var4, var5}; // L: 525 var4 = new ModelData(var6, 2); // L: 526 } @@ -858,193 +871,158 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1671267558" + garbageValue = "-1076899733" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return ClanSettings.method2976(this.params, var1, var2); // L: 542 + IterableNodeHashTable var4 = this.params; // L: 543 + int var3; + if (var4 == null) { // L: 545 + var3 = var2; // L: 546 + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 549 + if (var5 == null) { // L: 550 + var3 = var2; // L: 551 + } else { + var3 = var5.integer; // L: 554 + } + } + + return var3; // L: 556 } - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-464900314" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "20" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class19.method315(this.params, var1, var2); // L: 546 + IterableNodeHashTable var4 = this.params; // L: 561 + String var3; + if (var4 == null) { // L: 563 + var3 = var2; // L: 564 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 567 + if (var5 == null) { // L: 568 + var3 = var2; // L: 569 + } else { + var3 = (String)var5.obj; // L: 572 + } + } + + return var3; // L: 574 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2083279530" + garbageValue = "1009297979" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 550 - if (this.shiftClickIndex >= 0) { // L: 551 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1031307489 * 1456259873 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 578 + if (this.shiftClickIndex >= 0) { // L: 579 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -301597175 * -822939591 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 552 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 580 } } else { return -1; } } + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-340446903" + ) + boolean method3722() { + return this.recolorTo != null; // L: 595 + } + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-872015802" + garbageValue = "1275094150" ) - boolean method3763() { - return this.recolorTo != null; // L: 571 + boolean method3708() { + return this.retextureTo != null; // L: 599 } - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-21" + descriptor = "(III)Lky;", + garbageValue = "1784601570" ) - boolean method3711() { - return this.retextureTo != null; // L: 575 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "183" - ) - public static void method3764(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; // L: 51 - } // L: 52 - - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1435197973" - ) - static void method3751() { - int var0 = Players.Players_count; // L: 4294 - int[] var1 = Players.Players_indices; // L: 4295 - - for (int var2 = 0; var2 < var0; ++var2) { // L: 4296 - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4297 - class166.addPlayerToScene(Client.players[var1[var2]], true); // L: 4298 - } - } - - } // L: 4300 - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(Lcw;I)Z", - garbageValue = "1004876196" - ) - static boolean method3706(Player var0) { - if (Client.drawPlayerNames == 0) { // L: 4438 - return false; + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = class127.getWidget(var0); + if (var1 == -1) { // L: 240 + return var2; } else { - boolean var1; - if (class19.localPlayer != var0) { // L: 4439 - var1 = (Client.drawPlayerNames & 4) != 0; // L: 4442 - boolean var2 = var1 || FloorDecoration.method3981() && var0.isFriend(); // L: 4444 - if (!var2) { // L: 4445 - boolean var3 = (Client.drawPlayerNames & 2) != 0; // L: 4448 - var2 = var3 && var0.isFriendsChatMember(); // L: 4450 - } - - return var2; // L: 4452 - } else { - var1 = (Client.drawPlayerNames & 8) != 0; // L: 4457 - return var1; // L: 4459 - } + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 241 } } - @ObfuscatedName("ju") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "-13" + descriptor = "([BIII)Z", + garbageValue = "796340469" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (MusicPatchNode2.loadInterface(var0)) { // L: 10579 - Varcs.updateInterface(EnumComposition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10580 - } - } // L: 10581 + static final boolean method3771(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 226 + Buffer var4 = new Buffer(var0); // L: 227 + int var5 = -1; // L: 228 - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "([Lkn;II)V", - garbageValue = "-2087809225" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11288 - Widget var3 = var0[var2]; // L: 11289 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class263.isComponentHidden(var3))) { // L: 11290 11291 11292 - int var5; - if (var3.type == 0) { // L: 11293 - if (!var3.isIf3 && class263.isComponentHidden(var3) && var3 != Player.mousedOverWidgetIf1) { // L: 11294 - continue; + label70: + while (true) { + int var6 = var4.method7743(); // L: 230 + if (var6 == 0) { // L: 231 + return var3; // L: 262 + } + + var5 += var6; // L: 232 + int var7 = 0; // L: 233 + boolean var8 = false; // L: 234 + + while (true) { + int var9; + while (!var8) { // L: 236 + var9 = var4.readUShortSmart(); // L: 242 + if (var9 == 0) { // L: 243 + continue label70; } - drawModelComponents(var0, var3.id); // L: 11295 - if (var3.children != null) { // L: 11296 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11297 - if (var4 != null) { // L: 11298 - var5 = var4.group; // L: 11299 - if (MusicPatchNode2.loadInterface(var5)) { // L: 11301 - drawModelComponents(EnumComposition.Widget_interfaceComponents[var5], -1); // L: 11302 - } - } - } - - if (var3.type == 6) { // L: 11306 - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11307 - boolean var7 = PacketWriter.runCs1(var3); // L: 11308 - if (var7) { // L: 11310 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 11311 - } - - if (var5 != -1) { // L: 11312 - SequenceDefinition var6 = ItemContainer.SequenceDefinition_get(var5); // L: 11313 - - for (var3.modelFrameCycle += Client.field550; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class290.invalidateWidget(var3)) { // L: 11314 11315 11322 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11316 - ++var3.modelFrame; // L: 11317 - if (var3.modelFrame >= var6.frameIds.length) { // L: 11318 - var3.modelFrame -= var6.frameCount; // L: 11319 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11320 - var3.modelFrame = 0; - } - } + var7 += var9 - 1; // L: 244 + int var10 = var7 & 63; // L: 245 + int var11 = var7 >> 6 & 63; // L: 246 + int var12 = var4.readUnsignedByte() >> 2; // L: 247 + int var13 = var11 + var1; // L: 248 + int var14 = var10 + var2; // L: 249 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 250 + ObjectComposition var15 = class146.getObjectDefinition(var5); // L: 251 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 252 + if (!var15.needsModelFiles()) { // L: 253 + ++Client.field558; // L: 254 + var3 = false; // L: 255 } + + var8 = true; // L: 257 } } - - if (var3.field3399 != 0 && !var3.isIf3) { // L: 11326 - int var8 = var3.field3399 >> 16; // L: 11327 - var5 = var3.field3399 << 16 >> 16; // L: 11328 - var8 *= Client.field550; // L: 11329 - var5 *= Client.field550; // L: 11330 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11331 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11332 - class290.invalidateWidget(var3); // L: 11333 - } } + + var9 = var4.readUShortSmart(); // L: 237 + if (var9 == 0) { // L: 238 + break; + } + + var4.readUnsignedByte(); // L: 239 } } - - } // L: 11337 + } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index c942f94bdf..e7ae6c2218 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -4,7 +4,7 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bv") @Implements("ItemContainer") public class ItemContainer extends Node { @ObfuscatedName("v") @@ -13,16 +13,24 @@ public class ItemContainer extends Node { ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("fv") + @ObfuscatedName("u") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = -914971527 + intValue = -372452529 ) - @Export("currentPort") - static int currentPort; - @ObfuscatedName("o") + @Export("cameraY") + static int cameraY; + @ObfuscatedName("oo") + @ObfuscatedGetter( + intValue = -922467493 + ) + static int field1013; + @ObfuscatedName("c") @Export("ids") int[] ids; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("quantities") int[] quantities; @@ -34,117 +42,4 @@ public class ItemContainer extends Node { this.ids = new int[]{-1}; // L: 8 this.quantities = new int[]{0}; // L: 9 } // L: 11 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lgg;", - garbageValue = "-1935517540" - ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 46 - if (var1 != null) { // L: 47 - return var1; - } else { - byte[] var2 = class282.SequenceDefinition_archive.takeFile(12, var0); // L: 48 - var1 = new SequenceDefinition(); // L: 49 - if (var2 != null) { // L: 50 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 51 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 52 - return var1; // L: 53 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljn;Lqo;I)Ljt;", - garbageValue = "-1379221264" - ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = class65.method1876(); // L: 27 - var2.clientPacket = var0; // L: 28 - var2.clientPacketLength = var0.length; // L: 29 - if (var2.clientPacketLength == -1) { // L: 30 - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); // L: 31 - } else if (var2.clientPacketLength <= 18) { // L: 32 - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { // L: 33 - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); // L: 34 - } - - var2.packetBuffer.setIsaacCipher(var1); // L: 35 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 - var2.index = 0; // L: 37 - return var2; // L: 38 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lbr;I)V", - garbageValue = "1885731217" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 2045 - Client.isMembersWorld = var0.isMembersOnly(); // L: 2046 - class125.method2803(var0.isMembersOnly()); // L: 2047 - } - - if (var0.properties != Client.worldProperties) { // L: 2049 - Archive var1 = WorldMapData_1.archive8; // L: 2050 - int var2 = var0.properties; // L: 2051 - if ((var2 & 536870912) != 0) { // L: 2053 - HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 2054 - } else if ((var2 & 1073741824) != 0) { // L: 2056 - HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 2057 - } else { - HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 2060 - } - } - - GrandExchangeOfferOwnWorldComparator.worldHost = var0.host; // L: 2064 - Client.worldId = var0.id; // L: 2065 - Client.worldProperties = var0.properties; // L: 2066 - class101.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 2067 - BuddyRankComparator.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 2068 - currentPort = class101.worldPort; // L: 2069 - } // L: 2070 - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2121906754" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4332 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4333 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4334 - int var3 = var2.x >> 7; // L: 4335 - int var4 = var2.y >> 7; // L: 4336 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4337 - if (var2.field1145 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4338 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4339 - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4340 - } - - long var5 = MilliClock.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4342 - var2.playerCycle = Client.cycle; // L: 4343 - FriendSystem.scene.drawEntity(class160.Client_plane, var2.x, var2.y, Archive.getTileHeight(var2.field1145 * 64 - 64 + var2.x, var2.field1145 * 64 - 64 + var2.y, class160.Client_plane), var2.field1145 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4344 - } - } - } - - } // L: 4348 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index 4da3000eb6..1c670c5356 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -3,56 +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("gm") +@ObfuscatedName("hy") @Implements("ItemLayer") public final class ItemLayer { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 448351015 + intValue = -1955718833 ) @Export("z") int z; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 8654035 + intValue = 616317407 ) @Export("x") int x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1684642379 + intValue = -1784777855 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("first") Renderable first; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("second") Renderable second; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("third") Renderable third; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -8144761561564310625L + longValue = -3789512817442359409L ) @Export("tag") long tag; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -87595469 + intValue = -1666880433 ) @Export("height") int height; @@ -60,163 +59,80 @@ public final class ItemLayer { ItemLayer() { } // L: 13 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1559907984" + descriptor = "(IZS)Ljava/lang/String;", + garbageValue = "13756" ) - static int method3896(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 858 - Widget var4; - if (var0 >= 2000) { // L: 860 - var0 -= 1000; // L: 861 - var4 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 862 - var3 = false; // L: 863 - } else { - var4 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 865 - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866 - var11 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] - 1; // L: 867 - if (var11 >= 0 && var11 <= 9) { // L: 868 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 872 - return 1; // L: 873 - } else { - --ChatChannel.Interpreter_stringStackSize; // L: 869 - return 1; // L: 870 - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875 - class295.Interpreter_intStackSize -= 2; // L: 876 - var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 877 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 878 - var4.parent = class143.getWidgetChild(var11, var6); // L: 879 - return 1; // L: 880 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882 - var4.isScrollBar = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 883 - return 1; // L: 884 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 887 - return 1; // L: 888 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890 - var4.dragThreshold = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 891 - return 1; // L: 892 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894 - var4.dataText = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 895 - return 1; // L: 896 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898 - var4.spellActionName = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 899 - return 1; // L: 900 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902 - var4.actions = null; // L: 903 - return 1; // L: 904 - } else if (var0 == 1308) { // L: 906 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 907 - return 1; // L: 908 - } else if (var0 == 1309) { // L: 910 - --class295.Interpreter_intStackSize; // L: 911 - return 1; // L: 912 - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944 - class295.Interpreter_intStackSize -= 2; // L: 945 - var5 = 10; // L: 946 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]}; // L: 947 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]}; // L: 948 - class400.Widget_setKey(var4, var5, var8, var9); // L: 949 - return 1; // L: 950 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952 - class295.Interpreter_intStackSize -= 3; // L: 953 - var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] - 1; // L: 954 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 955 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 956 - if (var11 >= 0 && var11 <= 9) { // L: 957 - class268.Widget_setKeyRate(var4, var11, var6, var7); // L: 960 - return 1; // L: 961 - } else { - throw new RuntimeException(); // L: 958 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963 - var5 = 10; // L: 964 - var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 965 - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 966 - class268.Widget_setKeyRate(var4, var5, var6, var7); // L: 967 - return 1; // L: 968 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970 - --class295.Interpreter_intStackSize; // L: 971 - var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] - 1; // L: 972 - if (var11 >= 0 && var11 <= 9) { // L: 973 - Client.Widget_setKeyIgnoreHeld(var4, var11); // L: 976 - return 1; // L: 977 - } else { - throw new RuntimeException(); // L: 974 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979 - var5 = 10; // L: 980 - Client.Widget_setKeyIgnoreHeld(var4, var5); // L: 981 - return 1; // L: 982 - } else { - return 2; // L: 984 - } - } else { - byte[] var10 = null; // L: 915 - var8 = null; // L: 916 - if (var3) { // L: 917 - class295.Interpreter_intStackSize -= 10; // L: 918 - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class295.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921 - } - - if (var7 > 0) { // L: 923 - var10 = new byte[var7 / 2]; // L: 924 - var8 = new byte[var7 / 2]; // L: 925 - - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class295.Interpreter_intStackSize]; // L: 927 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class295.Interpreter_intStackSize + 1]; // L: 928 - } - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 933 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]}; // L: 934 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]}; // L: 935 - } - - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] - 1; // L: 937 - if (var7 >= 0 && var7 <= 9) { // L: 938 - class400.Widget_setKey(var4, var7, var10, var8); // L: 941 - return 1; // L: 942 - } else { - throw new RuntimeException(); // L: 939 - } - } - } - } + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? class145.method3085(var0, 10, var1) : Integer.toString(var0); // L: 105 106 } - @ObfuscatedName("bz") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-24" + descriptor = "(I)V", + garbageValue = "17826065" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 117 - } + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2854 + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2857 + MouseRecorder.method2098(); // L: 2859 + class193.method3884(); // L: 2860 + HealthBarDefinition.method3466(); // L: 2861 + NPCComposition.NpcDefinition_cached.clear(); // L: 2863 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2864 + ItemComposition.ItemDefinition_cached.clear(); // L: 2867 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 2868 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 2869 + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2872 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2873 + SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2874 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2877 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2878 + VarbitComposition.VarbitDefinition_cached.clear(); // L: 2881 + VarpDefinition.VarpDefinition_cached.clear(); // L: 2884 + ReflectionCheck.HitSplatDefinition_cachedSprites.method7541(); // L: 2886 + DirectByteArrayCopier.HitSplatDefinition_cached.method7541(); // L: 2887 + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 2889 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 2890 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 2891 + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 2894 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 2895 + StructComposition.StructDefinition_cached.clear(); // L: 2898 + ParamComposition.ParamDefinition_cached.clear(); // L: 2901 + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2904 + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2907 + Widget.Widget_cachedSprites.clear(); // L: 2910 + Widget.Widget_cachedModels.clear(); // L: 2911 + Widget.Widget_cachedFonts.clear(); // L: 2912 + Widget.Widget_cachedSpriteMasks.clear(); // L: 2913 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2915 + Script.Script_cached.clear(); // L: 2916 + KeyHandler.archive0.clearFiles(); // L: 2917 + UserComparator8.archive1.clearFiles(); // L: 2918 + BufferedNetSocket.archive3.clearFiles(); // L: 2919 + class182.archive4.clearFiles(); // L: 2920 + Players.archive5.clearFiles(); // L: 2921 + class16.archive6.clearFiles(); // L: 2922 + LoginScreenAnimation.archive7.clearFiles(); // L: 2923 + class145.archive8.clearFiles(); // L: 2924 + WorldMapDecorationType.archive9.clearFiles(); // L: 2925 + JagexCache.archive10.clearFiles(); // L: 2926 + Message.archive11.clearFiles(); // L: 2927 + class152.archive12.clearFiles(); // L: 2928 + ArchiveLoader.scene.clear(); // L: 2930 - @ObfuscatedName("ea") - @ObfuscatedSignature( - descriptor = "(Llu;Ljava/lang/String;I)V", - garbageValue = "-139407558" - ) - static void method3895(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1352 - Client.archiveLoaders.add(var2); // L: 1353 - Client.field767 += var2.groupCount; // L: 1354 - } // L: 1355 + for (int var0 = 0; var0 < 4; ++var0) { // L: 2931 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 2932 + Actor.method2183(2); // L: 2933 + Client.currentTrackGroupId = -1; // L: 2934 + Client.field746 = false; // L: 2935 + ClientPreferences.method2259(); // L: 2936 + Decimator.updateGameState(10); // L: 2937 + } // L: 2938 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index ddd159f207..400e31b854 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("mq") +@ObfuscatedName("mr") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("head") DualNode head; @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Loh;)V" + descriptor = "(Loz;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,75 +51,75 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Loh;" + descriptor = "()Loz;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; // L: 39 + DualNode var1 = this.sentinel.previousDual; // L: 38 if (var1 == this.sentinel) { - return null; // L: 40 + return null; // L: 39 } else { - var1.removeDual(); // L: 41 - return var1; // L: 42 + var1.removeDual(); // L: 40 + return var1; // L: 41 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Loh;" + descriptor = "()Loz;" ) @Export("last") public DualNode last() { - return this.previousOrLast((DualNode)null); // L: 46 + return this.previousOrLast((DualNode)null); // L: 45 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Loh;)Loh;" + descriptor = "(Loz;)Loz;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { // L: 52 + if (var1 == null) { // L: 50 var2 = this.sentinel.previousDual; } else { - var2 = var1; // L: 53 + var2 = var1; // L: 51 } - if (var2 == this.sentinel) { // L: 54 - this.head = null; // L: 55 - return null; // L: 56 + if (var2 == this.sentinel) { // L: 52 + this.head = null; // L: 53 + return null; // L: 54 } else { - this.head = var2.previousDual; // L: 58 - return var2; // L: 59 + this.head = var2.previousDual; // L: 56 + return var2; // L: 57 } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Loh;" + descriptor = "()Loz;" ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; // L: 64 - if (var1 == this.sentinel) { // L: 65 - this.head = null; // L: 66 - return null; // L: 67 + DualNode var1 = this.head; // L: 61 + if (var1 == this.sentinel) { // L: 62 + this.head = null; // L: 63 + return null; // L: 64 } else { - this.head = var1.previousDual; // L: 69 - return var1; // L: 70 + this.head = var1.previousDual; // L: 66 + return var1; // L: 67 } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); // L: 74 + return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Loh;Loh;)V" + descriptor = "(Loz;Loz;)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 21d368ebbe..ee42bb5519 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("ms") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmr;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("head") DualNode head; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Loz;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lmq;)V" + descriptor = "(Lmr;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 @@ -36,29 +36,29 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; // L: 14 } // L: 15 - public boolean hasNext() { - return this.queue.sentinel != this.head; // L: 30 - } - public void remove() { - if (this.last == null) { // L: 34 + if (this.last == null) { // L: 33 throw new IllegalStateException(); } else { - this.last.removeDual(); // L: 35 - this.last = null; // L: 36 + this.last.removeDual(); // L: 34 + this.last = null; // L: 35 } - } // L: 37 + } // L: 36 public Object next() { - DualNode var1 = this.head; // L: 19 - if (var1 == this.queue.sentinel) { // L: 20 - var1 = null; // L: 21 - this.head = null; // L: 22 + DualNode var1 = this.head; // L: 18 + if (var1 == this.queue.sentinel) { // L: 19 + var1 = null; // L: 20 + this.head = null; // L: 21 } else { - this.head = var1.previousDual; // L: 24 + this.head = var1.previousDual; // L: 23 } - this.last = var1; // L: 25 - return var1; // L: 26 + this.last = var1; // L: 24 + return var1; // L: 25 + } + + public boolean hasNext() { + return this.queue.sentinel != this.head; // L: 29 } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index ab4f0e3873..44b158ac6b 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("ld") +@ObfuscatedName("lk") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) - Node field4099; + Node field4086; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,161 +67,161 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("last") public Node last() { - return this.method6278((Node)null); // L: 46 + return this.method6161((Node)null); // L: 46 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Loz;)Loz;" + descriptor = "(Loq;)Loq;" ) - Node method6278(Node var1) { + Node method6161(Node var1) { Node var2; - if (var1 == null) { // L: 52 + if (var1 == null) { // L: 51 var2 = this.sentinel.previous; } else { - var2 = var1; // L: 53 + var2 = var1; // L: 52 } - if (var2 == this.sentinel) { // L: 54 - this.field4099 = null; // L: 55 - return null; // L: 56 + if (var2 == this.sentinel) { // L: 53 + this.field4086 = null; // L: 54 + return null; // L: 55 } else { - this.field4099 = var2.previous; // L: 58 - return var2; // L: 59 + this.field4086 = var2.previous; // L: 57 + return var2; // L: 58 } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("previous") public Node previous() { - Node var1 = this.field4099; // L: 64 - if (var1 == this.sentinel) { // L: 65 - this.field4099 = null; // L: 66 - return null; // L: 67 + Node var1 = this.field4086; // L: 62 + if (var1 == this.sentinel) { // L: 63 + this.field4086 = null; // L: 64 + return null; // L: 65 } else { - this.field4099 = var1.previous; // L: 69 - return var1; // L: 70 + this.field4086 = var1.previous; // L: 67 + return var1; // L: 68 } } - @ObfuscatedName("f") - int method6235() { - int var1 = 0; // L: 74 + @ObfuscatedName("l") + int method6163() { + int var1 = 0; // L: 72 - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78 - ++var1; // L: 77 + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 + ++var1; // L: 75 } - return var1; // L: 80 + return var1; // L: 78 } - @ObfuscatedName("u") - public boolean method6269() { - return this.sentinel.previous == this.sentinel; // L: 84 + @ObfuscatedName("q") + public boolean method6164() { + return this.sentinel.previous == this.sentinel; // L: 82 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "()[Loq;" + ) + Node[] method6212() { + Node[] var1 = new Node[this.method6163()]; // L: 86 + int var2 = 0; // L: 87 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 + var1[var2++] = var3; // L: 90 + } + + return var1; // L: 93 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()[Loz;" + descriptor = "(Loq;)Z" ) - Node[] method6216() { - Node[] var1 = new Node[this.method6235()]; // L: 88 - int var2 = 0; // L: 89 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93 - var1[var2++] = var3; // L: 92 - } - - return var1; // L: 95 + boolean method6206(Node var1) { + this.addFirst(var1); // L: 127 + return true; // L: 128 } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Loz;)Z" - ) - boolean method6219(Node var1) { - this.addFirst(var1); // L: 135 - return true; // L: 136 - } - - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 141 - } - - public boolean isEmpty() { - return this.method6269(); // L: 109 - } - - public boolean contains(Object var1) { - throw new RuntimeException(); // L: 114 - } - - public Object[] toArray() { - return this.method6216(); // L: 119 - } - - public Object[] toArray(Object[] var1) { - int var2 = 0; // L: 125 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 126 127 129 - var1[var2++] = var3; // L: 128 - } - - return var1; // L: 131 - } - - public boolean containsAll(Collection var1) { - throw new RuntimeException(); // L: 146 - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); // L: 156 - } - - public int size() { - return this.method6235(); // L: 104 + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 140 } public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); // L: 99 + return new IterableNodeDequeDescendingIterator(this); // L: 97 } - public boolean add(Object var1) { - return this.method6219((Node)var1); // L: 170 + public int size() { + return this.method6163(); // L: 101 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 174 + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 109 } - public int hashCode() { - return super.hashCode(); // L: 178 + public Object[] toArray(Object[] var1) { + int var2 = 0; // L: 117 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 + var1[var2++] = var3; // L: 120 + } + + return var1; // L: 123 + } + + public Object[] toArray() { + return this.method6212(); // L: 113 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 144 } public boolean retainAll(Collection var1) { - throw new RuntimeException(); // L: 161 + throw new RuntimeException(); // L: 148 } public void clear() { - this.rsClear(); // L: 166 - } // L: 167 + this.rsClear(); // L: 152 + } // L: 153 - public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 151 + public int hashCode() { + return super.hashCode(); // L: 164 } - @ObfuscatedName("g") + public boolean containsAll(Collection var1) { + throw new RuntimeException(); // L: 136 + } + + public boolean isEmpty() { + return this.method6164(); // L: 105 + } + + public boolean add(Object var1) { + return this.method6206((Node)var1); // L: 156 + } + + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 132 + } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 160 + } + + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Loz;Loz;)V" + descriptor = "(Loq;Loq;)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 d2d9c9a9ff..8277566c52 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,29 +4,29 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("lt") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llk;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) - Node field4097; - @ObfuscatedName("h") + Node field4083; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lld;)V" + descriptor = "(Llk;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 @@ -35,7 +35,7 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;)V" + descriptor = "(Llk;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,32 +43,36 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); // L: 17 } // L: 18 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("start") void start() { - this.field4097 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field4083 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 - public Object next() { - Node var1 = this.field4097; // L: 27 - if (var1 == this.deque.sentinel) { // L: 28 - var1 = null; // L: 29 - this.field4097 = null; // L: 30 + public void remove() { + if (this.last == null) { // L: 41 + throw new IllegalStateException(); } else { - this.field4097 = var1.previous; // L: 32 + this.last.remove(); // L: 42 + this.last = null; // L: 43 + } + } // L: 44 + + public Object next() { + Node var1 = this.field4083; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field4083 = null; // L: 29 + } else { + this.field4083 = var1.previous; // L: 31 } - this.last = var1; // L: 33 - return var1; // L: 34 + this.last = var1; // L: 32 + return var1; // L: 33 } - public void remove() { - this.last.remove(); // L: 43 - this.last = null; // L: 44 - } // L: 45 - public boolean hasNext() { - return this.deque.sentinel != this.field4097 && this.field4097 != null; // L: 38 + return this.deque.sentinel != this.field4083 && this.field4083 != null; // L: 37 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 460c668cb2..c45fcbb46f 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("pq") +@ObfuscatedName("pt") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("v") @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Loq;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("current") Node current; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("index") int index; @@ -47,98 +47,98 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Loz;" + descriptor = "(J)Loq;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 25 + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 26 27 33 - if (this.currentGet.key == var1) { // L: 28 - Node var4 = this.currentGet; // L: 29 - this.currentGet = this.currentGet.previous; // L: 30 - return var4; // L: 31 + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 25 26 32 + if (this.currentGet.key == var1) { // L: 27 + Node var4 = this.currentGet; // L: 28 + this.currentGet = this.currentGet.previous; // L: 29 + return var4; // L: 30 } } - this.currentGet = null; // L: 35 - return null; // L: 36 + this.currentGet = null; // L: 34 + return null; // L: 35 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Loz;J)V" + descriptor = "(Loq;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { // L: 40 + if (var1.next != null) { // L: 39 var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 41 - var1.next = var4.next; // L: 42 - var1.previous = var4; // L: 43 - var1.next.previous = var1; // L: 44 - var1.previous.next = var1; // L: 45 - var1.key = var2; // L: 46 - } // L: 47 + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 40 + var1.next = var4.next; // L: 41 + var1.previous = var4; // L: 42 + var1.next.previous = var1; // L: 43 + var1.previous.next = var1; // L: 44 + var1.key = var2; // L: 45 + } // L: 46 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.size; ++var1) { // L: 50 - Node var2 = this.buckets[var1]; // L: 51 + for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 + Node var2 = this.buckets[var1]; // L: 50 while (true) { - Node var3 = var2.previous; // L: 53 - if (var3 == var2) { // L: 54 + Node var3 = var2.previous; // L: 52 + if (var3 == var2) { // L: 53 break; } - var3.remove(); // L: 55 + var3.remove(); // L: 54 } } - this.currentGet = null; // L: 58 - this.current = null; // L: 59 - } // L: 60 + this.currentGet = null; // L: 57 + this.current = null; // L: 58 + } // L: 59 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("first") public Node first() { - this.index = 0; // L: 63 - return this.next(); // L: 64 + this.index = 0; // L: 62 + return this.next(); // L: 63 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 69 - var1 = this.current; // L: 70 - this.current = var1.previous; // L: 71 - return var1; // L: 72 + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 + var1 = this.current; // L: 68 + this.current = var1.previous; // L: 69 + return var1; // L: 70 } else { do { - if (this.index >= this.size) { // L: 74 - return null; // L: 81 + if (this.index >= this.size) { // L: 72 + return null; // L: 79 } - var1 = this.buckets[this.index++].previous; // L: 75 - } while(var1 == this.buckets[this.index - 1]); // L: 76 + var1 = this.buckets[this.index++].previous; // L: 73 + } while(var1 == this.buckets[this.index - 1]); // L: 74 - this.current = var1.previous; // L: 77 - return var1; // L: 78 + this.current = var1.previous; // L: 75 + return var1; // L: 76 } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); // L: 86 + return new IterableNodeHashTableIterator(this); // L: 83 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index fd85c68278..0238431fec 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("pg") +@ObfuscatedName("pu") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("head") Node head; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("index") int index; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lpq;)V" + descriptor = "(Lpt;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; // L: 10 @@ -48,49 +48,49 @@ public class IterableNodeHashTableIterator implements Iterator { public Object next() { Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 25 - var1 = this.head; // L: 26 - this.head = var1.previous; // L: 27 - this.last = var1; // L: 28 - return var1; // L: 29 + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 + var1 = this.head; // L: 25 + this.head = var1.previous; // L: 26 + this.last = var1; // L: 27 + return var1; // L: 28 } else { do { - if (this.index >= this.hashTable.size) { // L: 31 - return null; // L: 39 + if (this.index >= this.hashTable.size) { // L: 30 + return null; // L: 38 } - var1 = this.hashTable.buckets[this.index++].previous; // L: 32 - } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 33 + var1 = this.hashTable.buckets[this.index++].previous; // L: 31 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 - this.head = var1.previous; // L: 34 - this.last = var1; // L: 35 - return var1; // L: 36 + this.head = var1.previous; // L: 33 + this.last = var1; // L: 34 + return var1; // L: 35 } } public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43 + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 return true; } else { - while (this.index < this.hashTable.size) { // L: 44 - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 45 - this.head = this.hashTable.buckets[this.index - 1].previous; // L: 46 - return true; // L: 47 + while (this.index < this.hashTable.size) { // L: 43 + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 + this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 + return true; // L: 46 } - this.head = this.hashTable.buckets[this.index - 1]; // L: 50 + this.head = this.hashTable.buckets[this.index - 1]; // L: 49 } - return false; // L: 53 + return false; // L: 52 } } public void remove() { - if (this.last == null) { // L: 57 + if (this.last == null) { // L: 56 throw new IllegalStateException(); } else { - this.last.remove(); // L: 58 - this.last = null; // L: 59 + this.last.remove(); // L: 57 + this.last = null; // L: 58 } - } // L: 60 + } // L: 59 } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 9701739eae..e07290739b 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,127 +1,50 @@ +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("fl") +@ObfuscatedName("fp") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("sw") - @ObfuscatedGetter( - intValue = -1318999061 - ) - static int field1737; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("EnumDefinition_archive") - public static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("b") + @Export("cacheDir") + static File cacheDir; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 728211147 + intValue = -701030665 ) @Export("idxCount") - public static int idxCount; - @ObfuscatedName("x") + static int idxCount; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpb;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpb;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpb;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("es") + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llx;" ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("pl") - @ObfuscatedSignature( - descriptor = "Lcm;" - ) - @Export("varcs") - static Varcs varcs; + @Export("archive10") + static Archive archive10; static { JagexCache_randomDat = null; // L: 22 JagexCache_dat2File = null; // L: 23 - JagexCache_idx255File = null; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-95" - ) - public static int method3206(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 - if ((var1 & 1) != 0) { - var2 = var0 * var2; // L: 26 - } - - var0 *= var0; // L: 27 - } - - if (var1 == 1) { // L: 30 - return var0 * var2; - } else { - return var2; // L: 31 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Ld;", - garbageValue = "3" - ) - public static class6[] method3224() { - return new class6[]{class6.field22}; // L: 12 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "-49864634" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? class345.method6478(var0, 10, var1) : Integer.toString(var0); // L: 102 103 - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1964989648" - ) - static int method3227(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821 - Client.logoutTimer = 250; // L: 3822 - return 1; // L: 3823 - } else if (var0 != 5631 && var0 != 5633) { // L: 3825 - if (var0 == 5632) { // L: 3829 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 26; // L: 3830 - return 1; // L: 3831 - } else { - return 2; // L: 3833 - } - } else { - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3826 - return 1; // L: 3827 - } + JagexCache_idx255File = null; // L: 24 } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index eb413870ed..319df6dbae 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -11,96 +11,108 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("e") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { + @ObfuscatedName("sz") + @ObfuscatedSignature( + descriptor = "Lay;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Le;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("bv") - @ObfuscatedGetter( - intValue = 138807253 - ) - static int field140; - @ObfuscatedName("cu") + @ObfuscatedName("cp") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cl") - public static boolean[] field121; - @ObfuscatedName("cv") - public static boolean[] field125; - @ObfuscatedName("cg") - public static int[] field129; - @ObfuscatedName("cz") - @ObfuscatedGetter( - intValue = 1330451443 - ) - public static int field138; - @ObfuscatedName("cb") - @ObfuscatedGetter( - intValue = 542360451 - ) - public static int field124; + @ObfuscatedName("co") + public static boolean[] field140; + @ObfuscatedName("ca") + public static boolean[] field131; + @ObfuscatedName("cr") + public static int[] field145; @ObfuscatedName("cq") - static char[] field115; - @ObfuscatedName("cf") - static int[] field130; - @ObfuscatedName("cm") - public static int[] field139; - @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 480717521 + intValue = 818092329 ) - public static int field132; + public static int field133; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = -119285303 + ) + public static int field128; + @ObfuscatedName("cu") + static char[] field135; + @ObfuscatedName("cg") + static int[] field136; @ObfuscatedName("cj") - public static int[] field133; - @ObfuscatedName("ci") - @ObfuscatedGetter( - intValue = 1701924001 - ) - public static int field134; - @ObfuscatedName("cs") - @ObfuscatedGetter( - intValue = 1014391871 - ) - public static int field135; - @ObfuscatedName("ct") - @ObfuscatedGetter( - intValue = -1239653249 - ) - public static int field136; + public static int[] field143; @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -463917317 + intValue = -1041441839 ) - public static int field137; - @ObfuscatedName("dd") + public static int field118; + @ObfuscatedName("cl") + public static int[] field139; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -958068693 + intValue = -1817748749 + ) + public static int field132; + @ObfuscatedName("cd") + @ObfuscatedGetter( + intValue = -2054154743 + ) + public static int field141; + @ObfuscatedName("cw") + @ObfuscatedGetter( + intValue = 295038649 + ) + public static int field142; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = -1399162193 + ) + public static int field138; + @ObfuscatedName("dr") + @ObfuscatedGetter( + intValue = -1784108457 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("de") + @ObfuscatedName("dj") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; + @ObfuscatedName("es") + @ObfuscatedGetter( + longValue = 4474634211423163711L + ) + static long field149; + @ObfuscatedName("el") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive0") + static Archive archive0; static { KeyHandler_instance = new KeyHandler(); // L: 14 KeyHandler_pressedKeys = new boolean[112]; // L: 101 - field121 = new boolean[112]; // L: 102 - field125 = new boolean[112]; // L: 103 - field129 = new int[128]; // L: 106 - field138 = 0; // L: 107 - field124 = 0; // L: 108 - field115 = new char[128]; // L: 109 - field130 = new int[128]; // L: 110 - field139 = new int[128]; // L: 111 - field132 = 0; // L: 112 - field133 = new int[128]; // L: 113 - field134 = 0; // L: 114 - field135 = 0; // L: 115 - field136 = 0; // L: 116 - field137 = 0; // L: 117 + field140 = new boolean[112]; // L: 102 + field131 = new boolean[112]; // L: 103 + field145 = new int[128]; // L: 106 + field133 = 0; // L: 107 + field128 = 0; // L: 108 + field135 = new char[128]; // L: 109 + field136 = new int[128]; // L: 110 + field143 = new int[128]; // L: 111 + field118 = 0; // L: 112 + field139 = new int[128]; // L: 113 + field132 = 0; // L: 114 + field141 = 0; // L: 115 + field142 = 0; // L: 116 + field138 = 0; // L: 117 KeyHandler_idleCycles = 0; // L: 118 KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 119 } @@ -108,174 +120,206 @@ public final class KeyHandler implements KeyListener, FocusListener { KeyHandler() { } // L: 121 - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 258 - field124 = -1; // L: 259 - } - - } // L: 261 - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 186 - char var2 = var1.getKeyChar(); // L: 187 - if (var2 != 0 && var2 != '\uffff') { // L: 188 - boolean var3; - if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 191 - var3 = true; // L: 192 - } else { - label57: { - if (var2 != 0) { // L: 195 - char[] var4 = class345.cp1252AsciiExtension; // L: 197 - - for (int var5 = 0; var5 < var4.length; ++var5) { // L: 198 - char var6 = var4[var5]; // L: 199 - if (var6 == var2) { // L: 201 - var3 = true; // L: 202 - break label57; - } - } - } - - var3 = false; // L: 209 - } - } - - if (var3) { // L: 211 - int var7 = field136 + 1 & 127; // L: 212 - if (var7 != field135) { // L: 213 - field130[field136] = -1; // L: 214 - field115[field136] = var2; // L: 215 - field136 = var7; // L: 216 - } + if (KeyHandler_instance != null) { // L: 221 + char var2 = var1.getKeyChar(); // L: 222 + if (var2 != 0 && var2 != '\uffff' && class134.method2905(var2)) { // L: 223 + int var3 = field142 + 1 & 127; // L: 224 + if (var3 != field141) { // L: 225 + field136[field142] = -1; // L: 226 + field135[field142] = var2; // L: 227 + field142 = var3; // L: 228 } } } - var1.consume(); // L: 221 - } // L: 222 + var1.consume(); // L: 232 + } // L: 233 public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 172 - int var2 = var1.getKeyCode(); // L: 173 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 174 + if (KeyHandler_instance != null) { // L: 207 + int var2 = var1.getKeyCode(); // L: 208 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 209 var2 = KeyHandler_keyCodes[var2] & -129; } else { - var2 = -1; // L: 175 + var2 = -1; // L: 210 } - if (field124 >= 0 && var2 >= 0) { // L: 176 - field129[field124] = ~var2; // L: 177 - field124 = field124 + 1 & 127; // L: 178 - if (field124 == field138) { // L: 179 - field124 = -1; + if (field128 >= 0 && var2 >= 0) { // L: 211 + field145[field128] = ~var2; // L: 212 + field128 = field128 + 1 & 127; // L: 213 + if (field133 == field128) { // L: 214 + field128 = -1; } } } - var1.consume(); // L: 182 - } // L: 183 + var1.consume(); // L: 217 + } // L: 218 public final void focusGained(FocusEvent var1) { - } // L: 255 + } // L: 266 public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 144 - int var2 = var1.getKeyCode(); // L: 145 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 146 - var2 = KeyHandler_keyCodes[var2]; // L: 147 - if ((var2 & 128) != 0) { // L: 148 + if (KeyHandler_instance != null) { // L: 179 + int var2 = var1.getKeyCode(); // L: 180 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 181 + var2 = KeyHandler_keyCodes[var2]; // L: 182 + if ((var2 & 128) != 0) { // L: 183 var2 = -1; } } else { - var2 = -1; // L: 150 + var2 = -1; // L: 185 } - if (field124 >= 0 && var2 >= 0) { // L: 151 - field129[field124] = var2; // L: 152 - field124 = field124 + 1 & 127; // L: 153 - if (field124 == field138) { // L: 154 - field124 = -1; + if (field128 >= 0 && var2 >= 0) { // L: 186 + field145[field128] = var2; // L: 187 + field128 = field128 + 1 & 127; // L: 188 + if (field128 == field133) { // L: 189 + field128 = -1; } } int var3; - if (var2 >= 0) { // L: 156 - var3 = field136 + 1 & 127; // L: 157 - if (var3 != field135) { // L: 158 - field130[field136] = var2; // L: 159 - field115[field136] = 0; // L: 160 - field136 = var3; // L: 161 + if (var2 >= 0) { // L: 191 + var3 = field142 + 1 & 127; // L: 192 + if (var3 != field141) { // L: 193 + field136[field142] = var2; // L: 194 + field135[field142] = 0; // L: 195 + field142 = var3; // L: 196 } } - var3 = var1.getModifiers(); // L: 164 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 165 - var1.consume(); // L: 166 + var3 = var1.getModifiers(); // L: 199 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 200 + var1.consume(); // L: 201 } } - } // L: 169 + } // L: 204 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1076431446" - ) - static void method377(int var0) { - } + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 269 + field128 = -1; // L: 270 + } - @ObfuscatedName("o") + } // L: 272 + + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lnf;", - garbageValue = "1727286765" + descriptor = "(IB)Lft;", + garbageValue = "1" ) - public static class386 method378() { - synchronized(class386.field4342) { // L: 28 - if (class386.field4336 == 0) { // L: 29 - return new class386(); - } else { - class386.field4342[--class386.field4336].method7033(); // L: 31 - return class386.field4342[class386.field4336]; // L: 32 + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 + if (var1 != null) { // L: 63 + return var1; + } else { + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 + var1 = new NPCComposition(); // L: 65 + var1.id = var0; // L: 66 + if (var2 != null) { // L: 67 + var1.decode(new Buffer(var2)); } + + var1.postDecode(); // L: 68 + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 + return var1; // L: 70 } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2117472619" + descriptor = "(IB)Lkl;", + garbageValue = "-105" ) - public static boolean method376() { - return class273.musicPlayerStatus != 0 ? true : WorldMapEvent.midiPcmStream.isReady(); // L: 36 37 - } + public static GameBuild method332(int var0) { + GameBuild[] var1 = class155.method3185(); // L: 23 - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(Lcw;III)V", - garbageValue = "840635869" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 3897 - int var3 = ItemContainer.SequenceDefinition_get(var1).field2172; // L: 3898 - if (var3 == 1) { // L: 3899 - var0.sequenceFrame = 0; // L: 3900 - var0.sequenceFrameCycle = 0; // L: 3901 - var0.sequenceDelay = var2; // L: 3902 - var0.field1169 = 0; // L: 3903 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24 + GameBuild var3 = var1[var2]; // L: 25 + if (var0 == var3.buildId) { + return var3; // L: 27 } - - if (var3 == 2) { // L: 3905 - var0.field1169 = 0; // L: 3906 - } - } else if (var1 == -1 || var0.sequence == -1 || ItemContainer.SequenceDefinition_get(var1).field2166 >= ItemContainer.SequenceDefinition_get(var0.sequence).field2166) { // L: 3909 - var0.sequence = var1; // L: 3910 - var0.sequenceFrame = 0; // L: 3911 - var0.sequenceFrameCycle = 0; // L: 3912 - var0.sequenceDelay = var2; // L: 3913 - var0.field1169 = 0; // L: 3914 - var0.field1134 = var0.pathLength; // L: 3915 } - } // L: 3917 + return null; // L: 31 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-471060529" + ) + static final void method337(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 154 + for (int var4 = 0; var4 < 8; ++var4) { // L: 155 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 157 + for (var3 = 1; var3 < 8; ++var3) { // L: 158 + 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) { // L: 163 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 164 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 165 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 166 + + @ObfuscatedName("l") + static final void method350(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 80 + } // L: 81 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1206801353" + ) + static final void method348(String var0) { + class149.method3138("Please remove " + var0 + " from your friend list first"); // L: 160 + } // L: 161 + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(Lgw;IIIB)V", + garbageValue = "85" + ) + static void method336(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class131.clientPreferences.method2270() != 0) { // L: 3575 + if (var0.field2144 != null && var0.field2144.containsKey(var1)) { // L: 3576 + int var4 = (Integer)var0.field2144.get(var1); // L: 3577 + if (var4 != 0) { // L: 3581 + int var7 = var4 >> 8; // L: 3582 + int var8 = var4 >> 4 & 7; // L: 3583 + int var9 = var4 & 15; // L: 3584 + Client.soundEffectIds[Client.soundEffectCount] = var7; // L: 3585 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 3586 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3587 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3588 + int var10 = (var2 - 64) / 128; // L: 3589 + int var11 = (var3 - 64) / 128; // L: 3590 + Client.soundLocations[Client.soundEffectCount] = var9 + (var11 << 8) + (var10 << 16); // L: 3591 + ++Client.soundEffectCount; // L: 3592 + } + + } + } + } // L: 3594 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 49221963ad..0ada5cfc68 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -1,61 +1,61 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fq") @Implements("KitDefinition") public class KitDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("KitDefinition_archive") public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1369502349 + intValue = 1767972963 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("KitDefinition_cached") - public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("l") + static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 1265181623 + intValue = 1856258713 + ) + static int field1855; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1991201937 ) @Export("bodypartID") public int bodypartID; @ObfuscatedName("n") @Export("models2") int[] models2; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("models") int[] models; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("nonSelectable") public boolean nonSelectable; @@ -69,10 +69,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; // L: 22 } // L: 24 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1450083178" + descriptor = "(Lpi;I)V", + garbageValue = "-322514028" ) @Export("decode") void decode(Buffer var1) { @@ -86,10 +86,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "-45" + descriptor = "(Lpi;IB)V", + garbageValue = "14" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -113,8 +113,8 @@ public class KitDefinition extends DualNode { this.recolorTo = new short[var3]; // L: 55 for (var4 = 0; var4 < var3; ++var4) { // L: 56 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { // L: 61 var3 = var1.readUnsignedByte(); // L: 62 @@ -132,10 +132,10 @@ public class KitDefinition extends DualNode { } // L: 72 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1616924312" + garbageValue = "579619376" ) @Export("ready") public boolean ready() { @@ -145,7 +145,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; // L: 76 for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 - if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + if (!class147.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } @@ -154,10 +154,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Lgt;", - garbageValue = "-35" + descriptor = "(I)Lhc;", + garbageValue = "-1349429336" ) @Export("getModelData") public ModelData getModelData() { @@ -167,7 +167,7 @@ public class KitDefinition extends DualNode { ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84 - var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); + var1[var2] = ModelData.ModelData_get(class147.KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; @@ -196,14 +196,14 @@ public class KitDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-9970" + descriptor = "(I)Z", + garbageValue = "293914398" ) - public boolean method3397() { + public boolean method3447() { boolean var1 = true; // L: 102 - for (int var2 = 0; var2 < 5; ++var2) { - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { + for (int var2 = 0; var2 < 5; ++var2) { // L: 103 + if (this.models[var2] != -1 && !class147.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 var1 = false; } } @@ -211,10 +211,10 @@ public class KitDefinition extends DualNode { return var1; // L: 106 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lgt;", - garbageValue = "-971684852" + descriptor = "(S)Lhc;", + garbageValue = "1402" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -223,7 +223,7 @@ public class KitDefinition extends DualNode { for (int var3 = 0; var3 < 5; ++var3) { // L: 112 if (this.models[var3] != -1) { // L: 113 - var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); + var1[var2++] = ModelData.ModelData_get(class147.KitDefinition_modelsArchive, this.models[var3], 0); } } @@ -244,38 +244,41 @@ public class KitDefinition extends DualNode { return var5; // L: 126 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqe;" + descriptor = "(Lln;Lln;I)V", + garbageValue = "-1509322924" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { // L: 99 - var2 = (RunException)var0; // L: 100 - var2.message = var2.message + ' ' + var1; // L: 101 - } else { - var2 = new RunException(var0, var1); // L: 103 + public static void method3452(AbstractArchive var0, AbstractArchive var1) { + NPCComposition.NpcDefinition_archive = var0; // L: 57 + NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 + } // L: 59 + + @ObfuscatedName("kq") + static final void method3453(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11999 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 12000 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 12002 + class131.clientPreferences.method2239(var0); // L: 12004 + } // L: 12005 + + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2073437950" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 12355 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 12356 + var1.clearIsFromIgnored(); // L: 12358 } - return var2; // L: 104 - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-599485145" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (Interpreter.clientPreferences.method2269() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3330 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3331 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3332 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3333 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3334 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3335 - ++Client.soundEffectCount; // L: 3336 + if (ClientPacket.friendsChat != null) { // L: 12362 + ClientPacket.friendsChat.invalidateIgnoreds(); // L: 12363 } - } // L: 3338 + } // L: 12365 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 94ea7733fd..e1e9acd357 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -6,480 +6,389 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("lp") +@ObfuscatedName("lo") @Implements("Language") public class Language implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_NL") static final Language Language_NL; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Llp;" + descriptor = "[Llo;" ) @Export("Language_valuesOrdered") - public static final Language[] Language_valuesOrdered; - @ObfuscatedName("ib") - @ObfuscatedGetter( - intValue = 1235623999 + static final Language[] Language_valuesOrdered; + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "Lnc;" ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("f") - final String field4062; - @ObfuscatedName("u") + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("l") + final String field4047; + @ObfuscatedName("q") @Export("language") final String language; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1267463723 + intValue = -1865036015 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field4073, 0, "GB"); // L: 12 - Language_DE = new Language("DE", "de", "German", ModeWhere.field4073, 1, "DE"); // L: 13 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field4073, 2, "FR"); // L: 14 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4073, 3, "BR"); // L: 15 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4075, 4, "NL"); // L: 16 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4075, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4073, 6, "MX"); // L: 18 - Language[] var0 = method6118(); // L: 25 - Language_valuesOrdered = new Language[var0.length]; - Language[] var1 = var0; // L: 28 + Language_EN = new Language("EN", "en", "English", ModeWhere.field4069, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field4069, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field4069, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4069, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4065, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4065, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4069, 6, "MX"); // L: 16 + Language[] var0 = new Language[]{Language_ES_MX, Language_FR, Language_ES, Language_NL, Language_EN, Language_PT, Language_DE}; // L: 25 + Language_valuesOrdered = new Language[var0.length]; // L: 28 + Language[] var2 = var0; // L: 30 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 29 - Language var3 = var1[var2]; // L: 30 - if (Language_valuesOrdered[var3.id] != null) { // L: 32 - throw new IllegalStateException(); // L: 33 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + Language var4 = var2[var3]; // L: 32 + if (Language_valuesOrdered[var4.id] != null) { // L: 34 + throw new IllegalStateException(); // L: 35 } - Language_valuesOrdered[var3.id] = var3; // L: 35 + Language_valuesOrdered[var4.id] = var4; // L: 37 } - } // L: 39 + } // L: 41 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llj;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llv;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field4062 = var1; // L: 46 - this.language = var2; // L: 47 - this.id = var5; // L: 48 - if (var6 != null) { // L: 49 - new Locale(var2.substring(0, 2), var6); // L: 50 + this.field4047 = var1; + this.language = var2; + this.id = var5; + if (var6 != null) { + new Locale(var2.substring(0, 2), var6); } else { - new Locale(var2.substring(0, 2)); // L: 53 + new Locale(var2.substring(0, 2)); } - } // L: 55 + } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 63 + return this.id; // L: 60 } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "940593481" + garbageValue = "-1969590033" ) @Export("getLanguage") String getLanguage() { - return this.language; // L: 58 + return this.language; // L: 56 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 68 + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "2038855833" + descriptor = "(Llx;IIIBZI)V", + garbageValue = "-1446748586" ) - static boolean method6135(int var0, int var1) { - return var0 != 4 || var1 < 8; // L: 26 - } + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 42 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 43 + if (var8 == null) { // L: 44 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 45 + if (var8 == null) { // L: 46 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 47 + if (var8 != null) { // L: 48 + if (var5) { // L: 49 + var8.removeDual(); // L: 50 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 51 + --NetCache.NetCache_pendingWritesCount; // L: 52 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 53 + } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Llp;", - garbageValue = "3" - ) - static Language[] method6118() { - return new Language[]{Language_DE, Language_ES_MX, Language_EN, Language_FR, Language_ES, Language_PT, Language_NL}; // L: 42 - } + } else { + if (!var5) { // L: 57 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 58 + if (var8 != null) { // L: 59 + return; + } + } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Lji;", - garbageValue = "42" - ) - public static class263[] method6134() { - return new class263[]{class263.field3010, class263.field3004, class263.field3005, class263.field3006, class263.field3007, class263.field3008, class263.field3009, class263.field3013, class263.field3011, class263.field3012}; // L: 17 - } + var8 = new NetFileRequest(); // L: 61 + var8.archive = var0; // L: 62 + var8.crc = var3; // L: 63 + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 66 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 67 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 70 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 71 + ++NetCache.NetCache_pendingWritesCount; // L: 72 + } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-118" - ) - static void method6136(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 + } + } } - } // L: 75 + } // L: 55 74 - @ObfuscatedName("d") - static boolean method6131(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; // L: 73 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)Llo;", + garbageValue = "-24" + ) + public static Language method6077(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "125" + descriptor = "(ILbd;ZI)I", + garbageValue = "532413421" ) - static final int method6137(int var0, int var1) { - int var2 = AbstractSocket.method6884(var0 - 1, var1 - 1) + AbstractSocket.method6884(var0 + 1, var1 - 1) + AbstractSocket.method6884(var0 - 1, var1 + 1) + AbstractSocket.method6884(var0 + 1, var1 + 1); // L: 999 - int var3 = AbstractSocket.method6884(var0 - 1, var1) + AbstractSocket.method6884(1 + var0, var1) + AbstractSocket.method6884(var0, var1 - 1) + AbstractSocket.method6884(var0, 1 + var1); // L: 1000 - int var4 = AbstractSocket.method6884(var0, var1); // L: 1001 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 1002 + static int method6079(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1031 + var0 -= 1000; // L: 1032 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1033 + } else { + var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1035 + } + + String var4 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1036 + int[] var5 = null; // L: 1037 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1038 + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1039 + if (var6 > 0) { // L: 1040 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { // L: 1041 1042 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 1044 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1046 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1047 + if (var4.charAt(var7 - 1) == 's') { // L: 1048 + var8[var7] = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1049 + } + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1051 + if (var7 != -1) { // L: 1052 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1053 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1054 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1055 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1056 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1057 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1058 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1059 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1060 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1061 + var3.onVarTransmit = var8; // L: 1062 + var3.varTransmitTriggers = var5; // L: 1063 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1065 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1066 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1067 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1068 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1069 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1070 + var3.onInvTransmit = var8; // L: 1071 + var3.invTransmitTriggers = var5; // L: 1072 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1074 + var3.onStatTransmit = var8; // L: 1075 + var3.statTransmitTriggers = var5; // L: 1076 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1078 + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1079 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1080 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1081 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1082 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1083 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1084 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1085 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1086 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1087 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1088 + var3.field3432 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1089 + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1090 + var3.field3454 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1091 + var3.field3455 = var8; + } else if (var0 == 1430) { // L: 1092 + var3.field3416 = var8; + } else if (var0 == 1431) { // L: 1093 + var3.field3451 = var8; + } else { + if (var0 != 1434) { // L: 1094 + return 2; // L: 1095 + } + + var3.field3462 = var8; + } + + var3.hasListener = true; // L: 1096 + return 1; // L: 1097 } - @ObfuscatedName("aw") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1522906497" + descriptor = "(ILbd;ZI)I", + garbageValue = "-866525828" ) - static int method6125(int var0, Script var1, boolean var2) { + static int method6091(int var0, Script var1, boolean var2) { int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2892 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2893 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2894 - return 1; // L: 2895 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2897 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2898 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2899 - return 1; // L: 2900 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2902 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2903 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2904 - return 1; // L: 2905 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2907 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2908 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2909 - return 1; // L: 2910 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2912 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2913 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2914 - return 1; // L: 2915 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2917 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2918 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2919 - return 1; // L: 2920 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2922 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2923 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2924 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2925 - return 1; // L: 2926 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2928 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2929 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2930 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2931 - return 1; // L: 2932 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2934 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2935 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2936 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2937 - return 1; // L: 2938 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2940 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2941 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2942 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2943 - return 1; // L: 2944 - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2946 - var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2947 - if (ReflectionCheck.grandExchangeEvents != null) { // L: 2948 - ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2949 - } - - return 1; // L: 2951 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2953 - var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2954 - if (ReflectionCheck.grandExchangeEvents != null) { // L: 2955 - ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2956 - } - - return 1; // L: 2958 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2960 - class295.Interpreter_intStackSize -= 2; // L: 2961 - var12 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] == 1; // L: 2962 - boolean var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 2963 - if (ReflectionCheck.grandExchangeEvents != null) { // L: 2964 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2965 - ReflectionCheck.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2966 - } - - return 1; // L: 2968 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2970 - var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2971 - if (ReflectionCheck.grandExchangeEvents != null) { // L: 2972 - ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2973 - } - - return 1; // L: 2975 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2977 - var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2978 - if (ReflectionCheck.grandExchangeEvents != null) { // L: 2979 - ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2980 - } - - return 1; // L: 2982 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2984 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ReflectionCheck.grandExchangeEvents == null ? 0 : ReflectionCheck.grandExchangeEvents.events.size(); // L: 2985 - return 1; // L: 2986 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2988 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2989 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 2990 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.world; // L: 2991 - return 1; // L: 2992 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2994 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2995 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 2996 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2997 - return 1; // L: 2998 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3000 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3001 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3002 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3003 - return 1; // L: 3004 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3006 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3007 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3008 - long var5 = WorldMapSprite.method4989() - Varps.field3287 - var4.age; // L: 3009 - int var7 = (int)(var5 / 3600000L); // L: 3010 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3011 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3012 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3013 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var10; // L: 3014 - return 1; // L: 3015 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3017 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3018 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3019 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3020 - return 1; // L: 3021 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3023 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3024 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3025 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3026 - return 1; // L: 3027 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3029 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3030 - var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3031 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3032 - return 1; // L: 3033 - } else { - return 2; // L: 3035 - } - } + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3789 + Interpreter.Interpreter_intStackSize -= 2; // L: 3790 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3791 + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3792 + if (!Client.isCameraLocked) { // L: 3793 + Client.camAngleX = var3; // L: 3794 + Client.camAngleY = var4; // L: 3795 } + + return 1; // L: 3797 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3799 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3800 + return 1; // L: 3801 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3803 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3804 + return 1; // L: 3805 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3807 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3808 + if (var3 < 0) { // L: 3809 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3810 + return 1; // L: 3811 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3813 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3814 + return 1; // L: 3815 + } else { + return 2; // L: 3817 } } - @ObfuscatedName("am") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "303370492" + descriptor = "(Lgw;IIII)V", + garbageValue = "-478908474" ) - static int method6121(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4484 - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4489 - if (var0 == 6750) { // L: 4493 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4494 - return 1; // L: 4495 - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4497 - if (var0 == 6754) { // L: 4501 - int var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4502 - NPCComposition var4 = class9.getNpcDefinition(var3); // L: 4503 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4504 - return 1; // L: 4505 - } else { - return 2; // L: 4507 - } - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4498 - return 1; // L: 4499 + static void method6087(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class131.clientPreferences.method2270() != 0) { // L: 3553 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3554 + int var4 = var0.soundEffects[var1]; // L: 3555 + if (var4 != 0) { // L: 3559 + int var7 = var4 >> 8; // L: 3560 + int var8 = var4 >> 4 & 7; // L: 3561 + int var9 = var4 & 15; // L: 3562 + Client.soundEffectIds[Client.soundEffectCount] = var7; // L: 3563 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 3564 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3565 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3566 + int var10 = (var2 - 64) / 128; // L: 3567 + int var11 = (var3 - 64) / 128; // L: 3568 + Client.soundLocations[Client.soundEffectCount] = var9 + (var11 << 8) + (var10 << 16); // L: 3569 + ++Client.soundEffectCount; // L: 3570 } - } else { - --class295.Interpreter_intStackSize; // L: 4490 - return 1; // L: 4491 - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 4485 - --ChatChannel.Interpreter_stringStackSize; // L: 4486 - return 1; // L: 4487 - } - } - @ObfuscatedName("ak") + } + } + } // L: 3572 + + @ObfuscatedName("jg") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-525559357" + descriptor = "(IIIIIIII)V", + garbageValue = "-695139684" ) - static int method6132(int var0, Script var1, boolean var2) { - if (var0 == 6900) { // L: 4535 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4536 - return 1; // L: 4537 - } else if (var0 == 6950) { // L: 4539 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4540 - return 1; // L: 4541 - } else { - return 2; // L: 4543 + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (class155.loadInterface(var0)) { // L: 11183 + VarpDefinition.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11184 } - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1490020023" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4213 - var2 = 1; - } - - if (var3 < 1) { // L: 4214 - var3 = 1; - } - - int var5 = var3 - 334; // L: 4215 - int var6; - if (var5 < 0) { // L: 4217 - var6 = Client.field745; - } else if (var5 >= 100) { // L: 4218 - var6 = Client.field706; - } else { - var6 = (Client.field706 - Client.field745) * var5 / 100 + Client.field745; // L: 4219 - } - - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4220 - int var8; - int var9; - short var17; - if (var7 < Client.field751) { // L: 4221 - var17 = Client.field751; // L: 4222 - var6 = var17 * var2 * 334 / (var3 * 512); // L: 4223 - if (var6 > Client.field750) { // L: 4224 - var6 = Client.field750; // L: 4225 - var8 = var3 * var6 * 512 / (var17 * 334); // L: 4226 - var9 = (var2 - var8) / 2; // L: 4227 - if (var4) { // L: 4228 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4229 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4230 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4231 - } - - var0 += var9; // L: 4233 - var2 -= var9 * 2; // L: 4234 - } - } else if (var7 > Client.field752) { // L: 4237 - var17 = Client.field752; // L: 4238 - var6 = var17 * var2 * 334 / (var3 * 512); // L: 4239 - if (var6 < Client.field562) { // L: 4240 - var6 = Client.field562; // L: 4241 - var8 = var17 * var2 * 334 / (var6 * 512); // L: 4242 - var9 = (var3 - var8) / 2; // L: 4243 - if (var4) { // L: 4244 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4245 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4246 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4247 - } - - var1 += var9; // L: 4249 - var3 -= var9 * 2; // L: 4250 - } - } - - Client.viewportZoom = var3 * var6 / 334; // L: 4253 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4254 - int[] var16 = new int[9]; // L: 4256 - - for (var9 = 0; var9 < var16.length; ++var9) { // L: 4257 - int var10 = var9 * 32 + 15 + 128; // L: 4258 - int var11 = DevicePcmPlayerProvider.method385(var10); // L: 4259 - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4260 - int var14 = var3 - 334; // L: 4263 - if (var14 < 0) { // L: 4264 - var14 = 0; - } else if (var14 > 100) { // L: 4265 - var14 = 100; - } - - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 4266 - int var13 = var15 * var11 / 256; // L: 4267 - var16[var9] = var13 * var12 >> 16; // L: 4270 - } - - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 4272 - } - - Client.viewportOffsetX = var0; // L: 4275 - Client.viewportOffsetY = var1; // L: 4276 - Client.viewportWidth = var2; // L: 4277 - Client.viewportHeight = var3; // L: 4278 - } // L: 4279 + } // L: 11185 } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 736144603c..eb8fb755d7 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ol") +@ObfuscatedName("ot") @Implements("Link") public class Link { - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Lot;" ) @Export("previous") public Link previous; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Lot;" ) @Export("next") public Link next; diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 5da014e4de..3460d9b04c 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("lt") +@ObfuscatedName("lr") @Implements("LinkDeque") public class LinkDeque { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Lot;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lol;" + descriptor = "Lot;" ) @Export("current") Link current; @@ -27,7 +27,7 @@ public class LinkDeque { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lol;)V" + descriptor = "(Lot;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,35 +41,35 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lol;" + descriptor = "()Lot;" ) @Export("last") public Link last() { - Link var1 = this.sentinel.previous; // L: 24 - if (var1 == this.sentinel) { // L: 25 - this.current = null; // L: 26 - return null; // L: 27 + Link var1 = this.sentinel.previous; // L: 23 + if (var1 == this.sentinel) { // L: 24 + this.current = null; // L: 25 + return null; // L: 26 } else { - this.current = var1.previous; // L: 29 - return var1; // L: 30 + this.current = var1.previous; // L: 28 + return var1; // L: 29 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lol;" + descriptor = "()Lot;" ) @Export("previous") public Link previous() { - Link var1 = this.current; // L: 35 - if (var1 == this.sentinel) { // L: 36 - this.current = null; // L: 37 - return null; // L: 38 + Link var1 = this.current; // L: 33 + if (var1 == this.sentinel) { // L: 34 + this.current = null; // L: 35 + return null; // L: 36 } else { - this.current = var1.previous; // L: 40 - return var1; // L: 41 + this.current = var1.previous; // L: 38 + return var1; // L: 39 } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 1043510a27..0830e4301a 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,5 +1,3 @@ -import java.net.MalformedURLException; -import java.net.URL; import java.text.DecimalFormat; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -7,159 +5,147 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bs") @Implements("Login") public class Login { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1208455943 + intValue = 2022945893 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - static IndexedSprite field882; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lqx;" + descriptor = "[Lqq;" ) - static IndexedSprite field913; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lql;" - ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("k") - @Export("Tiles_saturation") - static int[] Tiles_saturation; + @Export("runesSprite") + static IndexedSprite[] runesSprite; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lcl;" + descriptor = "Lqq;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1898905069 + intValue = -1514793593 ) @Export("loginBoxX") static int loginBoxX; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -802532583 + intValue = 66055169 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 424820649 + intValue = 688596069 ) - static int field892; - @ObfuscatedName("al") + static int field901; + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1250677803 + intValue = -547641813 ) - static int field897; - @ObfuscatedName("af") + static int field895; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 26859459 + intValue = -1615096635 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ap") + @ObfuscatedName("as") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("bk") + @ObfuscatedName("bj") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("bz") + @ObfuscatedName("bm") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("bl") + @ObfuscatedName("br") @Export("Login_username") static String Login_username; - @ObfuscatedName("be") + @ObfuscatedName("bo") @Export("Login_password") static String Login_password; + @ObfuscatedName("be") + @ObfuscatedGetter( + intValue = 326073325 + ) + static int field903; + @ObfuscatedName("bh") + static String[] field904; + @ObfuscatedName("by") + static boolean field909; @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lkh;" - ) - static StudioGame field917; - @ObfuscatedName("ba") + static boolean field906; + @ObfuscatedName("bp") + static boolean field907; + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -864612433 - ) - static int field899; - @ObfuscatedName("bg") - static String[] field900; - @ObfuscatedName("bs") - static boolean field901; - @ObfuscatedName("bx") - static boolean field902; - @ObfuscatedName("bj") - static boolean field903; - @ObfuscatedName("bm") - @ObfuscatedGetter( - intValue = -1722988803 + intValue = 1549221867 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("cd") + @ObfuscatedName("cm") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("co") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1052242699 + intValue = -1213239867 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("cu") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 971393423 + intValue = -418396213 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("cl") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 2024146027 + intValue = -2129612195 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("cc") + @ObfuscatedName("ci") @ObfuscatedGetter( - longValue = 939352785293546991L + longValue = -2025470405168207311L ) - static long field911; - @ObfuscatedName("cx") + static long field915; + @ObfuscatedName("cy") @ObfuscatedGetter( - longValue = 1361954428784605633L + longValue = 679387299211312041L ) - static long field912; - @ObfuscatedName("cg") - static String[] field881; - @ObfuscatedName("cz") - static String[] field914; + static long field916; + @ObfuscatedName("cr") + static String[] field917; + @ObfuscatedName("cq") + static String[] field918; static { xPadding = 0; // L: 47 loginBoxX = xPadding + 202; Login_loadingPercent = 10; // L: 68 Login_loadingText = ""; // L: 69 - field892 = -1; - field897 = 1; // L: 90 + field901 = -1; // L: 87 + field895 = 1; // L: 90 loginIndex = 0; // L: 94 Login_response0 = ""; // L: 95 Login_response1 = ""; // L: 96 @@ -167,11 +153,11 @@ public class Login { Login_response3 = ""; // L: 98 Login_username = ""; // L: 99 Login_password = ""; // L: 100 - field899 = 0; // L: 102 - field900 = new String[8]; // L: 103 - field901 = false; // L: 114 - field902 = false; // L: 115 - field903 = true; // L: 118 + field903 = 0; // L: 102 + field904 = new String[8]; // L: 103 + field909 = false; // L: 114 + field906 = false; // L: 115 + field907 = true; // L: 118 currentLoginField = 0; // L: 119 worldSelectOpen = false; // L: 123 hoveredWorldIndex = -1; // L: 131 @@ -179,89 +165,251 @@ public class Login { worldSelectPagesCount = 0; // L: 133 new DecimalFormat("##0.00"); // L: 136 new class120(); - field911 = -1L; // L: 144 - field912 = -1L; - field881 = new String[]{"title.jpg"}; // L: 148 - field914 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 151 + field915 = -1L; // L: 144 + field916 = -1L; // L: 145 + field917 = new String[]{"title.jpg"}; // L: 148 + field918 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 151 } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2031996356" + descriptor = "(I)V", + garbageValue = "2061264207" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class6.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;Llq;ZLmr;I)V", - garbageValue = "-1379223824" - ) - public static void method1944(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - WorldMapID.ItemDefinition_archive = var0; // L: 84 - GameEngine.ItemDefinition_modelArchive = var1; // L: 85 - HealthBar.ItemDefinition_inMembersWorld = var2; // L: 86 - ArchiveLoader.ItemDefinition_fileCount = WorldMapID.ItemDefinition_archive.getGroupFileCount(10); // L: 87 - class239.ItemDefinition_fontPlain11 = var3; // L: 88 - } // L: 89 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-333067271" - ) - static boolean method1945(String var0) { - if (var0 == null) { // L: 138 - return false; - } else { - try { - new URL(var0); - return true; // L: 145 - } catch (MalformedURLException var2) { // L: 142 - return false; // L: 143 - } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "105" - ) - static int method1883(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 - if (var2 == null) { // L: 29 - return 0; - } else if (var1 == -1) { // L: 30 - return 0; - } else { - int var3 = 0; // L: 31 - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; // L: 33 - } - } - - return var3; // L: 35 - } - } + static void method1960() { + ByteArrayPool.field4167.clear(); // L: 61 + ByteArrayPool.field4167.add(100); // L: 62 + ByteArrayPool.field4167.add(5000); // L: 63 + ByteArrayPool.field4167.add(10000); // L: 64 + ByteArrayPool.field4167.add(30000); // L: 65 + } // L: 66 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2147483647" + descriptor = "(Lpz;ILcz;II)V", + garbageValue = "540363482" ) - public static int method1894(int var0) { - --var0; // L: 61 - var0 |= var0 >>> 1; // L: 62 - var0 |= var0 >>> 2; // L: 63 - var0 |= var0 >>> 4; // L: 64 - var0 |= var0 >>> 8; // L: 65 - var0 |= var0 >>> 16; // L: 66 - return var0 + 1; // L: 67 - } + static final void method1932(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = class193.field2186.field2183; // L: 451 + if ((var3 & 8192) != 0) { // L: 452 + var2.field1167 = Client.cycle + var0.method7714(); // L: 453 + var2.field1168 = Client.cycle + var0.method7713(); // L: 454 + var2.field1169 = var0.method7708(); // L: 455 + var2.field1114 = var0.method7708(); // L: 456 + var2.field1171 = var0.method7885(); // L: 457 + var2.field1122 = (byte)var0.method7773(); // L: 458 + } + + if ((var3 & 256) != 0) { // L: 460 + var4 = var0.method7885(); // L: 461 + } + + int var5; + int var8; + int var9; + int var12; + if ((var3 & 1) != 0) { // L: 463 + var5 = var0.method7713(); // L: 464 + PlayerType var6 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var0.readUnsignedByte()); // L: 465 + boolean var7 = var0.method7742() == 1; // L: 466 + var8 = var0.method7742(); // L: 467 + var9 = var0.offset; // L: 468 + if (var2.username != null && var2.appearance != null) { // L: 469 + boolean var10 = false; // L: 470 + if (var6.isUser && Decimator.friendSystem.isIgnored(var2.username)) { // L: 471 472 + var10 = true; + } + + if (!var10 && Client.field618 == 0 && !var2.isHidden) { // L: 474 + Players.field1273.offset = 0; // L: 475 + var0.method7814(Players.field1273.array, 0, var8); // L: 476 + Players.field1273.offset = 0; // L: 477 + String var11 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(Players.field1273))); // L: 478 + var2.overheadText = var11.trim(); // L: 479 + var2.overheadTextColor = var5 >> 8; // L: 480 + var2.overheadTextEffect = var5 & 255; // L: 481 + var2.overheadTextCyclesRemaining = 150; // L: 482 + var2.isAutoChatting = var7; // L: 483 + var2.field1130 = var2 != GrandExchangeEvents.localPlayer && var6.isUser && "" != Client.field728 && var11.toLowerCase().indexOf(Client.field728) == -1; // L: 484 + if (var6.isPrivileged) { // L: 486 + var12 = var7 ? 91 : 1; + } else { + var12 = var7 ? 90 : 2; // L: 487 + } + + if (var6.modIcon != -1) { // L: 488 + Actor.addGameMessage(var12, Script.method1990(var6.modIcon) + var2.username.getName(), var11); + } else { + Actor.addGameMessage(var12, var2.username.getName(), var11); // L: 489 + } + } + } + + var0.offset = var8 + var9; // L: 492 + } + + if ((var3 & 2048) != 0) { // L: 494 + for (var5 = 0; var5 < 3; ++var5) { // L: 495 + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 4096) != 0) { // L: 497 + var2.spotAnimation = var0.method7713(); // L: 498 + var5 = var0.method7705(); // L: 499 + var2.spotAnimationHeight = var5 >> 16; // L: 500 + var2.field1134 = (var5 & 65535) + Client.cycle; // L: 501 + var2.spotAnimationFrame = 0; // L: 502 + var2.spotAnimationFrameCycle = 0; // L: 503 + if (var2.field1134 > Client.cycle) { // L: 504 + var2.spotAnimationFrame = -1; + } + + if (var2.spotAnimation == 65535) { // L: 505 + var2.spotAnimation = -1; + } + } + + if ((var3 & 128) != 0) { // L: 507 + var5 = var0.method7742(); // L: 508 + byte[] var17 = new byte[var5]; // L: 509 + Buffer var13 = new Buffer(var17); // L: 510 + var0.method7814(var17, 0, var5); // L: 511 + Players.field1276[var1] = var13; // L: 512 + var2.read(var13); // L: 513 + } + + if ((var3 & 512) != 0) { // L: 515 + var2.field1129 = var0.method7707(); // L: 516 + var2.field1160 = var0.readByte(); // L: 517 + var2.field1132 = var0.method7885(); // L: 518 + var2.field1161 = var0.method7708(); // L: 519 + var2.field1143 = var0.method7714() + Client.cycle; // L: 520 + var2.field1163 = var0.method7715() + Client.cycle; // L: 521 + var2.field1135 = var0.method7713(); // L: 522 + if (var2.field1070) { // L: 523 + var2.field1129 += var2.tileX; // L: 524 + var2.field1160 += var2.tileY; // L: 525 + var2.field1132 += var2.tileX; // L: 526 + var2.field1161 += var2.tileY; // L: 527 + var2.pathLength = 0; // L: 528 + } else { + var2.field1129 += var2.pathX[0]; // L: 531 + var2.field1160 += var2.pathY[0]; // L: 532 + var2.field1132 += var2.pathX[0]; // L: 533 + var2.field1161 += var2.pathY[0]; // L: 534 + var2.pathLength = 1; // L: 535 + } + + var2.field1170 = 0; // L: 537 + } + + if ((var3 & 16) != 0) { // L: 539 + var2.field1121 = var0.readUnsignedShort(); // L: 540 + if (var2.pathLength == 0) { // L: 541 + var2.orientation = var2.field1121; // L: 542 + var2.field1121 = -1; // L: 543 + } + } + + if ((var3 & 2) != 0) { // L: 546 + var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 547 + if (var2.overheadText.charAt(0) == '~') { // L: 548 + var2.overheadText = var2.overheadText.substring(1); // L: 549 + Actor.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 550 + } else if (var2 == GrandExchangeEvents.localPlayer) { // L: 552 + Actor.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 553 + } + + var2.isAutoChatting = false; // L: 555 + var2.overheadTextColor = 0; // L: 556 + var2.overheadTextEffect = 0; // L: 557 + var2.overheadTextCyclesRemaining = 150; // L: 558 + } + + int var14; + if ((var3 & 8) != 0) { // L: 560 + var5 = var0.method7715(); // L: 561 + if (var5 == 65535) { // L: 562 + var5 = -1; + } + + var14 = var0.method7742(); // L: 563 + GrandExchangeOfferOwnWorldComparator.performPlayerAnimation(var2, var5, var14); // L: 564 + } + + if ((var3 & 16384) != 0) { // L: 566 + class193[] var15 = Players.field1286; // L: 567 + class193[] var21 = new class193[]{class193.field2185, class193.field2187, class193.field2186, class193.field2184}; // L: 571 + var15[var1] = (class193)MusicPatchPcmStream.findEnumerated(var21, var0.method7708()); // L: 573 + } + + if ((var3 & 32) != 0) { // L: 575 + var2.targetIndex = var0.method7713(); // L: 576 + if (var2.targetIndex == 65535) { // L: 577 + var2.targetIndex = -1; + } + } + + if ((var3 & 4) != 0) { // L: 579 + var5 = var0.method7773(); // L: 580 + int var16; + int var19; + int var20; + if (var5 > 0) { // L: 581 + for (var14 = 0; var14 < var5; ++var14) { // L: 582 + var8 = -1; // L: 584 + var9 = -1; // L: 585 + var20 = -1; // L: 586 + var19 = var0.readUShortSmart(); // L: 587 + if (var19 == 32767) { // L: 588 + var19 = var0.readUShortSmart(); // L: 589 + var9 = var0.readUShortSmart(); // L: 590 + var8 = var0.readUShortSmart(); // L: 591 + var20 = var0.readUShortSmart(); // L: 592 + } else if (var19 != 32766) { // L: 594 + var9 = var0.readUShortSmart(); // L: 595 + } else { + var19 = -1; // L: 597 + } + + var16 = var0.readUShortSmart(); // L: 598 + var2.addHitSplat(var19, var9, var8, var20, Client.cycle, var16); // L: 599 + } + } + + var14 = var0.readUnsignedByte(); // L: 602 + if (var14 > 0) { // L: 603 + for (var19 = 0; var19 < var14; ++var19) { // L: 604 + var8 = var0.readUShortSmart(); // L: 605 + var9 = var0.readUShortSmart(); // L: 606 + if (var9 != 32767) { // L: 607 + var20 = var0.readUShortSmart(); // L: 608 + var16 = var0.readUnsignedByte(); // L: 609 + var12 = var9 > 0 ? var0.method7773() : var16; // L: 610 + var2.addHealthBar(var8, Client.cycle, var9, var20, var16, var12); // L: 611 + } else { + var2.removeHealthBar(var8); // L: 613 + } + } + } + } + + if (var2.field1070) { // L: 617 + if (var4 == 127) { // L: 618 + var2.resetPath(var2.tileX, var2.tileY); + } else { + class193 var22; + if (var4 != class193.field2186.field2183) { // L: 621 + class193[] var18 = new class193[]{class193.field2185, class193.field2187, class193.field2186, class193.field2184}; // L: 624 + var22 = (class193)MusicPatchPcmStream.findEnumerated(var18, var4); // L: 626 + } else { + var22 = Players.field1286[var1]; // L: 628 + } + + var2.method2125(var2.tileX, var2.tileY, var22); // L: 629 + } + } + + } // L: 633 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 405690230e..f7de8f77aa 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,61 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jv") @Implements("LoginPacket") public class LoginPacket implements class261 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljx;" - ) - public static final LoginPacket field3135; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljx;" - ) - static final LoginPacket field3132; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljx;" - ) - public static final LoginPacket field3133; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljx;" - ) - public static final LoginPacket field3134; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) public static final LoginPacket field3137; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) - static final LoginPacket field3136; + static final LoginPacket field3131; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + public static final LoginPacket field3132; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Ljx;" + descriptor = "Ljv;" + ) + public static final LoginPacket field3133; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + public static final LoginPacket field3134; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + static final LoginPacket field3130; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "[Ljv;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -441279243 + intValue = 696686347 ) @Export("id") public final int id; static { - field3135 = new LoginPacket(14, 0); // L: 5 - field3132 = new LoginPacket(15, 4); // L: 6 - field3133 = new LoginPacket(16, -2); // L: 7 - field3134 = new LoginPacket(18, -2); // L: 8 - field3137 = new LoginPacket(19, -2); // L: 9 - field3136 = new LoginPacket(27, 0); // L: 10 + field3137 = new LoginPacket(14, 0); // L: 5 + field3131 = new LoginPacket(15, 4); // L: 6 + field3132 = new LoginPacket(16, -2); // L: 7 + field3133 = new LoginPacket(18, -2); // L: 8 + field3134 = new LoginPacket(19, -2); // L: 9 + field3130 = new LoginPacket(27, 0); // L: 10 LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = VertexNormal.method4495(); // L: 15 + LoginPacket[] var0 = class127.method2836(); // L: 15 for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 @@ -73,4 +73,37 @@ public class LoginPacket implements class261 { LoginPacket(int var1, int var2) { this.id = var1; // L: 26 } // L: 27 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpz;I)I", + garbageValue = "-1030532734" + ) + static int method5195(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 187 + int var2; + if (var1 == 0) { // L: 189 + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); // L: 190 + } else if (var1 == 2) { // L: 191 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 192 + } + + return var2; // L: 193 + } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "16" + ) + static void method5192() { + if (Client.renderSelf) { // L: 4767 + ArchiveLoader.addPlayerToScene(GrandExchangeEvents.localPlayer, false); // L: 4768 + } + + } // L: 4770 } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 954ac64f54..2222439435 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,81 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("co") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("sh") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "Lbk;" + descriptor = "Llx;" ) - @Export("decimator") - static Decimator decimator; + @Export("archive7") + static Archive archive7; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lqx;" + descriptor = "[Lqq;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("d") - int[] field1222; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -265907793 - ) - int field1218; - @ObfuscatedName("u") - int[] field1223; - @ObfuscatedName("r") - int[] field1214; - @ObfuscatedName("k") - int[] field1215; - @ObfuscatedName("x") - int[] field1216; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1041028247 - ) - int field1217; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1552540857 - ) - int field1213; - @ObfuscatedName("p") - int[] field1230; @ObfuscatedName("s") - int[] field1220; - @ObfuscatedName("b") + int[] field1196; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1097615297 + ) + int field1197; + @ObfuscatedName("q") int[] field1206; + @ObfuscatedName("o") + int[] field1199; + @ObfuscatedName("r") + int[] field1200; + @ObfuscatedName("p") + int[] field1207; @ObfuscatedName("w") - int[] field1224; + @ObfuscatedGetter( + intValue = -1370547723 + ) + int field1202; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 816290751 + ) + int field1201; + @ObfuscatedName("d") + int[] field1204; + @ObfuscatedName("m") + int[] field1198; + @ObfuscatedName("u") + int[] field1205; + @ObfuscatedName("t") + int[] field1191; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1422508409 + ) + int field1208; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1378268659 + ) + int field1209; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1000266587 + intValue = 131127333 ) - int field1219; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1531939327 - ) - int field1212; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1469411093 - ) - int field1225; + int field1210; @ObfuscatedSignature( - descriptor = "([Lqx;)V" + descriptor = "([Lqq;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1222 = new int[256]; // L: 13 - this.field1218 = 0; - this.field1217 = 0; // L: 19 - this.field1213 = 0; // L: 20 - this.field1219 = 0; // L: 25 - this.field1212 = 0; // L: 26 - this.field1225 = 0; // L: 27 + this.field1196 = new int[256]; // L: 13 + this.field1197 = 0; // L: 14 + this.field1202 = 0; // L: 19 + this.field1201 = 0; // L: 20 + this.field1208 = 0; // L: 25 + this.field1209 = 0; // L: 26 + this.field1210 = 0; // L: 27 this.sprites = var1; // L: 30 this.initColors(); // L: 31 } // L: 32 @@ -86,132 +86,132 @@ public class LoginScreenAnimation { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-373411342" + garbageValue = "-1658294303" ) @Export("initColors") void initColors() { - this.field1214 = new int[256]; // L: 35 + this.field1199 = new int[256]; // L: 35 int var1; for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1214[var1] = var1 * 262144; + this.field1199[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1214[var1 + 64] = var1 * 1024 + 16711680; + this.field1199[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1214[var1 + 128] = var1 * 4 + 16776960; + this.field1199[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1214[var1 + 192] = 16777215; + this.field1199[var1 + 192] = 16777215; } - this.field1215 = new int[256]; // L: 40 + this.field1200 = new int[256]; // L: 40 for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1215[var1] = var1 * 1024; + this.field1200[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1215[var1 + 64] = var1 * 4 + 65280; + this.field1200[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1215[var1 + 128] = var1 * 262144 + 65535; + this.field1200[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1215[var1 + 192] = 16777215; + this.field1200[var1 + 192] = 16777215; } - this.field1216 = new int[256]; // L: 45 + this.field1207 = new int[256]; // L: 45 for (var1 = 0; var1 < 64; ++var1) { // L: 46 - this.field1216[var1] = var1 * 4; + this.field1207[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { // L: 47 - this.field1216[var1 + 64] = var1 * 262144 + 255; + this.field1207[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { // L: 48 - this.field1216[var1 + 128] = var1 * 1024 + 16711935; + this.field1207[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { // L: 49 - this.field1216[var1 + 192] = 16777215; + this.field1207[var1 + 192] = 16777215; } - this.field1223 = new int[256]; - this.field1219 = 0; // L: 51 - this.field1206 = new int[32768]; // L: 52 - this.field1224 = new int[32768]; // L: 53 - this.method2227((IndexedSprite)null); // L: 54 - this.field1230 = new int[32768]; // L: 55 - this.field1220 = new int[32768]; // L: 56 + this.field1206 = new int[256]; // L: 50 + this.field1208 = 0; // L: 51 + this.field1205 = new int[32768]; // L: 52 + this.field1191 = new int[32768]; // L: 53 + this.method2200((IndexedSprite)null); // L: 54 + this.field1204 = new int[32768]; // L: 55 + this.field1198 = new int[32768]; // L: 56 } // L: 57 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-374608466" + garbageValue = "1316000316" ) - void method2230() { - this.field1214 = null; // L: 60 - this.field1215 = null; // L: 61 - this.field1216 = null; // L: 62 - this.field1223 = null; // L: 63 - this.field1206 = null; // L: 64 - this.field1224 = null; // L: 65 - this.field1230 = null; // L: 66 - this.field1220 = null; // L: 67 - this.field1219 = 0; // L: 68 - this.field1212 = 0; // L: 69 + void method2193() { + this.field1199 = null; // L: 60 + this.field1200 = null; // L: 61 + this.field1207 = null; // L: 62 + this.field1206 = null; // L: 63 + this.field1205 = null; // L: 64 + this.field1191 = null; // L: 65 + this.field1204 = null; // L: 66 + this.field1198 = null; // L: 67 + this.field1208 = 0; // L: 68 + this.field1209 = 0; // L: 69 } // L: 70 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1146036758" + garbageValue = "-168793986" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1230 == null) { // L: 73 + if (this.field1204 == null) { // L: 73 this.initColors(); // L: 74 } - if (this.field1225 == 0) { // L: 76 - this.field1225 = var2; // L: 77 + if (this.field1210 == 0) { // L: 76 + this.field1210 = var2; // L: 77 } - int var3 = var2 - this.field1225; // L: 79 + int var3 = var2 - this.field1210; // L: 79 if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1225 = var2; // L: 81 + this.field1210 = var2; // L: 81 if (var3 > 0) { // L: 82 - this.method2222(var3); // L: 83 + this.method2195(var3); // L: 83 } - this.method2248(var1); // L: 85 + this.method2222(var1); // L: 85 } // L: 86 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2036498006" + descriptor = "(IB)V", + garbageValue = "0" ) - final void method2222(int var1) { - this.field1219 += var1 * 128; // L: 89 + final void method2195(int var1) { + this.field1208 += 128 * var1; // L: 89 int var2; - if (this.field1219 > this.field1206.length) { // L: 90 - this.field1219 -= this.field1206.length; // L: 91 + if (this.field1208 > this.field1205.length) { // L: 90 + this.field1208 -= this.field1205.length; // L: 91 var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2227(this.sprites[var2]); // L: 93 + this.method2200(this.sprites[var2]); // L: 93 } var2 = 0; // L: 95 @@ -220,12 +220,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1230[var3 + var2] - this.field1206[var2 + this.field1219 & this.field1206.length - 1] * var1 / 6; // L: 99 + var6 = this.field1204[var2 + var3] - this.field1205[var2 + this.field1208 & this.field1205.length - 1] * var1 / 6; // L: 99 if (var6 < 0) { // L: 100 var6 = 0; } - this.field1230[var2++] = var6; // L: 101 + this.field1204[var2++] = var6; // L: 101 } byte var15 = 10; // L: 103 @@ -239,42 +239,42 @@ public class LoginScreenAnimation { for (int var9 = 0; var9 < 128; ++var9) { // L: 107 var10 = (int)(Math.random() * 100.0D); // L: 108 if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 - this.field1230[var9 + var8] = 255; + this.field1204[var9 + var8] = 255; } else { - this.field1230[var8 + var9] = 0; // L: 110 + this.field1204[var9 + var8] = 0; // L: 110 } } } - if (this.field1217 > 0) { // L: 113 - this.field1217 -= var1 * 4; + if (this.field1202 > 0) { // L: 113 + this.field1202 -= var1 * 4; } - if (this.field1213 > 0) { // L: 114 - this.field1213 -= var1 * 4; + if (this.field1201 > 0) { // L: 114 + this.field1201 -= var1 * 4; } - if (this.field1217 == 0 && this.field1213 == 0) { // L: 115 + if (this.field1202 == 0 && this.field1201 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 - this.field1217 = 1024; + this.field1202 = 1024; } if (var7 == 1) { // L: 118 - this.field1213 = 1024; + this.field1201 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 - this.field1222[var7] = this.field1222[var7 + var1]; + this.field1196[var7] = this.field1196[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1222[var7] = (int)(Math.sin((double)this.field1218 / 14.0D) * 16.0D + Math.sin((double)this.field1218 / 15.0D) * 14.0D + Math.sin((double)this.field1218 / 16.0D) * 12.0D); // L: 122 - ++this.field1218; // L: 123 + this.field1196[var7] = (int)(Math.sin((double)this.field1197 / 14.0D) * 16.0D + Math.sin((double)this.field1197 / 15.0D) * 14.0D + Math.sin((double)this.field1197 / 16.0D) * 12.0D); // L: 122 + ++this.field1197; // L: 123 } - this.field1212 += var1; // L: 125 + this.field1209 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -284,13 +284,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1212 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1209 * 100; ++var11) { // L: 131 var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1230[var12 + (var13 << 7)] = 192; // L: 134 + this.field1204[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1212 = 0; // L: 136 + this.field1209 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -298,16 +298,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; // L: 139 for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var14 + var7 < 128) { // L: 141 - var12 += this.field1230[var14 + var13 + var7]; + if (var7 + var14 < 128) { // L: 141 + var12 += this.field1204[var7 + var14 + var13]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1230[var14 + var13 - (var7 + 1)]; + var12 -= this.field1204[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 - this.field1220[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1198[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -318,15 +318,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { // L: 148 var14 = var13 * 128; // L: 149 if (var13 + var7 < 256) { // L: 150 - var12 += this.field1220[var7 * 128 + var14 + var11]; + var12 += this.field1198[var7 * 128 + var11 + var14]; } if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1220[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1198[var11 + var14 - (var7 + 1) * 128]; } - if (var13 >= 0) { - this.field1230[var14 + var11] = var12 / (var7 * 2 + 1); // L: 152 + if (var13 >= 0) { // L: 152 + this.field1204[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -334,66 +334,66 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "19" + descriptor = "(IIII)I", + garbageValue = "620136463" ) - final int method2223(int var1, int var2, int var3) { + final int method2196(int var1, int var2, int var3) { int var4 = 256 - var3; // L: 159 - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160 + return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2138282769" + descriptor = "(IB)V", + garbageValue = "-46" ) - final void method2248(int var1) { - int var2 = this.field1223.length; // L: 164 - if (this.field1217 > 0) { // L: 165 - this.method2225(this.field1217, this.field1215); // L: 166 - } else if (this.field1213 > 0) { // L: 168 - this.method2225(this.field1213, this.field1216); // L: 169 + final void method2222(int var1) { + int var2 = this.field1206.length; // L: 164 + if (this.field1202 > 0) { // L: 165 + this.method2198(this.field1202, this.field1200); // L: 166 + } else if (this.field1201 > 0) { // L: 168 + this.method2198(this.field1201, this.field1207); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1223[var3] = this.field1214[var3]; + this.field1206[var3] = this.field1199[var3]; } } - this.method2249(var1); // L: 174 + this.method2199(var1); // L: 174 } // L: 175 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I[II)V", - garbageValue = "1674657579" + garbageValue = "-2116901787" ) - final void method2225(int var1, int[] var2) { - int var3 = this.field1223.length; // L: 178 + final void method2198(int var1, int[] var2) { + int var3 = this.field1206.length; // L: 178 for (int var4 = 0; var4 < var3; ++var4) { // L: 179 if (var1 > 768) { // L: 180 - this.field1223[var4] = this.method2223(this.field1214[var4], var2[var4], 1024 - var1); + this.field1206[var4] = this.method2196(this.field1199[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1223[var4] = var2[var4]; // L: 181 + this.field1206[var4] = var2[var4]; // L: 181 } else { - this.field1223[var4] = this.method2223(var2[var4], this.field1214[var4], 256 - var1); // L: 182 + this.field1206[var4] = this.method2196(var2[var4], this.field1199[var4], 256 - var1); // L: 182 } } } // L: 184 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1340384043" + garbageValue = "-922347681" ) - final void method2249(int var1) { + final void method2199(int var1) { int var2 = 0; // L: 187 for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1222[var3] / 256; // L: 189 + int var4 = (256 - var3) * this.field1196[var3] / 256; // L: 189 int var5 = var4 + var1; // L: 190 int var6 = 0; // L: 191 int var7 = 128; // L: 192 @@ -402,22 +402,22 @@ public class LoginScreenAnimation { var5 = 0; // L: 195 } - if (var5 + 128 >= SpotAnimationDefinition.rasterProvider.width) { // L: 197 - var7 = SpotAnimationDefinition.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= FontName.rasterProvider.width) { // L: 197 + var7 = FontName.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * SpotAnimationDefinition.rasterProvider.width; // L: 200 + int var8 = var5 + (var3 + 8) * FontName.rasterProvider.width; // L: 200 var2 += var6; // L: 201 for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1230[var2++]; // L: 203 + int var10 = this.field1204[var2++]; // L: 203 int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204 if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205 int var12 = var10; // L: 206 int var13 = 256 - var10; // L: 207 - var10 = this.field1223[var10]; // L: 208 - int var14 = SpotAnimationDefinition.rasterProvider.pixels[var8]; // L: 209 - SpotAnimationDefinition.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210 + var10 = this.field1206[var10]; // L: 208 + int var14 = FontName.rasterProvider.pixels[var8]; // L: 209 + FontName.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -428,21 +428,21 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lqx;I)V", - garbageValue = "-2128522591" + descriptor = "(Lqq;B)V", + garbageValue = "-36" ) - final void method2227(IndexedSprite var1) { + final void method2200(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1206.length; ++var2) { // L: 219 - this.field1206[var2] = 0; + for (var2 = 0; var2 < this.field1205.length; ++var2) { // L: 219 + this.field1205[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1206[var3] = (int)(Math.random() * 256.0D); // L: 222 + this.field1205[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; @@ -451,13 +451,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { // L: 225 for (var4 = 1; var4 < 127; ++var4) { // L: 226 var5 = var4 + (var3 << 7); // L: 227 - this.field1224[var5] = (this.field1206[var5 - 128] + this.field1206[var5 + 1] + this.field1206[var5 + 128] + this.field1206[var5 - 1]) / 4; // L: 228 + this.field1191[var5] = (this.field1205[var5 + 1] + this.field1205[var5 + 128] + this.field1205[var5 - 128] + this.field1205[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1206; // L: 231 - this.field1206 = this.field1224; // L: 232 - this.field1224 = var8; // L: 233 + int[] var8 = this.field1205; // L: 231 + this.field1205 = this.field1191; // L: 232 + this.field1191 = var8; // L: 233 } if (var1 != null) { // L: 235 @@ -469,43 +469,11 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; // L: 240 int var6 = var3 + var1.yOffset + 16; // L: 241 int var7 = var5 + (var6 << 7); // L: 242 - this.field1206[var7] = 0; // L: 243 + this.field1205[var7] = 0; // L: 243 } } } } } // L: 248 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Lfg;", - garbageValue = "8" - ) - static HorizontalAlignment[] method2235() { - return new HorizontalAlignment[]{HorizontalAlignment.field1900, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1904}; // L: 14 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Z", - garbageValue = "119" - ) - static boolean method2247(String var0, int var1) { - return class154.method3128(var0, var1, "openjs"); // L: 50 - } - - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "-26460" - ) - static final void method2240(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8032 - 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) { // L: 8033 - Client.field651[var4] = true; - } - } - - } // L: 8035 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index b2326916fb..51aa1794e6 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("pa") +@ObfuscatedName("pe") @Implements("LoginType") public class LoginType { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static final LoginType field4552; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static final LoginType field4554; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static final LoginType field4551; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static final LoginType field4555; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) static final LoginType field4556; - @ObfuscatedName("d") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) - static final LoginType field4557; + static final LoginType field4550; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) - static final LoginType field4558; - @ObfuscatedName("u") + static final LoginType field4552; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpe;" ) - public static final LoginType field4559; - @ObfuscatedName("r") + static final LoginType field4551; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lpe;" + ) + static final LoginType field4548; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lpe;" + ) + static final LoginType field4554; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lpe;" + ) + static final LoginType field4553; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lpe;" + ) + public static final LoginType field4555; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 722837247 + intValue = 475165021 ) - final int field4560; - @ObfuscatedName("k") - final String field4561; + final int field4557; + @ObfuscatedName("r") + final String field4558; static { - oldscape = new LoginType(8, 0, "", ""); // L: 5 - field4552 = new LoginType(5, 1, "", ""); // L: 6 - field4554 = new LoginType(4, 2, "", ""); // L: 7 - field4551 = new LoginType(1, 3, "", ""); // L: 8 - field4555 = new LoginType(0, 4, "", ""); // L: 9 - field4556 = new LoginType(3, 5, "", ""); // L: 10 - field4557 = new LoginType(6, 6, "", ""); // L: 11 - field4558 = new LoginType(2, 7, "", ""); // L: 12 - field4559 = new LoginType(7, -1, "", "", true, new LoginType[]{oldscape, field4552, field4554, field4555, field4551}); // L: 13 + oldscape = new LoginType(7, 0, "", ""); // L: 5 + field4556 = new LoginType(5, 1, "", ""); // L: 6 + field4550 = new LoginType(4, 2, "", ""); // L: 7 + field4552 = new LoginType(2, 3, "", ""); // L: 8 + field4551 = new LoginType(8, 4, "", ""); // L: 9 + field4548 = new LoginType(1, 5, "", ""); // L: 10 + field4554 = new LoginType(6, 6, "", ""); // L: 11 + field4553 = new LoginType(3, 7, "", ""); // L: 12 + field4555 = new LoginType(0, -1, "", "", true, new LoginType[]{oldscape, field4556, field4550, field4551, field4552}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4560 = var1; // L: 18 - this.field4561 = var4; // L: 19 + this.field4557 = var1; // L: 18 + this.field4558 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpa;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpe;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4560 = var1; // L: 23 - this.field4561 = var4; // L: 24 + this.field4557 = var1; // L: 23 + this.field4558 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4561; // L: 29 + return this.field4558; // L: 28 } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 038887c22d..d962449327 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,56 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("ba") @Implements("MenuAction") public class MenuAction { + @ObfuscatedName("pz") + @ObfuscatedSignature( + descriptor = "Lfo;" + ) + @Export("mouseWheel") + static class158 mouseWheel; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1395213587 + intValue = -1429096249 ) @Export("param0") int param0; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1235070557 + intValue = 2131658559 ) @Export("param1") int param1; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1780359583 + intValue = 1741045209 ) @Export("opcode") int opcode; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -538792745 + intValue = -1117975603 ) @Export("identifier") int identifier; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("action") String action; MenuAction() { - } // L: 11995 + } // L: 12699 - @ObfuscatedName("h") + @ObfuscatedName("hk") @ObfuscatedSignature( - descriptor = "(CS)C", - garbageValue = "1843" + descriptor = "(I)V", + garbageValue = "942696763" ) - static char method1877(char var0) { - if (var0 == 198) { // L: 119 - return 'E'; - } else if (var0 == 230) { // L: 120 - return 'e'; - } else if (var0 == 223) { - return 's'; // L: 121 - } else if (var0 == 338) { // L: 122 - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 123 124 + static final void method1907() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7751 7752 7795 + if (var0.hitpoints > 0) { // L: 7753 + --var0.hitpoints; + } + + boolean var1; + int var2; + int var3; + ObjectComposition var4; + if (var0.hitpoints == 0) { // L: 7754 + if (var0.objectId >= 0) { // L: 7756 + var2 = var0.objectId; // L: 7758 + var3 = var0.field1105; // L: 7759 + var4 = class146.getObjectDefinition(var2); // L: 7761 + if (var3 == 11) { // L: 7762 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 7763 + var3 = 4; + } + + var1 = var4.method3664(var3); // L: 7764 + if (!var1) { // L: 7766 + continue; + } + } + + ClanChannel.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1104, var0.field1105); // L: 7768 + var0.remove(); // L: 7769 + } else { + if (var0.delay > 0) { // L: 7773 + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7774 + if (var0.id >= 0) { // L: 7776 + var2 = var0.id; // L: 7778 + var3 = var0.field1107; // L: 7779 + var4 = class146.getObjectDefinition(var2); // L: 7781 + if (var3 == 11) { // L: 7782 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 7783 + var3 = 4; + } + + var1 = var4.method3664(var3); // L: 7784 + if (!var1) { // L: 7786 + continue; + } + } + + ClanChannel.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1107); // L: 7788 + var0.delay = -1; // L: 7789 + if (var0.id == var0.objectId && var0.objectId == -1) { // L: 7790 + var0.remove(); + } else if (var0.id == var0.objectId && var0.orientation == var0.field1104 && var0.field1105 == var0.field1107) { // L: 7791 + var0.remove(); + } + } + } } - } + + } // L: 7797 } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index ee0bca005d..866c597c52 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,53 +1,44 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("be") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("bb") - @ObfuscatedGetter( - intValue = 2074233213 - ) - static int field458; - @ObfuscatedName("hz") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("hb") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("is") + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "[Lqx;" + descriptor = "Llx;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; + @Export("archive11") + static Archive archive11; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 592721891 + intValue = 1496139277 ) @Export("count") int count; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1202817007 + intValue = -1765114105 ) @Export("cycle") int cycle; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1449287579 + intValue = -820996673 ) @Export("type") int type; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("sender") String sender; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqb;" ) @Export("senderUsername") Username senderUsername; @@ -57,82 +48,82 @@ public class Message extends DualNode { ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lni;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("prefix") String prefix; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("text") String text; Message(int var1, String var2, String var3, String var4) { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 13 this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 14 - this.set(var1, var2, var3, var4); + this.set(var1, var2, var3, var4); // L: 19 } // L: 20 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1604775209" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "-56" ) @Export("set") void set(int var1, String var2, String var3, String var4) { int var5 = ++Messages.Messages_count - 1; this.count = var5; // L: 27 - this.cycle = Client.cycle; // L: 28 - this.type = var1; // L: 29 - this.sender = var2; // L: 30 - this.fillSenderUsername(); // L: 31 - this.prefix = var3; // L: 32 - this.text = var4; // L: 33 - this.clearIsFromFriend(); // L: 34 - this.clearIsFromIgnored(); // L: 35 - } // L: 36 + this.cycle = Client.cycle; + this.type = var1; + this.sender = var2; + this.fillSenderUsername(); + this.prefix = var3; + this.text = var4; + this.clearIsFromFriend(); + this.clearIsFromIgnored(); + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1449740168" + garbageValue = "1771611339" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-58" + garbageValue = "46" ) @Export("isFromFriend") final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 - this.fillIsFromFriend(); + if (this.isFromFriend0 == TriBool.TriBool_unknown) { + this.fillIsFromFriend(); // L: 44 } return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1170229720" + garbageValue = "-799651703" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = class155.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + this.isFromFriend0 = Decimator.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 } // L: 51 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-387175416" + garbageValue = "-1801173346" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { @@ -142,7 +133,7 @@ public class Message extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2027287720" + garbageValue = "-1804603647" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -153,240 +144,83 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1661700203" + garbageValue = "206265672" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = class155.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + this.isFromIgnored0 = Decimator.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 } // L: 66 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-47" + descriptor = "(I)V", + garbageValue = "-1910614922" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(ObjectSound.method1734(this.sender), class83.loginType); // L: 69 + this.senderUsername = new Username(class160.method3280(this.sender), class122.loginType); // L: 69 } else { this.senderUsername = null; // L: 70 } } // L: 71 - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(DDIB)[D", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-717808877" ) - public static double[] method1112(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; // L: 9 - double[] var6 = new double[var5]; // L: 10 - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - double var15 = ((double)var7 - var0) / var2; // L: 17 - double var13 = Math.exp(var15 * -var15 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 19 - double var11 = var13 / var2; // L: 21 - var6[var8] = var11; // L: 23 - ++var7; // L: 11 - } - - return var6; // L: 25 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([BI)Lbo;", - garbageValue = "958317851" - ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); // L: 108 - Buffer var2 = new Buffer(var0); // L: 109 - var2.offset = var2.array.length - 2; // L: 110 - int var3 = var2.readUnsignedShort(); // L: 111 - int var4 = var2.array.length - 2 - var3 - 12; // L: 112 - var2.offset = var4; // L: 113 - int var5 = var2.readInt(); // L: 114 - var1.localIntCount = var2.readUnsignedShort(); // L: 115 - var1.localStringCount = var2.readUnsignedShort(); // L: 116 - var1.intArgumentCount = var2.readUnsignedShort(); // L: 117 - var1.stringArgumentCount = var2.readUnsignedShort(); // L: 118 - int var6 = var2.readUnsignedByte(); // L: 119 - int var7; - int var8; - if (var6 > 0) { // L: 120 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 121 - - for (var7 = 0; var7 < var6; ++var7) { // L: 122 - var8 = var2.readUnsignedShort(); // L: 123 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? Login.method1894(var8) : 1); // L: 124 - var1.switches[var7] = var9; // L: 125 - - while (var8-- > 0) { // L: 126 - int var10 = var2.readInt(); // L: 127 - int var11 = var2.readInt(); // L: 128 - var9.put(new IntegerNode(var11), (long)var10); // L: 129 - } - } - } - - var2.offset = 0; // L: 133 - var1.field959 = var2.readStringCp1252NullTerminatedOrNull(); // L: 134 - var1.opcodes = new int[var5]; // L: 135 - var1.intOperands = new int[var5]; // L: 136 - var1.stringOperands = new String[var5]; // L: 137 - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 138 139 144 - var8 = var2.readUnsignedShort(); // L: 140 - if (var8 == 3) { // L: 141 - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); // L: 142 + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 22 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 143 - } - } + File var2 = new File(class120.FileSystem_cacheDir, var0); // L: 25 + RandomAccessFile var3 = null; // L: 26 - return var1; // L: 146 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "7" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 - return var1 == null ? 0 : var1.size(); // L: 45 46 - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;S)V", - garbageValue = "1440" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class143.getWidgetChild(var1, var2); // L: 9082 - if (var5 != null) { // L: 9083 - if (var5.onOp != null) { // L: 9084 - ScriptEvent var6 = new ScriptEvent(); // L: 9085 - var6.widget = var5; // L: 9086 - var6.opIndex = var0; // L: 9087 - var6.targetName = var4; // L: 9088 - var6.args = var5.onOp; // L: 9089 - class1.runScriptEvent(var6); // L: 9090 - } - - boolean var8 = true; // L: 9092 - if (var5.contentType > 0) { // L: 9093 - var8 = Frames.method4319(var5); - } - - if (var8) { // L: 9094 - if (class142.method3004(WorldMapSection2.getWidgetFlags(var5), var0 - 1)) { // L: 9095 - PacketBufferNode var7; - if (var0 == 1) { // L: 9098 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2908, Client.packetWriter.isaacCipher); // L: 9100 - var7.packetBuffer.writeInt(var1); // L: 9101 - var7.packetBuffer.writeShort(var2); // L: 9102 - var7.packetBuffer.writeShort(var3); // L: 9103 - Client.packetWriter.addNode(var7); // L: 9104 - } - - if (var0 == 2) { // L: 9106 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2945, Client.packetWriter.isaacCipher); // L: 9108 - var7.packetBuffer.writeInt(var1); // L: 9109 - var7.packetBuffer.writeShort(var2); // L: 9110 - var7.packetBuffer.writeShort(var3); // L: 9111 - Client.packetWriter.addNode(var7); // L: 9112 - } - - if (var0 == 3) { // L: 9114 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2941, Client.packetWriter.isaacCipher); // L: 9116 - var7.packetBuffer.writeInt(var1); // L: 9117 - var7.packetBuffer.writeShort(var2); // L: 9118 - var7.packetBuffer.writeShort(var3); // L: 9119 - Client.packetWriter.addNode(var7); // L: 9120 - } - - if (var0 == 4) { // L: 9122 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9124 - var7.packetBuffer.writeInt(var1); // L: 9125 - var7.packetBuffer.writeShort(var2); // L: 9126 - var7.packetBuffer.writeShort(var3); // L: 9127 - Client.packetWriter.addNode(var7); // L: 9128 - } - - if (var0 == 5) { // L: 9130 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9132 - var7.packetBuffer.writeInt(var1); // L: 9133 - var7.packetBuffer.writeShort(var2); // L: 9134 - var7.packetBuffer.writeShort(var3); // L: 9135 - Client.packetWriter.addNode(var7); // L: 9136 - } - - if (var0 == 6) { // L: 9138 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2944, Client.packetWriter.isaacCipher); // L: 9140 - var7.packetBuffer.writeInt(var1); // L: 9141 - var7.packetBuffer.writeShort(var2); // L: 9142 - var7.packetBuffer.writeShort(var3); // L: 9143 - Client.packetWriter.addNode(var7); // L: 9144 - } - - if (var0 == 7) { // L: 9146 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2982, Client.packetWriter.isaacCipher); // L: 9148 - var7.packetBuffer.writeInt(var1); // L: 9149 - var7.packetBuffer.writeShort(var2); // L: 9150 - var7.packetBuffer.writeShort(var3); // L: 9151 - Client.packetWriter.addNode(var7); // L: 9152 - } - - if (var0 == 8) { // L: 9154 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 9156 - var7.packetBuffer.writeInt(var1); // L: 9157 - var7.packetBuffer.writeShort(var2); // L: 9158 - var7.packetBuffer.writeShort(var3); // L: 9159 - Client.packetWriter.addNode(var7); // L: 9160 - } - - if (var0 == 9) { // L: 9162 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 9164 - var7.packetBuffer.writeInt(var1); // L: 9165 - var7.packetBuffer.writeShort(var2); // L: 9166 - var7.packetBuffer.writeShort(var3); // L: 9167 - Client.packetWriter.addNode(var7); // L: 9168 - } - - if (var0 == 10) { // L: 9170 - var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2929, Client.packetWriter.isaacCipher); // L: 9172 - var7.packetBuffer.writeInt(var1); // L: 9173 - var7.packetBuffer.writeShort(var2); // L: 9174 - var7.packetBuffer.writeShort(var3); // L: 9175 - Client.packetWriter.addNode(var7); // L: 9176 + try { + File var4 = new File(var2.getParent()); // L: 28 + if (!var4.exists()) { // L: 29 + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); // L: 30 + int var5 = var3.read(); // L: 31 + var3.seek(0L); // L: 32 + var3.write(var5); // L: 33 + var3.seek(0L); // L: 34 + var3.close(); // L: 35 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36 + return var2; // L: 37 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 41 + var3.close(); // L: 42 + var3 = null; // L: 43 + } + } catch (Exception var7) { // L: 46 } + throw new RuntimeException(); // L: 48 } } } - } // L: 9096 9178 + } - @ObfuscatedName("lq") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-291847238" + descriptor = "(I)[Lkt;", + garbageValue = "620716737" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = ItemContainer.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 11733 - var0.packetBuffer.writeByte(0); // L: 11734 - Client.packetWriter.addNode(var0); // L: 11735 - } // L: 11736 + public static StudioGame[] method1116() { + return new StudioGame[]{StudioGame.oldscape, StudioGame.game4, StudioGame.runescape, StudioGame.game3, StudioGame.game5, StudioGame.stellardawn}; // L: 17 + } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 75fbba42d8..afa11228ef 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,36 +6,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("ce") @Implements("Messages") public class Messages { @ObfuscatedName("v") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmr;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -202962725 + intValue = 1887673835 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("jg") - @ObfuscatedGetter( - intValue = -78187277 + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lkt;" ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + static StudioGame field1305; static { Messages_channels = new HashMap(); // L: 9 @@ -44,41 +43,22 @@ public class Messages { Messages_count = 0; // L: 12 } - @ObfuscatedName("it") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1155417987" + descriptor = "(ZI)V", + garbageValue = "-2020687752" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9075 - var2.packetBuffer.writeIntME(var0); // L: 9076 - var2.packetBuffer.method7795(var1); // L: 9077 - Client.packetWriter.addNode(var2); // L: 9078 - } // L: 9079 - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(IIIILql;Lkw;I)V", - garbageValue = "1883987067" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 11667 - int var6 = Client.camAngleY & 2047; // L: 11668 - int var7 = var3 * var3 + var2 * var2; // L: 11669 - if (var7 <= 6400) { // L: 11670 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11671 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11672 - int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11673 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11674 - if (var7 > 2500) { - var4.method8178(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11675 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11676 - } - - } + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 1123 + Login.Login_response2 = "Enter your username/email & password."; // L: 1124 + Login.Login_response3 = ""; // L: 1125 + Ignored.method6828(2); // L: 1126 + if (var0) { // L: 1127 + Login.Login_password = ""; } - } // L: 11677 + + Players.method2421(); // L: 1128 + class12.method157(); // L: 1129 + } // L: 1130 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index d49001f495..02dafdc247 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("jh") +@ObfuscatedName("jk") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("r") - static final byte[] field3216; + @ObfuscatedName("o") + static final byte[] field3215; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("division") int division; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("trackLengths") int[] trackLengths; @ObfuscatedName("n") - int[] field3217; - @ObfuscatedName("d") - int field3218; - @ObfuscatedName("u") - long field3223; + int[] field3210; + @ObfuscatedName("s") + int field3212; + @ObfuscatedName("q") + long field3214; static { - field3216 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 + field3215 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 } MidiFileReader(byte[] var1) { @@ -53,7 +53,7 @@ public class MidiFileReader { this.buffer.offset = 10; // L: 33 int var2 = this.buffer.readUnsignedShort(); // L: 34 this.division = this.buffer.readUnsignedShort(); // L: 36 - this.field3218 = 500000; // L: 37 + this.field3212 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field3223 = 0L; // L: 48 + this.field3214 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -78,32 +78,32 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field3217 = new int[var2]; // L: 52 + this.field3210 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("clear") void clear() { this.buffer.array = null; // L: 56 this.trackStarts = null; // L: 57 this.trackPositions = null; // L: 58 this.trackLengths = null; // L: 59 - this.field3217 = null; // L: 60 + this.field3210 = null; // L: 60 } // L: 61 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 @@ -115,13 +115,13 @@ public class MidiFileReader { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; if (var2 < 0) { // L: 95 var5 = var2 & 255; // L: 96 - this.field3217[var1] = var5; // L: 97 + this.field3210[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field3217[var1]; // L: 101 + var5 = this.field3210[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method5416(var1, var5); // L: 116 + return this.method5379(var1, var5); // L: 116 } else { int var3 = this.buffer.readVarInt(); // L: 104 if (var5 == 247 && var3 > 0) { // L: 105 int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106 if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107 ++this.buffer.offset; // L: 108 - this.field3217[var1] = var4; // L: 109 - return this.method5416(var1, var4); // L: 110 + this.field3210[var1] = var4; // L: 109 + return this.method5379(var1, var4); // L: 110 } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("k") - int method5416(int var1, int var2) { + @ObfuscatedName("r") + int method5379(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); // L: 128 var4 -= 3; // L: 129 int var6 = this.trackLengths[var1]; // L: 130 - this.field3223 += (long)var6 * (long)(this.field3218 - var5); // L: 131 - this.field3218 = var5; // L: 132 + this.field3214 += (long)var6 * (long)(this.field3212 - var5); // L: 131 + this.field3212 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field3216[var2 - 128]; // L: 139 + byte var3 = field3215[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("x") - long method5444(int var1) { - return this.field3223 + (long)var1 * (long)this.field3218; // L: 147 + @ObfuscatedName("p") + long method5393(int var1) { + return this.field3214 + (long)var1 * (long)this.field3212; // L: 147 } - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -244,15 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("reset") void reset(long var1) { - this.field3223 = var1; // L: 171 + this.field3214 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 for (int var4 = 0; var4 < var3; ++var4) { // L: 173 this.trackLengths[var4] = 0; // L: 174 - this.field3217[var4] = 0; // L: 175 + this.field3210[var4] = 0; // L: 175 this.buffer.offset = this.trackStarts[var4]; // L: 176 this.readTrackLength(var4); // L: 177 this.trackPositions[var4] = this.buffer.offset; // L: 178 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index bc49cfcfb1..a4c025a6d2 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,7 +4,7 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("ji") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { @ObfuscatedName("v") @@ -13,146 +13,146 @@ public class MidiPcmStream extends PcmStream { ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 761028561 + intValue = -748679043 ) - int field3185; - @ObfuscatedName("h") + int field3179; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 450471691 + intValue = 1077722431 ) - int field3186; - @ObfuscatedName("g") - int[] field3187; - @ObfuscatedName("l") - int[] field3197; - @ObfuscatedName("n") - int[] field3189; - @ObfuscatedName("d") - int[] field3209; + int field3180; @ObfuscatedName("f") + int[] field3181; + @ObfuscatedName("b") + int[] field3203; + @ObfuscatedName("n") + int[] field3183; + @ObfuscatedName("s") int[] field3184; - @ObfuscatedName("u") - int[] field3188; - @ObfuscatedName("r") - int[] field3193; - @ObfuscatedName("k") - int[] field3194; - @ObfuscatedName("x") - int[] field3195; - @ObfuscatedName("m") - int[] field3200; + @ObfuscatedName("l") + int[] field3185; @ObfuscatedName("q") - int[] field3201; + int[] field3178; + @ObfuscatedName("o") + int[] field3187; + @ObfuscatedName("r") + int[] field3186; + @ObfuscatedName("p") + int[] field3182; + @ObfuscatedName("x") + int[] field3193; + @ObfuscatedName("a") + int[] field3202; @ObfuscatedName("y") int[] field3192; - @ObfuscatedName("z") - int[] field3190; + @ObfuscatedName("j") + int[] field3189; @ObfuscatedName("e") - int[] field3198; - @ObfuscatedName("t") - int[] field3202; - @ObfuscatedName("i") + int[] field3194; + @ObfuscatedName("z") + int[] field3195; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[[Lju;" + descriptor = "[[Ljn;" ) - MusicPatchNode[][] field3203; - @ObfuscatedName("ac") + MusicPatchNode[][] field3196; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[[Lju;" + descriptor = "[[Ljn;" ) - MusicPatchNode[][] field3204; - @ObfuscatedName("ax") + MusicPatchNode[][] field3197; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljk;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ay") - boolean field3206; - @ObfuscatedName("au") + @ObfuscatedName("aw") + boolean field3199; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1856926235 + intValue = 1021655575 ) @Export("track") int track; - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1471582063 + intValue = -1014777517 ) @Export("trackLength") int trackLength; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - longValue = 1372390408550668693L + longValue = -4285151308752849057L ) - long field3199; - @ObfuscatedName("ar") + long field3188; + @ObfuscatedName("aj") @ObfuscatedGetter( - longValue = -7848885153992378789L + longValue = 1303107017095870899L ) - long field3210; - @ObfuscatedName("ae") + long field3205; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljt;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field3185 = 256; // L: 14 - this.field3186 = 1000000; // L: 15 - this.field3187 = new int[16]; // L: 16 - this.field3197 = new int[16]; // L: 17 - this.field3189 = new int[16]; // L: 18 - this.field3209 = new int[16]; // L: 19 - this.field3184 = new int[16]; // L: 20 - this.field3188 = new int[16]; // L: 21 - this.field3193 = new int[16]; // L: 22 - this.field3194 = new int[16]; // L: 23 - this.field3195 = new int[16]; // L: 24 - this.field3200 = new int[16]; // L: 28 - this.field3201 = new int[16]; // L: 29 + this.field3179 = 256; // L: 14 + this.field3180 = 1000000; // L: 15 + this.field3181 = new int[16]; // L: 16 + this.field3203 = new int[16]; // L: 17 + this.field3183 = new int[16]; // L: 18 + this.field3184 = new int[16]; // L: 19 + this.field3185 = new int[16]; // L: 20 + this.field3178 = new int[16]; // L: 21 + this.field3187 = new int[16]; // L: 22 + this.field3186 = new int[16]; // L: 23 + this.field3182 = new int[16]; // L: 24 + this.field3193 = new int[16]; // L: 28 + this.field3202 = new int[16]; // L: 29 this.field3192 = new int[16]; // L: 30 - this.field3190 = new int[16]; // L: 31 - this.field3198 = new int[16]; // L: 32 - this.field3202 = new int[16]; // L: 33 - this.field3203 = new MusicPatchNode[16][128]; // L: 34 - this.field3204 = new MusicPatchNode[16][128]; // L: 35 - this.midiFile = new MidiFileReader(); // L: 36 + this.field3189 = new int[16]; // L: 31 + this.field3194 = new int[16]; // L: 32 + this.field3195 = new int[16]; // L: 33 + this.field3196 = new MusicPatchNode[16][128]; + this.field3197 = new MusicPatchNode[16][128]; + this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); // L: 42 this.musicPatches = new NodeHashTable(128); // L: 45 - this.method5351(); // L: 46 + this.method5259(); // L: 46 } // L: 47 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-724813069" + descriptor = "(IB)V", + garbageValue = "1" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field3185 = var1; // L: 50 + this.field3179 = var1; // L: 50 } // L: 51 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "2127112295" ) - int method5369() { - return this.field3185; // L: 54 + public int method5264() { + return this.field3179; // L: 54 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljs;Llq;Lan;II)Z", - garbageValue = "887201995" + descriptor = "(Lju;Lln;Lac;IB)Z", + garbageValue = "36" ) @Export("loadMusicTrack") - synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method5489(); // L: 58 + public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method5463(); // L: 58 boolean var5 = true; // L: 59 int[] var6 = null; // L: 60 if (var4 > 0) { // L: 61 @@ -180,7 +180,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var10, (long)var8); // L: 80 } - if (!var9.method5460(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method5427(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } @@ -192,26 +192,26 @@ public class MidiPcmStream extends PcmStream { return var5; // L: 85 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1460535885" + garbageValue = "-1039741430" ) @Export("clearAll") - synchronized void clearAll() { + public synchronized void clearAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 var1.clear(); } } // L: 90 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "30" + descriptor = "(I)V", + garbageValue = "-1531441938" ) @Export("removeAll") - synchronized void removeAll() { + public synchronized void removeAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 var1.remove(); } @@ -220,63 +220,63 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; // L: 469 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; // L: 473 } - @ObfuscatedName("f") - protected synchronized int vmethod5476() { + @ObfuscatedName("l") + protected synchronized int vmethod5441() { return 0; // L: 477 } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field3186 / SecureRandomFuture.field949; // L: 482 + int var4 = this.midiFile.division * this.field3180 / PcmPlayer.field268; // L: 482 do { - long var5 = (long)var3 * (long)var4 + this.field3199; // L: 484 - if (this.field3210 - var5 >= 0L) { // L: 485 - this.field3199 = var5; // L: 486 + long var5 = this.field3188 + (long)var4 * (long)var3; // L: 484 + if (this.field3205 - var5 >= 0L) { // L: 485 + this.field3188 = var5; // L: 486 break; } - int var7 = (int)(((long)var4 + (this.field3210 - this.field3199) - 1L) / (long)var4); // L: 489 - this.field3199 += (long)var4 * (long)var7; // L: 490 + int var7 = (int)((this.field3205 - this.field3188 + (long)var4 - 1L) / (long)var4); // L: 489 + this.field3188 += (long)var4 * (long)var7; // L: 490 this.patchStream.fill(var1, var2, var7); // L: 491 var2 += var7; // L: 492 var3 -= var7; // L: 493 - this.method5364(); // L: 494 + this.method5272(); // L: 494 } while(this.midiFile.isReady()); // L: 495 } this.patchStream.fill(var1, var2, var3); // L: 498 } // L: 499 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljs;ZB)V", - garbageValue = "-52" + descriptor = "(Lju;ZB)V", + garbageValue = "11" ) @Export("setMusicTrack") - synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); // L: 97 this.midiFile.parse(var1.midi); // L: 98 - this.field3206 = var2; // L: 99 - this.field3199 = 0L; // L: 100 + this.field3199 = var2; // L: 99 + this.field3188 = 0L; // L: 100 int var3 = this.midiFile.trackCount(); // L: 101 for (int var4 = 0; var4 < var3; ++var4) { // L: 102 @@ -286,249 +286,249 @@ public class MidiPcmStream extends PcmStream { } this.track = this.midiFile.getPrioritizedTrack(); // L: 107 - this.trackLength = this.midiFile.trackLengths[this.track]; - this.field3210 = this.midiFile.method5444(this.trackLength); - } + this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 + this.field3205 = this.midiFile.method5393(this.trackLength); // L: 109 + } // L: 110 - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field3186 / SecureRandomFuture.field949; // L: 503 + int var2 = this.midiFile.division * this.field3180 / PcmPlayer.field268; // L: 503 do { - long var3 = (long)var1 * (long)var2 + this.field3199; // L: 505 - if (this.field3210 - var3 >= 0L) { // L: 506 - this.field3199 = var3; // L: 507 + long var3 = this.field3188 + (long)var2 * (long)var1; // L: 505 + if (this.field3205 - var3 >= 0L) { // L: 506 + this.field3188 = var3; // L: 507 break; } - int var5 = (int)(((long)var2 + (this.field3210 - this.field3199) - 1L) / (long)var2); // L: 510 - this.field3199 += (long)var2 * (long)var5; // L: 511 + int var5 = (int)((this.field3205 - this.field3188 + (long)var2 - 1L) / (long)var2); // L: 510 + this.field3188 += (long)var5 * (long)var2; // L: 511 this.patchStream.skip(var5); // L: 512 var1 -= var5; // L: 513 - this.method5364(); // L: 514 + this.method5272(); // L: 514 } while(this.midiFile.isReady()); // L: 515 } this.patchStream.skip(var1); // L: 518 } // L: 519 - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "108826747" + garbageValue = "867852143" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); // L: 113 - this.method5351(); // L: 114 + this.method5259(); // L: 114 } // L: 115 - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1770050412" + descriptor = "(B)Z", + garbageValue = "-39" ) @Export("isReady") - synchronized boolean isReady() { + public synchronized boolean isReady() { return this.midiFile.isReady(); // L: 118 } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1895183848" + descriptor = "(IIS)V", + garbageValue = "-25295" ) - public synchronized void method5281(int var1, int var2) { - this.method5282(var1, var2); // L: 122 + public synchronized void method5248(int var1, int var2) { + this.method5249(var1, var2); // L: 122 } // L: 123 - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1146720138" + garbageValue = "2146989537" ) - void method5282(int var1, int var2) { - this.field3209[var1] = var2; // L: 126 - this.field3188[var1] = var2 & -128; // L: 127 - this.method5310(var1, var2); // L: 128 + void method5249(int var1, int var2) { + this.field3184[var1] = var2; // L: 126 + this.field3178[var1] = var2 & -128; // L: 127 + this.method5250(var1, var2); // L: 128 } // L: 129 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1965921844" + garbageValue = "-1072257688" ) - void method5310(int var1, int var2) { - if (var2 != this.field3184[var1]) { // L: 132 - this.field3184[var1] = var2; // L: 133 + void method5250(int var1, int var2) { + if (var2 != this.field3185[var1]) { // L: 132 + this.field3185[var1] = var2; // L: 133 for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field3204[var1][var3] = null; + this.field3197[var1][var3] = null; } } } // L: 136 - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-2030579325" + garbageValue = "887672121" ) - void method5358(int var1, int var2, int var3) { - this.method5286(var1, var2, 64); // L: 139 - if ((this.field3200[var1] & 2) != 0) { // L: 140 + void method5251(int var1, int var2, int var3) { + this.method5252(var1, var2, 64); // L: 139 + if ((this.field3193[var1] & 2) != 0) { // L: 140 for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141 - if (var4.field3240 == var1 && var4.field3253 < 0) { // L: 142 - this.field3203[var1][var4.field3244] = null; // L: 143 - this.field3203[var1][var2] = var4; // L: 144 - int var8 = (var4.field3249 * var4.field3248 >> 12) + var4.field3247; // L: 145 - var4.field3247 += var2 - var4.field3244 << 8; // L: 146 - var4.field3248 = var8 - var4.field3247; // L: 147 - var4.field3249 = 4096; // L: 148 - var4.field3244 = var2; // L: 149 + if (var4.field3248 == var1 && var4.field3249 < 0) { // L: 142 + this.field3196[var1][var4.field3251] = null; // L: 143 + this.field3196[var1][var2] = var4; // L: 144 + int var8 = (var4.field3245 * var4.field3244 >> 12) + var4.field3243; // L: 145 + var4.field3243 += var2 - var4.field3251 << 8; // L: 146 + var4.field3244 = var8 - var4.field3243; // L: 147 + var4.field3245 = 4096; // L: 148 + var4.field3251 = var2; // L: 149 return; // L: 150 } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3184[var1]); // L: 154 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3185[var1]); // L: 154 if (var9 != null) { // L: 155 RawSound var5 = var9.rawSounds[var2]; // L: 156 if (var5 != null) { // L: 157 MusicPatchNode var6 = new MusicPatchNode(); // L: 158 - var6.field3240 = var1; // L: 159 + var6.field3248 = var1; // L: 159 var6.patch = var9; // L: 160 var6.rawSound = var5; // L: 161 - var6.field3242 = var9.field3231[var2]; // L: 162 - var6.field3243 = var9.field3232[var2]; // L: 163 - var6.field3244 = var2; // L: 164 - var6.field3245 = var3 * var3 * var9.field3229[var2] * var9.field3227 + 1024 >> 11; // L: 165 - var6.field3254 = var9.field3230[var2] & 255; // L: 166 - var6.field3247 = (var2 << 8) - (var9.field3228[var2] & 32767); // L: 167 - var6.field3251 = 0; // L: 168 - var6.field3255 = 0; // L: 169 + var6.field3247 = var9.field3224[var2]; // L: 162 + var6.field3239 = var9.field3220[var2]; // L: 163 + var6.field3251 = var2; // L: 164 + var6.field3241 = var3 * var3 * var9.field3223[var2] * var9.field3228 + 1024 >> 11; // L: 165 + var6.field3242 = var9.field3222[var2] & 255; // L: 166 + var6.field3243 = (var2 << 8) - (var9.field3227[var2] & 32767); // L: 167 + var6.field3246 = 0; // L: 168 + var6.field3235 = 0; // L: 169 var6.field3252 = 0; // L: 170 - var6.field3253 = -1; // L: 171 + var6.field3249 = -1; // L: 171 var6.field3250 = 0; // L: 172 - if (this.field3190[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method924(var5, this.method5290(var6), this.method5299(var6), this.method5318(var6)); // L: 174 + if (this.field3189[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method791(var5, this.method5246(var6), this.method5244(var6), this.method5302(var6)); // L: 174 } else { - var6.stream = RawPcmStream.method924(var5, this.method5290(var6), 0, this.method5318(var6)); // L: 177 - this.method5285(var6, var9.field3228[var2] < 0); // L: 178 + var6.stream = RawPcmStream.method791(var5, this.method5246(var6), 0, this.method5302(var6)); // L: 177 + this.method5342(var6, var9.field3227[var2] < 0); // L: 178 } - if (var9.field3228[var2] < 0) { // L: 180 + if (var9.field3227[var2] < 0) { // L: 180 var6.stream.setNumLoops(-1); } - if (var6.field3243 >= 0) { // L: 181 - MusicPatchNode var7 = this.field3204[var1][var6.field3243]; // L: 182 - if (var7 != null && var7.field3253 < 0) { // L: 183 - this.field3203[var1][var7.field3244] = null; // L: 184 - var7.field3253 = 0; // L: 185 + if (var6.field3239 >= 0) { // L: 181 + MusicPatchNode var7 = this.field3197[var1][var6.field3239]; // L: 182 + if (var7 != null && var7.field3249 < 0) { // L: 183 + this.field3196[var1][var7.field3251] = null; // L: 184 + var7.field3249 = 0; // L: 185 } - this.field3204[var1][var6.field3243] = var6; // L: 187 + this.field3197[var1][var6.field3239] = var6; // L: 187 } this.patchStream.queue.addFirst(var6); // L: 189 - this.field3203[var1][var2] = var6; // L: 190 + this.field3196[var1][var2] = var6; // L: 190 } } } // L: 191 - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lju;ZS)V", - garbageValue = "16256" + descriptor = "(Ljn;ZI)V", + garbageValue = "2081023106" ) - void method5285(MusicPatchNode var1, boolean var2) { + void method5342(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; // L: 194 int var4; - if (var2 && var1.rawSound.field266) { // L: 196 + if (var2 && var1.rawSound.field254) { // L: 196 int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)var5 * (long)this.field3190[var1.field3240] >> 6); // L: 198 + var4 = (int)((long)var5 * (long)this.field3189[var1.field3248] >> 6); // L: 198 var3 <<= 8; // L: 199 if (var4 >= var3) { // L: 200 var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method824(); // L: 202 + var1.stream.method800(); // L: 202 } } else { - var4 = (int)((long)var3 * (long)this.field3190[var1.field3240] >> 6); // L: 206 + var4 = (int)((long)this.field3189[var1.field3248] * (long)var3 >> 6); // L: 206 } - var1.stream.method897(var4); // L: 208 + var1.stream.method799(var4); // L: 208 } // L: 209 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIS)V", - garbageValue = "17734" + garbageValue = "-1455" ) - void method5286(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field3203[var1][var2]; // L: 212 + void method5252(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field3196[var1][var2]; // L: 212 if (var4 != null) { // L: 213 - this.field3203[var1][var2] = null; // L: 214 - if ((this.field3200[var1] & 2) != 0) { // L: 215 + this.field3196[var1][var2] = null; // L: 214 + if ((this.field3193[var1] & 2) != 0) { // L: 215 for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 - if (var4.field3240 == var5.field3240 && var5.field3253 < 0 && var5 != var4) { // L: 217 - var4.field3253 = 0; // L: 218 + if (var5.field3248 == var4.field3248 && var5.field3249 < 0 && var5 != var4) { // L: 217 + var4.field3249 = 0; // L: 218 break; // L: 219 } } } else { - var4.field3253 = 0; // L: 224 + var4.field3249 = 0; // L: 224 } } } // L: 226 - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "152018359" + descriptor = "(IIIB)V", + garbageValue = "94" ) - void method5287(int var1, int var2, int var3) { + void method5253(int var1, int var2, int var3) { } // L: 228 - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-295771769" + garbageValue = "1226196956" ) - void method5404(int var1, int var2) { + void method5254(int var1, int var2) { } // L: 229 @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(IIS)V", - garbageValue = "15603" + garbageValue = "-18394" ) - void method5289(int var1, int var2) { - this.field3193[var1] = var2; // L: 232 + void method5255(int var1, int var2) { + this.field3187[var1] = var2; // L: 232 } // L: 233 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1957544878" + descriptor = "(IB)V", + garbageValue = "74" ) - void method5294(int var1) { + void method5256(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field3240 == var1) { // L: 237 + if (var1 < 0 || var2.field3248 == var1) { // L: 237 if (var2.stream != null) { // L: 238 - var2.stream.method828(SecureRandomFuture.field949 / 100); // L: 239 - if (var2.stream.method832()) { // L: 240 + var2.stream.method882(PcmPlayer.field268 / 100); // L: 239 + if (var2.stream.method808()) { // L: 240 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method5501(); // L: 241 + var2.method5473(); // L: 241 } - if (var2.field3253 < 0) { // L: 243 - this.field3203[var2.field3240][var2.field3244] = null; + if (var2.field3249 < 0) { // L: 243 + this.field3196[var2.field3248][var2.field3251] = null; } var2.remove(); // L: 244 @@ -537,107 +537,107 @@ public class MidiPcmStream extends PcmStream { } // L: 247 - @ObfuscatedName("e") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "33" + descriptor = "(II)V", + garbageValue = "1161401652" ) - void method5308(int var1) { + void method5257(int var1) { if (var1 >= 0) { // L: 250 - this.field3187[var1] = 12800; // L: 254 - this.field3197[var1] = 8192; // L: 255 - this.field3189[var1] = 16383; // L: 256 - this.field3193[var1] = 8192; // L: 257 - this.field3194[var1] = 0; // L: 258 - this.field3195[var1] = 8192; // L: 259 - this.method5371(var1); // L: 260 - this.method5295(var1); // L: 261 - this.field3200[var1] = 0; // L: 262 - this.field3201[var1] = 32767; // L: 263 + this.field3181[var1] = 12800; // L: 254 + this.field3203[var1] = 8192; // L: 255 + this.field3183[var1] = 16383; // L: 256 + this.field3187[var1] = 8192; // L: 257 + this.field3186[var1] = 0; // L: 258 + this.field3182[var1] = 8192; // L: 259 + this.method5260(var1); // L: 260 + this.method5261(var1); // L: 261 + this.field3193[var1] = 0; // L: 262 + this.field3202[var1] = 32767; // L: 263 this.field3192[var1] = 256; // L: 264 - this.field3190[var1] = 0; // L: 265 - this.method5297(var1, 8192); // L: 266 + this.field3189[var1] = 0; // L: 265 + this.method5303(var1, 8192); // L: 266 } else { for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method5308(var1); + this.method5257(var1); } } } // L: 252 267 - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "754465423" + garbageValue = "1206801353" ) - void method5292(int var1) { + void method5258(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field3240 == var1) && var2.field3253 < 0) { // L: 271 272 - this.field3203[var2.field3240][var2.field3244] = null; // L: 273 - var2.field3253 = 0; // L: 274 + if ((var1 < 0 || var2.field3248 == var1) && var2.field3249 < 0) { // L: 271 272 + this.field3196[var2.field3248][var2.field3251] = null; // L: 273 + var2.field3249 = 0; // L: 274 } } } // L: 278 - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-30072" + descriptor = "(I)V", + garbageValue = "1660389199" ) - void method5351() { - this.method5294(-1); // L: 281 - this.method5308(-1); // L: 282 + void method5259() { + this.method5256(-1); // L: 281 + this.method5257(-1); // L: 282 int var1; for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field3184[var1] = this.field3209[var1]; + this.field3185[var1] = this.field3184[var1]; } for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field3188[var1] = this.field3209[var1] & -128; + this.field3178[var1] = this.field3184[var1] & -128; } } // L: 285 - @ObfuscatedName("aj") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1200671157" + descriptor = "(IB)V", + garbageValue = "0" ) - void method5371(int var1) { - if ((this.field3200[var1] & 2) != 0) { // L: 288 + void method5260(int var1) { + if ((this.field3193[var1] & 2) != 0) { // L: 288 for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289 - if (var2.field3240 == var1 && this.field3203[var1][var2.field3244] == null && var2.field3253 < 0) { // L: 290 291 - var2.field3253 = 0; + if (var2.field3248 == var1 && this.field3196[var1][var2.field3251] == null && var2.field3249 < 0) { // L: 290 291 + var2.field3249 = 0; } } } } // L: 295 - @ObfuscatedName("as") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-985236501" + garbageValue = "527815614" ) - void method5295(int var1) { - if ((this.field3200[var1] & 4) != 0) { // L: 298 + void method5261(int var1) { + if ((this.field3193[var1] & 4) != 0) { // L: 298 for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299 - if (var2.field3240 == var1) { // L: 300 - var2.field3239 = 0; + if (var2.field3248 == var1) { // L: 300 + var2.field3238 = 0; } } } } // L: 303 - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1952001364" + garbageValue = "-455692195" ) - void method5296(int var1) { + void method5262(int var1) { int var2 = var1 & 240; // L: 306 int var3; int var4; @@ -646,260 +646,260 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; // L: 308 var4 = var1 >> 8 & 127; // L: 309 var5 = var1 >> 16 & 127; // L: 310 - this.method5286(var3, var4, var5); // L: 311 + this.method5252(var3, var4, var5); // L: 311 } else if (var2 == 144) { // L: 314 var3 = var1 & 15; // L: 315 var4 = var1 >> 8 & 127; // L: 316 var5 = var1 >> 16 & 127; // L: 317 if (var5 > 0) { // L: 318 - this.method5358(var3, var4, var5); + this.method5251(var3, var4, var5); } else { - this.method5286(var3, var4, 64); // L: 319 + this.method5252(var3, var4, 64); // L: 319 } } else if (var2 == 160) { // L: 322 var3 = var1 & 15; // L: 323 var4 = var1 >> 8 & 127; // L: 324 var5 = var1 >> 16 & 127; // L: 325 - this.method5287(var3, var4, var5); // L: 326 + this.method5253(var3, var4, var5); // L: 326 } else if (var2 == 176) { // L: 329 var3 = var1 & 15; // L: 330 var4 = var1 >> 8 & 127; // L: 331 var5 = var1 >> 16 & 127; // L: 332 if (var4 == 0) { // L: 333 - this.field3188[var3] = (var5 << 14) + (this.field3188[var3] & -2080769); + this.field3178[var3] = (var5 << 14) + (this.field3178[var3] & -2080769); } if (var4 == 32) { // L: 334 - this.field3188[var3] = (var5 << 7) + (this.field3188[var3] & -16257); + this.field3178[var3] = (var5 << 7) + (this.field3178[var3] & -16257); } if (var4 == 1) { // L: 335 - this.field3194[var3] = (var5 << 7) + (this.field3194[var3] & -16257); + this.field3186[var3] = (var5 << 7) + (this.field3186[var3] & -16257); } if (var4 == 33) { // L: 336 - this.field3194[var3] = var5 + (this.field3194[var3] & -128); + this.field3186[var3] = var5 + (this.field3186[var3] & -128); } if (var4 == 5) { // L: 337 - this.field3195[var3] = (var5 << 7) + (this.field3195[var3] & -16257); + this.field3182[var3] = (var5 << 7) + (this.field3182[var3] & -16257); } if (var4 == 37) { // L: 338 - this.field3195[var3] = var5 + (this.field3195[var3] & -128); + this.field3182[var3] = var5 + (this.field3182[var3] & -128); } if (var4 == 7) { // L: 339 - this.field3187[var3] = (var5 << 7) + (this.field3187[var3] & -16257); + this.field3181[var3] = (var5 << 7) + (this.field3181[var3] & -16257); } if (var4 == 39) { // L: 340 - this.field3187[var3] = var5 + (this.field3187[var3] & -128); + this.field3181[var3] = var5 + (this.field3181[var3] & -128); } if (var4 == 10) { // L: 341 - this.field3197[var3] = (var5 << 7) + (this.field3197[var3] & -16257); + this.field3203[var3] = (var5 << 7) + (this.field3203[var3] & -16257); } if (var4 == 42) { // L: 342 - this.field3197[var3] = var5 + (this.field3197[var3] & -128); + this.field3203[var3] = var5 + (this.field3203[var3] & -128); } if (var4 == 11) { // L: 343 - this.field3189[var3] = (var5 << 7) + (this.field3189[var3] & -16257); + this.field3183[var3] = (var5 << 7) + (this.field3183[var3] & -16257); } if (var4 == 43) { // L: 344 - this.field3189[var3] = var5 + (this.field3189[var3] & -128); + this.field3183[var3] = var5 + (this.field3183[var3] & -128); } int[] var10000; if (var4 == 64) { // L: 345 if (var5 >= 64) { // L: 346 - var10000 = this.field3200; + var10000 = this.field3193; var10000[var3] |= 1; } else { - var10000 = this.field3200; // L: 347 + var10000 = this.field3193; // L: 347 var10000[var3] &= -2; } } if (var4 == 65) { // L: 349 if (var5 >= 64) { // L: 350 - var10000 = this.field3200; + var10000 = this.field3193; var10000[var3] |= 2; } else { - this.method5371(var3); // L: 352 - var10000 = this.field3200; // L: 353 + this.method5260(var3); // L: 352 + var10000 = this.field3193; // L: 353 var10000[var3] &= -3; } } if (var4 == 99) { // L: 356 - this.field3201[var3] = (var5 << 7) + (this.field3201[var3] & 127); + this.field3202[var3] = (var5 << 7) + (this.field3202[var3] & 127); } if (var4 == 98) { // L: 357 - this.field3201[var3] = (this.field3201[var3] & 16256) + var5; + this.field3202[var3] = (this.field3202[var3] & 16256) + var5; } if (var4 == 101) { // L: 358 - this.field3201[var3] = (var5 << 7) + (this.field3201[var3] & 127) + 16384; + this.field3202[var3] = (var5 << 7) + (this.field3202[var3] & 127) + 16384; } if (var4 == 100) { // L: 359 - this.field3201[var3] = (this.field3201[var3] & 16256) + var5 + 16384; + this.field3202[var3] = (this.field3202[var3] & 16256) + var5 + 16384; } if (var4 == 120) { // L: 360 - this.method5294(var3); + this.method5256(var3); } if (var4 == 121) { // L: 361 - this.method5308(var3); + this.method5257(var3); } if (var4 == 123) { // L: 362 - this.method5292(var3); + this.method5258(var3); } int var6; if (var4 == 6) { // L: 363 - var6 = this.field3201[var3]; // L: 364 + var6 = this.field3202[var3]; // L: 364 if (var6 == 16384) { // L: 365 this.field3192[var3] = (var5 << 7) + (this.field3192[var3] & -16257); } } if (var4 == 38) { // L: 367 - var6 = this.field3201[var3]; // L: 368 + var6 = this.field3202[var3]; // L: 368 if (var6 == 16384) { // L: 369 this.field3192[var3] = var5 + (this.field3192[var3] & -128); } } if (var4 == 16) { // L: 371 - this.field3190[var3] = (var5 << 7) + (this.field3190[var3] & -16257); + this.field3189[var3] = (var5 << 7) + (this.field3189[var3] & -16257); } if (var4 == 48) { // L: 372 - this.field3190[var3] = var5 + (this.field3190[var3] & -128); + this.field3189[var3] = var5 + (this.field3189[var3] & -128); } if (var4 == 81) { // L: 373 if (var5 >= 64) { // L: 374 - var10000 = this.field3200; + var10000 = this.field3193; var10000[var3] |= 4; } else { - this.method5295(var3); // L: 376 - var10000 = this.field3200; // L: 377 + this.method5261(var3); // L: 376 + var10000 = this.field3193; // L: 377 var10000[var3] &= -5; } } if (var4 == 17) { - this.method5297(var3, (var5 << 7) + (this.field3198[var3] & -16257)); // L: 380 + this.method5303(var3, (var5 << 7) + (this.field3194[var3] & -16257)); // L: 380 } if (var4 == 49) { // L: 381 - this.method5297(var3, var5 + (this.field3198[var3] & -128)); + this.method5303(var3, var5 + (this.field3194[var3] & -128)); } } else if (var2 == 192) { // L: 384 var3 = var1 & 15; // L: 385 var4 = var1 >> 8 & 127; // L: 386 - this.method5310(var3, var4 + this.field3188[var3]); // L: 387 + this.method5250(var3, var4 + this.field3178[var3]); // L: 387 } else if (var2 == 208) { // L: 390 var3 = var1 & 15; // L: 391 var4 = var1 >> 8 & 127; // L: 392 - this.method5404(var3, var4); // L: 393 + this.method5254(var3, var4); // L: 393 } else if (var2 == 224) { // L: 396 var3 = var1 & 15; // L: 397 var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398 - this.method5289(var3, var4); // L: 399 + this.method5255(var3, var4); // L: 399 } else { var2 = var1 & 255; // L: 402 if (var2 == 255) { // L: 403 - this.method5351(); // L: 404 + this.method5259(); // L: 404 } } } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-803515247" + garbageValue = "8396929" ) - void method5297(int var1, int var2) { - this.field3198[var1] = var2; // L: 410 - this.field3202[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411 + void method5303(int var1, int var2) { + this.field3194[var1] = var2; // L: 410 + this.field3195[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 } // L: 412 - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lju;I)I", - garbageValue = "1061926046" + descriptor = "(Ljn;I)I", + garbageValue = "2132643149" ) - int method5290(MusicPatchNode var1) { - int var2 = (var1.field3249 * var1.field3248 >> 12) + var1.field3247; // L: 415 - var2 += (this.field3193[var1.field3240] - 8192) * this.field3192[var1.field3240] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field3242; // L: 417 + int method5246(MusicPatchNode var1) { + int var2 = (var1.field3245 * var1.field3244 >> 12) + var1.field3243; // L: 415 + var2 += (this.field3187[var1.field3248] - 8192) * this.field3192[var1.field3248] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field3247; // L: 417 int var4; - if (var3.field3169 > 0 && (var3.field3171 > 0 || this.field3194[var1.field3240] > 0)) { // L: 418 - var4 = var3.field3171 << 2; // L: 419 - int var5 = var3.field3170 << 1; // L: 420 - if (var1.field3258 < var5) { // L: 421 - var4 = var4 * var1.field3258 / var5; + if (var3.field3166 > 0 && (var3.field3161 > 0 || this.field3186[var1.field3248] > 0)) { // L: 418 + var4 = var3.field3161 << 2; // L: 419 + int var5 = var3.field3167 << 1; // L: 420 + if (var1.field3253 < var5) { // L: 421 + var4 = var4 * var1.field3253 / var5; } - var4 += this.field3194[var1.field3240] >> 7; // L: 422 - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field3259 & 511)); // L: 423 - var2 += (int)(var6 * (double)var4); // L: 424 + var4 += this.field3186[var1.field3248] >> 7; // L: 422 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field3237 & 511)); // L: 423 + var2 += (int)((double)var4 * var6); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)SecureRandomFuture.field949 + 0.5D); // L: 426 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field268 + 0.5D); // L: 426 return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lju;S)I", - garbageValue = "2208" + descriptor = "(Ljn;B)I", + garbageValue = "22" ) - int method5299(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field3242; // L: 431 - int var3 = this.field3187[var1.field3240] * this.field3189[var1.field3240] + 4096 >> 13; // L: 432 + int method5244(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field3247; // L: 431 + int var3 = this.field3181[var1.field3248] * this.field3183[var1.field3248] + 4096 >> 13; // L: 432 var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field3245 + 16384 >> 15; // L: 434 - var3 = var3 * this.field3185 + 128 >> 8; // L: 435 - if (var2.field3164 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3164 * 1.953125E-5D * (double)var1.field3251) + 0.5D); // L: 437 + var3 = var3 * var1.field3241 + 16384 >> 15; // L: 434 + var3 = var3 * this.field3179 + 128 >> 8; // L: 435 + if (var2.field3162 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field3246 * (double)var2.field3162) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - if (var2.field3165 != null) { // L: 439 - var4 = var1.field3255; // L: 440 - var5 = var2.field3165[var1.field3252 + 1]; // L: 441 - if (var1.field3252 < var2.field3165.length - 2) { // L: 442 - var6 = (var2.field3165[var1.field3252] & 255) << 8; // L: 443 - var7 = (var2.field3165[var1.field3252 + 2] & 255) << 8; // L: 444 - var5 += (var2.field3165[var1.field3252 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 + if (var2.field3160 != null) { // L: 439 + var4 = var1.field3235; // L: 440 + var5 = var2.field3160[var1.field3252 + 1]; // L: 441 + if (var1.field3252 < var2.field3160.length - 2) { // L: 442 + var6 = (var2.field3160[var1.field3252] & 255) << 8; // L: 443 + var7 = (var2.field3160[var1.field3252 + 2] & 255) << 8; // L: 444 + var5 += (var2.field3160[var1.field3252 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 } var3 = var3 * var5 + 32 >> 6; // L: 447 } - if (var1.field3253 > 0 && var2.field3162 != null) { // L: 449 - var4 = var1.field3253; // L: 450 - var5 = var2.field3162[var1.field3250 + 1]; // L: 451 - if (var1.field3250 < var2.field3162.length - 2) { // L: 452 - var6 = (var2.field3162[var1.field3250] & 255) << 8; // L: 453 - var7 = (var2.field3162[var1.field3250 + 2] & 255) << 8; // L: 454 - var5 += (var2.field3162[var1.field3250 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 + if (var1.field3249 > 0 && var2.field3165 != null) { // L: 449 + var4 = var1.field3249; // L: 450 + var5 = var2.field3165[var1.field3250 + 1]; // L: 451 + if (var1.field3250 < var2.field3165.length - 2) { // L: 452 + var6 = (var2.field3165[var1.field3250] & 255) << 8; // L: 453 + var7 = (var2.field3165[var1.field3250 + 2] & 255) << 8; // L: 454 + var5 += (var4 - var6) * (var2.field3165[var1.field3250 + 3] - var5) / (var7 - var6); // L: 455 } var3 = var3 * var5 + 32 >> 6; // L: 457 @@ -908,27 +908,27 @@ public class MidiPcmStream extends PcmStream { return var3; // L: 459 } - @ObfuscatedName("am") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lju;I)I", - garbageValue = "-858777860" + descriptor = "(Ljn;I)I", + garbageValue = "17665426" ) - int method5318(MusicPatchNode var1) { - int var2 = this.field3197[var1.field3240]; // L: 463 - return var2 < 8192 ? var2 * var1.field3254 + 32 >> 6 : 16384 - ((128 - var1.field3254) * (16384 - var2) + 32 >> 6); // L: 464 465 + int method5302(MusicPatchNode var1) { + int var2 = this.field3203[var1.field3248]; // L: 463 + return var2 < 8192 ? var2 * var1.field3242 + 32 >> 6 : 16384 - ((128 - var1.field3242) * (16384 - var2) + 32 >> 6); // L: 464 465 } - @ObfuscatedName("al") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "321540193" + garbageValue = "2142415416" ) - void method5364() { + void method5272() { int var1 = this.track; // L: 522 int var2 = this.trackLength; // L: 523 long var3; - for (var3 = this.field3210; var2 == this.trackLength; var3 = this.midiFile.method5444(var2)) { // L: 524 525 547 + for (var3 = this.field3205; var2 == this.trackLength; var3 = this.midiFile.method5393(var2)) { // L: 524 525 547 while (var2 == this.midiFile.trackLengths[var1]) { // L: 526 this.midiFile.gotoTrack(var1); // L: 527 int var5 = this.midiFile.readMessage(var1); // L: 528 @@ -936,8 +936,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); // L: 530 this.midiFile.markTrackPosition(var1); // L: 531 if (this.midiFile.isDone()) { // L: 532 - if (!this.field3206 || var2 == 0) { // L: 533 - this.method5351(); // L: 537 + if (!this.field3199 || var2 == 0) { // L: 533 + this.method5259(); // L: 537 this.midiFile.clear(); // L: 538 return; // L: 539 } @@ -948,7 +948,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { // L: 541 - this.method5296(var5); + this.method5262(var5); } this.midiFile.readTrackLength(var1); // L: 542 @@ -961,20 +961,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; // L: 549 this.trackLength = var2; // L: 550 - this.field3210 = var3; // L: 551 + this.field3205 = var3; // L: 551 } // L: 552 - @ObfuscatedName("ak") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lju;I)Z", - garbageValue = "-1533510459" + descriptor = "(Ljn;I)Z", + garbageValue = "1597341922" ) - boolean method5307(MusicPatchNode var1) { + boolean method5273(MusicPatchNode var1) { if (var1.stream == null) { // L: 555 - if (var1.field3253 >= 0) { // L: 556 + if (var1.field3249 >= 0) { // L: 556 var1.remove(); // L: 557 - if (var1.field3243 > 0 && var1 == this.field3204[var1.field3240][var1.field3243]) { // L: 558 - this.field3204[var1.field3240][var1.field3243] = null; // L: 559 + if (var1.field3239 > 0 && var1 == this.field3197[var1.field3248][var1.field3239]) { // L: 558 + this.field3197[var1.field3248][var1.field3239] = null; // L: 559 } } @@ -984,118 +984,177 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("az") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lju;[IIIB)Z", - garbageValue = "-1" + descriptor = "(Ljn;[IIII)Z", + garbageValue = "-1282463450" ) - boolean method5396(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field3256 = SecureRandomFuture.field949 / 100; // L: 568 - if (var1.field3253 < 0 || var1.stream != null && !var1.stream.method831()) { // L: 569 - int var5 = var1.field3249; // L: 577 + boolean method5311(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field3255 = PcmPlayer.field268 / 100; // L: 568 + if (var1.field3249 < 0 || var1.stream != null && !var1.stream.method830()) { // L: 569 + int var5 = var1.field3245; // L: 577 if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field3195[var1.field3240]) + 0.5D); // L: 579 + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3182[var1.field3248] * 4.921259842519685E-4D) + 0.5D); // L: 579 if (var5 < 0) { // L: 580 var5 = 0; } - var1.field3249 = var5; // L: 581 + var1.field3245 = var5; // L: 581 } - var1.stream.method843(this.method5290(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field3242; // L: 584 + var1.stream.method896(this.method5246(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field3247; // L: 584 boolean var7 = false; // L: 585 - ++var1.field3258; // L: 586 - var1.field3259 += var6.field3169; // L: 587 - double var8 = (double)((var1.field3244 - 60 << 8) + (var1.field3249 * var1.field3248 >> 12)) * 5.086263020833333E-6D; // L: 588 - if (var6.field3164 > 0) { // L: 589 - if (var6.field3173 > 0) { // L: 590 - var1.field3251 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3173) + 0.5D); + ++var1.field3253; // L: 586 + var1.field3237 += var6.field3166; // L: 587 + double var8 = (double)((var1.field3251 - 60 << 8) + (var1.field3245 * var1.field3244 >> 12)) * 5.086263020833333E-6D; // L: 588 + if (var6.field3162 > 0) { // L: 589 + if (var6.field3164 > 0) { // L: 590 + var1.field3246 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3164 * var8) + 0.5D); } else { - var1.field3251 += 128; // L: 591 + var1.field3246 += 128; // L: 591 } } - if (var6.field3165 != null) { // L: 593 - if (var6.field3168 > 0) { // L: 594 - var1.field3255 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3168 * var8) + 0.5D); + if (var6.field3160 != null) { // L: 593 + if (var6.field3159 > 0) { // L: 594 + var1.field3235 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3159 * var8) + 0.5D); } else { - var1.field3255 += 128; // L: 595 + var1.field3235 += 128; // L: 595 } - while (var1.field3252 < var6.field3165.length - 2 && var1.field3255 > (var6.field3165[var1.field3252 + 2] & 255) << 8) { // L: 596 + while (var1.field3252 < var6.field3160.length - 2 && var1.field3235 > (var6.field3160[var1.field3252 + 2] & 255) << 8) { // L: 596 var1.field3252 += 2; } - if (var6.field3165.length - 2 == var1.field3252 && var6.field3165[var1.field3252 + 1] == 0) { // L: 597 + if (var6.field3160.length - 2 == var1.field3252 && var6.field3160[var1.field3252 + 1] == 0) { // L: 597 var7 = true; } } - if (var1.field3253 >= 0 && var6.field3162 != null && (this.field3200[var1.field3240] & 1) == 0 && (var1.field3243 < 0 || var1 != this.field3204[var1.field3240][var1.field3243])) { // L: 599 600 + if (var1.field3249 >= 0 && var6.field3165 != null && (this.field3193[var1.field3248] & 1) == 0 && (var1.field3239 < 0 || var1 != this.field3197[var1.field3248][var1.field3239])) { // L: 599 600 if (var6.field3163 > 0) { // L: 601 - var1.field3253 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3163) + 0.5D); + var1.field3249 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3163) + 0.5D); } else { - var1.field3253 += 128; // L: 602 + var1.field3249 += 128; // L: 602 } - while (var1.field3250 < var6.field3162.length - 2 && var1.field3253 > (var6.field3162[var1.field3250 + 2] & 255) << 8) { // L: 603 + while (var1.field3250 < var6.field3165.length - 2 && var1.field3249 > (var6.field3165[var1.field3250 + 2] & 255) << 8) { // L: 603 var1.field3250 += 2; } - if (var6.field3162.length - 2 == var1.field3250) { // L: 604 + if (var6.field3165.length - 2 == var1.field3250) { // L: 604 var7 = true; } } if (var7) { // L: 607 - var1.stream.method828(var1.field3256); // L: 608 + var1.stream.method882(var1.field3255); // L: 608 if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); // L: 610 } - if (var1.stream.method832()) { // L: 611 + if (var1.stream.method808()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method5501(); // L: 612 - if (var1.field3253 >= 0) { // L: 613 + var1.method5473(); // L: 612 + if (var1.field3249 >= 0) { // L: 613 var1.remove(); // L: 614 - if (var1.field3243 > 0 && var1 == this.field3204[var1.field3240][var1.field3243]) { // L: 615 - this.field3204[var1.field3240][var1.field3243] = null; // L: 616 + if (var1.field3239 > 0 && var1 == this.field3197[var1.field3248][var1.field3239]) { // L: 615 + this.field3197[var1.field3248][var1.field3239] = null; // L: 616 } } return true; // L: 619 } else { - var1.stream.method841(var1.field3256, this.method5299(var1), this.method5318(var1)); // L: 621 + var1.stream.method880(var1.field3255, this.method5244(var1), this.method5302(var1)); // L: 621 return false; // L: 622 } } else { - var1.method5501(); // L: 570 + var1.method5473(); // L: 570 var1.remove(); // L: 571 - if (var1.field3243 > 0 && var1 == this.field3204[var1.field3240][var1.field3243]) { // L: 572 - this.field3204[var1.field3240][var1.field3243] = null; // L: 573 + if (var1.field3239 > 0 && var1 == this.field3197[var1.field3248][var1.field3239]) { // L: 572 + this.field3197[var1.field3248][var1.field3239] = null; // L: 573 } return true; // L: 575 } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "-820460880" + descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "1823520808" ) - static float method5405(float[] var0, int var1, float var2) { - float var3 = var0[var1]; // L: 108 + public static void method5368(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); // L: 34 + int var6 = var0.getFileId(var5, var2); // L: 35 + class18.method266(var0, var5, var6, var3, var4); // L: 36 + } // L: 37 - for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 - var3 = var2 * var3 + var0[var4]; // L: 110 + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-126" + ) + static void method5366(int var0, String var1) { + int var2 = Players.Players_count; // L: 9607 + int[] var3 = Players.Players_indices; // L: 9608 + boolean var4 = false; // L: 9609 + Username var5 = new Username(var1, class122.loginType); // L: 9610 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 9611 + Player var7 = Client.players[var3[var6]]; // L: 9612 + if (var7 != null && var7 != GrandExchangeEvents.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9613 + PacketBufferNode var8; + if (var0 == 1) { // L: 9614 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9616 + var8.packetBuffer.method7710(var3[var6]); // L: 9617 + var8.packetBuffer.method7701(0); // L: 9618 + Client.packetWriter.addNode(var8); // L: 9619 + } else if (var0 == 4) { // L: 9621 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 9623 + var8.packetBuffer.method7804(0); // L: 9624 + var8.packetBuffer.writeShort(var3[var6]); // L: 9625 + Client.packetWriter.addNode(var8); // L: 9626 + } else if (var0 == 6) { // L: 9628 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 9630 + var8.packetBuffer.method7712(var3[var6]); // L: 9631 + var8.packetBuffer.writeByte(0); // L: 9632 + Client.packetWriter.addNode(var8); // L: 9633 + } else if (var0 == 7) { // L: 9635 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 9637 + var8.packetBuffer.writeShort(var3[var6]); // L: 9638 + var8.packetBuffer.method7701(0); // L: 9639 + Client.packetWriter.addNode(var8); // L: 9640 + } + + var4 = true; // L: 9642 + break; + } } - return var3; // L: 112 - } + if (!var4) { // L: 9646 + Actor.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 9647 + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2065627422" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (ClientPacket.friendsChat != null) { // L: 12385 + PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2909, Client.packetWriter.isaacCipher); // L: 12386 + var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 12387 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12388 + Client.packetWriter.addNode(var1); // L: 12389 + } + } // L: 12390 } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 78e38d376b..a012fdf8ef 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,46 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("fn") @Implements("MilliClock") public class MilliClock extends Clock { @ObfuscatedName("v") - long[] field1788; - @ObfuscatedName("o") + long[] field1767; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1148661387 + intValue = -2105737199 ) - int field1784; - @ObfuscatedName("h") + int field1769; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 426032869 + intValue = -626928133 ) - int field1785; - @ObfuscatedName("g") + int field1768; + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -8930858235242911925L + longValue = 4722522205761016929L ) - long field1786; - @ObfuscatedName("l") + long field1766; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1472705891 + intValue = -186041197 ) - int field1787; + int field1770; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -985366599 + intValue = -1637603131 ) - int field1783; + int field1771; - MilliClock() { - this.field1788 = new long[10]; // L: 7 - this.field1784 = 256; // L: 15 - this.field1785 = 1; // L: 16 - this.field1787 = 0; // L: 17 - this.field1786 = WorldMapSprite.method4989(); // L: 18 + public MilliClock() { + this.field1767 = new long[10]; // L: 7 + this.field1769 = 256; // L: 15 + this.field1768 = 1; // L: 16 + this.field1770 = 0; // L: 17 + this.field1766 = class136.method2931(); // L: 18 for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field1788[var1] = this.field1786; // L: 20 + this.field1767[var1] = this.field1766; // L: 20 } } // L: 22 @@ -51,115 +51,87 @@ public class MilliClock extends Clock { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "947451014" + garbageValue = "1350330504" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field1788[var1] = 0L; // L: 26 + this.field1767[var1] = 0L; // L: 26 } } // L: 28 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-932830121" + garbageValue = "2026134141" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1784; // L: 31 - int var4 = this.field1785; // L: 32 - this.field1784 = 300; // L: 33 - this.field1785 = 1; // L: 34 - this.field1786 = WorldMapSprite.method4989(); // L: 35 - if (this.field1788[this.field1783] == 0L) { // L: 36 - this.field1784 = var3; // L: 37 - this.field1785 = var4; // L: 38 - } else if (this.field1786 > this.field1788[this.field1783]) { // L: 40 - this.field1784 = (int)((long)(var1 * 2560) / (this.field1786 - this.field1788[this.field1783])); + int var3 = this.field1769; // L: 31 + int var4 = this.field1768; // L: 32 + this.field1769 = 300; // L: 33 + this.field1768 = 1; // L: 34 + this.field1766 = class136.method2931(); // L: 35 + if (this.field1767[this.field1771] == 0L) { // L: 36 + this.field1769 = var3; // L: 37 + this.field1768 = var4; // L: 38 + } else if (this.field1766 > this.field1767[this.field1771]) { // L: 40 + this.field1769 = (int)((long)(var1 * 2560) / (this.field1766 - this.field1767[this.field1771])); } - if (this.field1784 < 25) { // L: 41 - this.field1784 = 25; + if (this.field1769 < 25) { // L: 41 + this.field1769 = 25; } - if (this.field1784 > 256) { // L: 42 - this.field1784 = 256; // L: 43 - this.field1785 = (int)((long)var1 - (this.field1786 - this.field1788[this.field1783]) / 10L); // L: 44 + if (this.field1769 > 256) { // L: 42 + this.field1769 = 256; // L: 43 + this.field1768 = (int)((long)var1 - (this.field1766 - this.field1767[this.field1771]) / 10L); // L: 44 } - if (this.field1785 > var1) { // L: 46 - this.field1785 = var1; + if (this.field1768 > var1) { // L: 46 + this.field1768 = var1; } - this.field1788[this.field1783] = this.field1786; // L: 47 - this.field1783 = (this.field1783 + 1) % 10; // L: 48 + this.field1767[this.field1771] = this.field1766; // L: 47 + this.field1771 = (this.field1771 + 1) % 10; // L: 48 int var5; - if (this.field1785 > 1) { // L: 49 + if (this.field1768 > 1) { // L: 49 for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (this.field1788[var5] != 0L) { // L: 51 - this.field1788[var5] += (long)this.field1785; + if (0L != this.field1767[var5]) { // L: 51 + this.field1767[var5] += (long)this.field1768; } } } - if (this.field1785 < var2) { // L: 54 - this.field1785 = var2; + if (this.field1768 < var2) { // L: 54 + this.field1768 = var2; } - GrandExchangeOfferTotalQuantityComparator.method6007((long)this.field1785); // L: 55 + class93.method2384((long)this.field1768); // L: 55 - for (var5 = 0; this.field1787 < 256; this.field1787 += this.field1784) { // L: 56 57 59 - ++var5; // L: 58 + for (var5 = 0; this.field1770 < 256; this.field1770 += this.field1769) { // L: 56 + ++var5; } - this.field1787 &= 255; // L: 61 - return var5; // L: 62 + this.field1770 &= 255; + return var5; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "-220853787" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqo;" ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 85 - if (var3) { // L: 86 - var5 |= 65536L; - } - - return var5; // L: 87 - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "2046695299" - ) - static int method3293(int var0, Script var1, boolean var2) { - if (var0 == 6800) { // L: 4511 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4512 - return 1; // L: 4513 - } else if (var0 != 6801 && var0 != 6802) { // L: 4515 - if (var0 == 6850) { // L: 4519 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4520 - return 1; // L: 4521 - } else if (var0 != 6851 && var0 != 6852) { // L: 4523 - if (var0 == 6853) { // L: 4527 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4528 - return 1; // L: 4529 - } else { - return 2; // L: 4531 - } - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4524 - return 1; // L: 4525 - } + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { // L: 57 + var2 = (RunException)var0; // L: 58 + var2.message = var2.message + ' ' + var1; // L: 59 } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4516 - return 1; // L: 4517 + var2 = new RunException(var0, var1); // L: 61 } + + return var2; // L: 62 } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index c857cb27ac..063c01b2ea 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.IOException; import java.util.HashSet; import java.util.Set; import net.runelite.mapping.Export; @@ -6,182 +8,247 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("lv") @Implements("ModeWhere") public enum ModeWhere implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Llv;" ) - field4073("", 0, new class327[]{class327.field4050}), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4084("", 1, new class327[]{class327.field4052, class327.field4050}), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4074("", 2, new class327[]{class327.field4052, class327.field4051, class327.field4050}), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4075("", 3, new class327[]{class327.field4052}), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4076("", 4), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4077("", 5, new class327[]{class327.field4052, class327.field4050}), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4086("", 6, new class327[]{class327.field4050}), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4079("", 8, new class327[]{class327.field4052, class327.field4050}), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4091("", 9, new class327[]{class327.field4052, class327.field4051}), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4082("", 10, new class327[]{class327.field4052}), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4078("", 11, new class327[]{class327.field4052}), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - field4083("", 12, new class327[]{class327.field4052, class327.field4050}), + field4069("", 0, new class327[]{class327.field4042}), @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Llv;" ) - field4072("", 13, new class327[]{class327.field4052}); + field4062("", 1, new class327[]{class327.field4043, class327.field4042}), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4071("", 2, new class327[]{class327.field4043, class327.field4044, class327.field4042}), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4065("", 3, new class327[]{class327.field4043}), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4064("", 4), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4066("", 5, new class327[]{class327.field4043, class327.field4042}), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4079("", 6, new class327[]{class327.field4042}), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4067("", 8, new class327[]{class327.field4043, class327.field4042}), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4068("", 9, new class327[]{class327.field4043, class327.field4044}), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4061("", 10, new class327[]{class327.field4043}), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4070("", 11, new class327[]{class327.field4043}), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4077("", 12, new class327[]{class327.field4043, class327.field4042}), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + field4072("", 13, new class327[]{class327.field4043}); - @ObfuscatedName("tj") - @ObfuscatedGetter( - intValue = -1727456197 + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "Lny;" ) - static int field4080; - @ObfuscatedName("ao") - protected static String field4087; - @ObfuscatedName("j") + static AbstractSocket field4073; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -977086665 + intValue = 426345527 ) @Export("id") final int id; - @ObfuscatedName("p") - final Set field4088; + @ObfuscatedName("d") + final Set field4074; + + static { + method6093(); // L: 28 + } // L: 29 @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I[Llb;)V" ) ModeWhere(String var3, int var4, class327[] var5) { - this.field4088 = new HashSet(); - this.id = var4; // L: 39 - class327[] var6 = var5; // L: 41 + this.field4074 = new HashSet(); + this.id = var4; // L: 43 + class327[] var6 = var5; // L: 45 - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42 - class327 var8 = var6[var7]; // L: 43 - this.field4088.add(var8); // L: 44 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 + class327 var8 = var6[var7]; // L: 47 + this.field4074.add(var8); // L: 48 } - } // L: 47 + } // L: 51 ModeWhere(String var3, int var4) { - this.field4088 = new HashSet(); // L: 32 - this.id = var4; // L: 35 - } // L: 36 + this.field4074 = new HashSet(); // L: 32 + this.id = var4; // L: 39 + } // L: 40 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 51 + return this.id; // L: 54 } - @ObfuscatedName("ap") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "-17" + descriptor = "(I)[Llv;", + garbageValue = "1573276751" ) - static int method6144(int var0, Script var1, boolean var2) { - if (var0 == 7400) { // L: 4670 - --class295.Interpreter_intStackSize; // L: 4671 - --ChatChannel.Interpreter_stringStackSize; // L: 4672 - return 1; // L: 4673 - } else if (var0 == 7401) { // L: 4675 - --class295.Interpreter_intStackSize; // L: 4676 - --ChatChannel.Interpreter_stringStackSize; // L: 4677 - return 1; // L: 4678 - } else if (var0 == 7402) { // L: 4680 - class295.Interpreter_intStackSize -= 2; // L: 4681 - --ChatChannel.Interpreter_stringStackSize; // L: 4682 - return 1; // L: 4683 - } else if (var0 == 7403) { // L: 4685 - class295.Interpreter_intStackSize -= 2; // L: 4686 - --ChatChannel.Interpreter_stringStackSize; // L: 4687 - return 1; // L: 4688 - } else if (var0 == 7404) { // L: 4690 - --class295.Interpreter_intStackSize; // L: 4691 - --ChatChannel.Interpreter_stringStackSize; // L: 4692 - return 1; // L: 4693 - } else if (var0 == 7405) { // L: 4695 - class295.Interpreter_intStackSize -= 2; // L: 4696 - return 1; // L: 4697 - } else if (var0 == 7406) { // L: 4699 - --class295.Interpreter_intStackSize; // L: 4700 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4701 - return 1; // L: 4702 - } else if (var0 == 7407) { // L: 4704 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4705 - return 1; // L: 4706 - } else if (var0 == 7408) { // L: 4708 - class295.Interpreter_intStackSize -= 2; // L: 4709 - --ChatChannel.Interpreter_stringStackSize; // L: 4710 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4711 - return 1; // L: 4712 - } else if (var0 == 7409) { // L: 4714 - --class295.Interpreter_intStackSize; // L: 4715 - return 1; // L: 4716 - } else { - return 2; // L: 4718 + static ModeWhere[] method6093() { + return new ModeWhere[]{field4079, field4068, field4070, field4061, field4064, field4069, field4072, field4066, field4065, field4067, field4077, field4071, field4062}; // L: 35 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lph;", + garbageValue = "-16" + ) + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 247 + if (var3.exists()) { // L: 248 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 250 + return var10; // L: 251 + } catch (IOException var9) { // L: 253 + } + } + + String var4 = ""; // L: 255 + if (WorldMapSection1.cacheGamebuild == 33) { // L: 256 + var4 = "_rc"; + } else if (WorldMapSection1.cacheGamebuild == 34) { // L: 257 + var4 = "_wip"; + } + + File var5 = new File(NetSocket.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 258 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 259 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 261 + return var6; // L: 262 + } catch (IOException var8) { // L: 264 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 267 + return var6; // L: 268 + } catch (IOException var7) { // L: 270 + throw new RuntimeException(); // L: 271 } } - @ObfuscatedName("gx") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lco;I)V", - garbageValue = "1465598297" + descriptor = "(I)V", + garbageValue = "610665702" ) - static final void method6145(Actor var0) { - int var1 = Math.max(1, var0.field1179 - Client.cycle); // L: 3751 - int var2 = var0.field1145 * 64 + var0.field1175 * 128; // L: 3752 - int var3 = var0.field1145 * 64 + var0.field1177 * 128; // L: 3753 - var0.x += (var2 - var0.x) / var1; // L: 3754 - var0.y += (var3 - var0.y) / var1; // L: 3755 - var0.field1197 = 0; // L: 3756 - var0.orientation = var0.field1181; // L: 3757 - } // L: 3758 + static final void method6092() { + class149.method3138("Your ignore list is full. Max of 100 for free users, and 400 for members"); // L: 156 + } // L: 157 + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(Lky;I)Z", + garbageValue = "1543146245" + ) + static final boolean method6100(Widget var0) { + int var1 = var0.contentType; // L: 12192 + if (var1 == 205) { // L: 12193 + Client.logoutTimer = 250; // L: 12194 + return true; // L: 12195 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 12197 + var2 = (var1 - 300) / 2; // L: 12198 + var3 = var1 & 1; // L: 12199 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12200 + } + + if (var1 >= 314 && var1 <= 323) { // L: 12202 + var2 = (var1 - 314) / 2; // L: 12203 + var3 = var1 & 1; // L: 12204 + Client.playerAppearance.method5594(var2, var3 == 1); // L: 12205 + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 12207 + } + + if (var1 == 325) { // L: 12208 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 12209 + PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 12211 + Client.playerAppearance.write(var4.packetBuffer); // L: 12212 + Client.packetWriter.addNode(var4); // L: 12213 + return true; // L: 12214 + } else { + return false; // L: 12216 + } + } + } + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1436846475" + ) + static final void method6102() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12368 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12369 + var1.clearIsInFriendsChat(); // L: 12370 + } + + } // L: 12372 + + @ObfuscatedName("md") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "126" + ) + static void method6099(int var0) { + if (var0 != Client.loginState) { // L: 12665 + Client.loginState = var0; // L: 12666 + } + } // L: 12667 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 7f0f75761d..74464a7d20 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,212 +3,212 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("iq") @Implements("Model") public class Model extends Renderable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Liq;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Liq;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) - static class387 field2498; + static class387 field2723; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) - static class387 field2499; - @ObfuscatedName("d") + static class387 field2724; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnt;" ) - static class387 field2505; - @ObfuscatedName("am") - static boolean[] field2538; - @ObfuscatedName("al") - static boolean[] field2539; - @ObfuscatedName("ak") + static class387 field2749; + @ObfuscatedName("ad") + static boolean[] field2796; + @ObfuscatedName("ai") + static boolean[] field2764; + @ObfuscatedName("ax") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ag") - static int[] field2542; - @ObfuscatedName("af") - static int[] field2543; @ObfuscatedName("ap") - static int[] field2547; - @ObfuscatedName("ai") - static int[] field2545; - @ObfuscatedName("bz") - static int[] field2555; - @ObfuscatedName("bl") - static int[][] field2548; - @ObfuscatedName("be") - static int[] field2521; - @ObfuscatedName("bt") - static int[][] field2525; - @ObfuscatedName("ba") - static int[] field2526; - @ObfuscatedName("bg") - static int[] field2552; - @ObfuscatedName("bq") - static int[] field2567; + static int[] field2767; + @ObfuscatedName("az") + static int[] field2781; + @ObfuscatedName("as") + static int[] field2769; + @ObfuscatedName("aa") + static int[] field2727; + @ObfuscatedName("bm") + static int[] field2772; @ObfuscatedName("br") - static int[] field2509; - @ObfuscatedName("bc") - static int[] field2529; - @ObfuscatedName("bd") - static int[] field2556; + static int[][] field2773; + @ObfuscatedName("bo") + static int[] field2719; + @ObfuscatedName("bl") + static int[][] field2775; + @ObfuscatedName("be") + static int[] field2789; + @ObfuscatedName("bh") + static int[] field2745; @ObfuscatedName("bf") + static int[] field2776; + @ObfuscatedName("bb") + static int[] field2779; + @ObfuscatedName("bw") + static int[] field2765; + @ObfuscatedName("bx") + static int[] field2784; + @ObfuscatedName("bg") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("by") + @ObfuscatedName("bn") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bu") + @ObfuscatedName("bq") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bp") - static boolean field2560; - @ObfuscatedName("bs") + @ObfuscatedName("ba") + static boolean field2777; + @ObfuscatedName("by") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bo") + @ObfuscatedName("bd") @Export("Model_colorPalette") static int[] Model_colorPalette; - @ObfuscatedName("bi") - static int[] field2553; - @ObfuscatedName("f") + @ObfuscatedName("bc") + static int[] field2791; + @ObfuscatedName("l") @Export("verticesCount") int verticesCount; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("verticesX") int[] verticesX; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("verticesY") int[] verticesY; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("indicesCount") int indicesCount; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("indices1") int[] indices1; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("indices2") int[] indices2; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("indices3") int[] indices3; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("q") - byte[] field2514; + @ObfuscatedName("a") + byte[] field2739; @ObfuscatedName("y") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("z") - byte field2546; + @ObfuscatedName("j") + byte field2741; @ObfuscatedName("e") - int field2517; - @ObfuscatedName("t") - int[] field2541; - @ObfuscatedName("i") - int[] field2519; - @ObfuscatedName("ac") - int[] field2520; - @ObfuscatedName("ax") + int field2742; + @ObfuscatedName("z") + int[] field2743; + @ObfuscatedName("h") + int[] field2744; + @ObfuscatedName("ae") + int[] field2794; + @ObfuscatedName("aq") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("au") - int[][] field2523; - @ObfuscatedName("at") - int[][] field2524; - @ObfuscatedName("aw") + @ObfuscatedName("am") + int[][] field2748; + @ObfuscatedName("ak") + int[][] field2726; + @ObfuscatedName("ao") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("boundsType") int boundsType; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("bottomY") int bottomY; - @ObfuscatedName("ab") + @ObfuscatedName("av") @Export("xzRadius") int xzRadius; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("diameter") int diameter; - @ObfuscatedName("ad") + @ObfuscatedName("an") @Export("radius") int radius; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("xMid") int xMid; - @ObfuscatedName("as") + @ObfuscatedName("ag") @Export("yMid") int yMid; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("zMid") int zMid; - @ObfuscatedName("av") + @ObfuscatedName("ac") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("zMidOffset") int zMidOffset; - @ObfuscatedName("bn") + @ObfuscatedName("bu") @Export("overrideHue") public byte overrideHue; - @ObfuscatedName("bw") + @ObfuscatedName("bz") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("cd") + @ObfuscatedName("cm") @Export("overrideAmount") public byte overrideAmount; @@ -217,39 +217,39 @@ public class Model extends Renderable { Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 12 Model_sharedSpotAnimationModel = new Model(); // L: 13 Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 14 - field2498 = new class387(); // L: 15 - field2499 = new class387(); // L: 16 - field2505 = new class387(); // L: 17 - field2538 = new boolean[6500]; // L: 55 - field2539 = new boolean[6500]; // L: 56 + field2723 = new class387(); // L: 15 + field2724 = new class387(); // L: 16 + field2749 = new class387(); // L: 17 + field2796 = new boolean[6500]; // L: 55 + field2764 = new boolean[6500]; // L: 56 modelViewportXs = new int[6500]; // L: 57 modelViewportYs = new int[6500]; // L: 58 - field2542 = new int[6500]; // L: 59 - field2543 = new int[6500]; // L: 60 - field2547 = new int[6500]; // L: 61 - field2545 = new int[6500]; // L: 62 - field2555 = new int[1600]; // L: 64 - field2548 = new int[1600][512]; // L: 65 - field2521 = new int[12]; // L: 66 - field2525 = new int[12][2000]; // L: 67 - field2526 = new int[2000]; // L: 68 - field2552 = new int[2000]; // L: 69 - field2567 = new int[12]; // L: 70 - field2509 = new int[10]; // L: 71 - field2529 = new int[10]; // L: 72 - field2556 = new int[10]; // L: 73 - field2560 = true; // L: 77 + field2767 = new int[6500]; // L: 59 + field2781 = new int[6500]; // L: 60 + field2769 = new int[6500]; // L: 61 + field2727 = new int[6500]; // L: 62 + field2772 = new int[1600]; // L: 64 + field2773 = new int[1600][512]; // L: 65 + field2719 = new int[12]; // L: 66 + field2775 = new int[12][2000]; // L: 67 + field2789 = new int[2000]; // L: 68 + field2745 = new int[2000]; // L: 69 + field2776 = new int[12]; // L: 70 + field2779 = new int[10]; // L: 71 + field2765 = new int[10]; // L: 72 + field2784 = new int[10]; // L: 73 + field2777 = true; // L: 77 Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 80 Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 81 Model_colorPalette = Rasterizer3D.Rasterizer3D_colorPalette; // L: 82 - field2553 = Rasterizer3D.field2346; // L: 83 + field2791 = Rasterizer3D.field2571; // L: 83 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2546 = 0; - this.field2517 = 0; + this.field2741 = 0; + this.field2742 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -257,13 +257,13 @@ public class Model extends Renderable { } // L: 91 @ObfuscatedSignature( - descriptor = "([Lhx;I)V" + descriptor = "([Liq;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 18 this.indicesCount = 0; // L: 22 - this.field2546 = 0; // L: 33 - this.field2517 = 0; // L: 34 + this.field2741 = 0; // L: 33 + this.field2742 = 0; // L: 34 this.isSingleTile = false; // L: 42 this.xMidOffset = -1; // L: 51 this.yMidOffset = -1; // L: 52 @@ -274,8 +274,8 @@ public class Model extends Renderable { boolean var6 = false; // L: 97 this.verticesCount = 0; // L: 98 this.indicesCount = 0; // L: 99 - this.field2517 = 0; // L: 100 - this.field2546 = -1; // L: 101 + this.field2742 = 0; // L: 100 + this.field2741 = -1; // L: 101 int var7; Model var8; @@ -284,22 +284,22 @@ public class Model extends Renderable { if (var8 != null) { // L: 104 this.verticesCount += var8.verticesCount; // L: 105 this.indicesCount += var8.indicesCount; // L: 106 - this.field2517 += var8.field2517; // L: 107 + this.field2742 += var8.field2742; // L: 107 if (var8.faceRenderPriorities != null) { // L: 108 var3 = true; } else { - if (this.field2546 == -1) { // L: 110 - this.field2546 = var8.field2546; + if (this.field2741 == -1) { // L: 110 + this.field2741 = var8.field2741; } - if (this.field2546 != var8.field2546) { // L: 111 + if (this.field2741 != var8.field2741) { // L: 111 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 113 var5 |= var8.faceTextures != null; // L: 114 - var6 |= var8.field2514 != null; // L: 115 + var6 |= var8.field2739 != null; // L: 115 } } @@ -325,18 +325,18 @@ public class Model extends Renderable { } if (var6) { // L: 130 - this.field2514 = new byte[this.indicesCount]; + this.field2739 = new byte[this.indicesCount]; } - if (this.field2517 > 0) { // L: 131 - this.field2541 = new int[this.field2517]; // L: 132 - this.field2519 = new int[this.field2517]; // L: 133 - this.field2520 = new int[this.field2517]; // L: 134 + if (this.field2742 > 0) { // L: 131 + this.field2743 = new int[this.field2742]; // L: 132 + this.field2744 = new int[this.field2742]; // L: 133 + this.field2794 = new int[this.field2742]; // L: 134 } this.verticesCount = 0; // L: 136 this.indicesCount = 0; // L: 137 - this.field2517 = 0; // L: 138 + this.field2742 = 0; // L: 138 for (var7 = 0; var7 < var2; ++var7) { // L: 139 var8 = var1[var7]; // L: 140 @@ -353,7 +353,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { // L: 150 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2546; // L: 151 + this.faceRenderPriorities[this.indicesCount] = var8.field2741; // L: 151 } } @@ -370,21 +370,21 @@ public class Model extends Renderable { } if (var6) { // L: 160 - if (var8.field2514 != null && var8.field2514[var9] != -1) { // L: 161 - this.field2514[this.indicesCount] = (byte)(this.field2517 + var8.field2514[var9]); + if (var8.field2739 != null && var8.field2739[var9] != -1) { // L: 161 + this.field2739[this.indicesCount] = (byte)(this.field2742 + var8.field2739[var9]); } else { - this.field2514[this.indicesCount] = -1; // L: 162 + this.field2739[this.indicesCount] = -1; // L: 162 } } ++this.indicesCount; // L: 164 } - for (var9 = 0; var9 < var8.field2517; ++var9) { // L: 166 - this.field2541[this.field2517] = this.verticesCount + var8.field2541[var9]; // L: 167 - this.field2519[this.field2517] = this.verticesCount + var8.field2519[var9]; // L: 168 - this.field2520[this.field2517] = this.verticesCount + var8.field2520[var9]; // L: 169 - ++this.field2517; // L: 170 + for (var9 = 0; var9 < var8.field2742; ++var9) { // L: 166 + this.field2743[this.field2742] = this.verticesCount + var8.field2743[var9]; // L: 167 + this.field2744[this.field2742] = this.verticesCount + var8.field2744[var9]; // L: 168 + this.field2794[this.field2742] = this.verticesCount + var8.field2794[var9]; // L: 169 + ++this.field2742; // L: 170 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 172 @@ -400,7 +400,7 @@ public class Model extends Renderable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lhx;" + descriptor = "([[IIIIZI)Liq;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -422,7 +422,7 @@ public class Model extends Renderable { var11 = new Model(); // L: 196 var11.verticesCount = this.verticesCount; // L: 197 var11.indicesCount = this.indicesCount; // L: 198 - var11.field2517 = this.field2517; // L: 199 + var11.field2742 = this.field2742; // L: 199 var11.verticesX = this.verticesX; // L: 200 var11.verticesZ = this.verticesZ; // L: 201 var11.indices1 = this.indices1; // L: 202 @@ -433,12 +433,12 @@ public class Model extends Renderable { var11.faceColors3 = this.faceColors3; // L: 207 var11.faceRenderPriorities = this.faceRenderPriorities; // L: 208 var11.faceAlphas = this.faceAlphas; // L: 209 - var11.field2514 = this.field2514; // L: 210 + var11.field2739 = this.field2739; // L: 210 var11.faceTextures = this.faceTextures; // L: 211 - var11.field2546 = this.field2546; // L: 212 - var11.field2541 = this.field2541; // L: 213 - var11.field2519 = this.field2519; // L: 214 - var11.field2520 = this.field2520; // L: 215 + var11.field2741 = this.field2741; // L: 212 + var11.field2743 = this.field2743; // L: 213 + var11.field2744 = this.field2744; // L: 214 + var11.field2794 = this.field2794; // L: 215 var11.vertexLabels = this.vertexLabels; // L: 216 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217 var11.isSingleTile = this.isSingleTile; // L: 218 @@ -496,9 +496,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Z)Lhx;" + descriptor = "(Z)Liq;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -509,9 +509,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Z)Lhx;" + descriptor = "(Z)Liq;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -522,15 +522,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266 } - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZLhx;[B)Lhx;" + descriptor = "(ZLiq;[B)Liq;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 270 var2.indicesCount = this.indicesCount; // L: 271 - var2.field2517 = this.field2517; // L: 272 + var2.field2742 = this.field2742; // L: 272 if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 273 var2.verticesX = new int[this.verticesCount + 100]; // L: 274 var2.verticesY = new int[this.verticesCount + 100]; // L: 275 @@ -566,23 +566,23 @@ public class Model extends Renderable { var2.faceColors2 = this.faceColors2; // L: 297 var2.faceColors3 = this.faceColors3; // L: 298 var2.faceRenderPriorities = this.faceRenderPriorities; // L: 299 - var2.field2514 = this.field2514; // L: 300 + var2.field2739 = this.field2739; // L: 300 var2.faceTextures = this.faceTextures; // L: 301 - var2.field2546 = this.field2546; // L: 302 - var2.field2541 = this.field2541; // L: 303 - var2.field2519 = this.field2519; // L: 304 - var2.field2520 = this.field2520; // L: 305 + var2.field2741 = this.field2741; // L: 302 + var2.field2743 = this.field2743; // L: 303 + var2.field2744 = this.field2744; // L: 304 + var2.field2794 = this.field2794; // L: 305 var2.vertexLabels = this.vertexLabels; // L: 306 var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 307 - var2.field2523 = this.field2523; // L: 308 - var2.field2524 = this.field2524; // L: 309 + var2.field2748 = this.field2748; // L: 308 + var2.field2726 = this.field2726; // L: 309 var2.isSingleTile = this.isSingleTile; // L: 310 var2.resetBounds(); // L: 311 var2.overrideAmount = 0; // L: 312 return var2; // L: 313 } - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 317 @@ -596,9 +596,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; // L: 325 for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 326 - int var11 = Rasterizer3D.method4080(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327 + int var11 = Rasterizer3D.method4626(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327 int var12 = this.verticesY[var10]; // L: 328 - int var13 = Rasterizer3D.method3993(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 + int var13 = Rasterizer3D.method4663(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 if (var11 < var2) { // L: 330 var2 = var11; } @@ -630,7 +630,6 @@ public class Model extends Renderable { this.xMidOffset = (var5 - var2 + 1) / 2; // L: 340 this.yMidOffset = (var6 - var3 + 1) / 2; // L: 341 this.zMidOffset = (var7 - var4 + 1) / 2; // L: 342 - boolean var14 = true; // L: 343 if (this.xMidOffset < 32) { // L: 344 this.xMidOffset = 32; } @@ -640,7 +639,6 @@ public class Model extends Renderable { } if (this.isSingleTile) { // L: 346 - boolean var15 = true; // L: 347 this.xMidOffset += 8; // L: 348 this.zMidOffset += 8; // L: 349 } @@ -648,7 +646,7 @@ public class Model extends Renderable { } } // L: 351 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 354 @@ -682,7 +680,7 @@ public class Model extends Renderable { } // L: 371 @ObfuscatedName("r") - void method4359() { + void method4972() { if (this.boundsType != 2) { // L: 374 this.boundsType = 2; // L: 375 this.xzRadius = 0; // L: 376 @@ -703,22 +701,22 @@ public class Model extends Renderable { } } // L: 387 - @ObfuscatedName("k") - public int method4360() { + @ObfuscatedName("p") + public int method5014() { this.calculateBoundsCylinder(); // L: 390 return this.xzRadius; // L: 391 } - @ObfuscatedName("x") + @ObfuscatedName("w") @Export("resetBounds") public void resetBounds() { this.boundsType = 0; // L: 395 this.xMidOffset = -1; // L: 396 } // L: 397 - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lgo;I)V" + descriptor = "(Lim;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -740,36 +738,36 @@ public class Model extends Renderable { } } // L: 412 - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ldu;I)V" + descriptor = "(Ldo;I)V" ) - public void method4363(class122 var1, int var2) { - Skeleton var3 = var1.field1485; // L: 415 - class202 var4 = var3.method4120(); // L: 416 + public void method5000(class122 var1, int var2) { + Skeleton var3 = var1.field1472; // L: 415 + class231 var4 = var3.method4721(); // L: 416 if (var4 != null) { // L: 417 - var3.method4120().method4106(var1, var2); // L: 418 - this.method4365(var3.method4120(), var1.method2783()); // L: 419 + var3.method4721().method4717(var1, var2); // L: 418 + this.method4978(var3.method4721(), var1.method2766()); // L: 419 } - if (var1.method2784()) { // L: 421 - this.method4364(var1, var2); // L: 422 + if (var1.method2768()) { // L: 421 + this.method5017(var1, var2); // L: 422 } this.resetBounds(); // L: 424 } // L: 425 - @ObfuscatedName("p") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ldu;I)V" + descriptor = "(Ldo;I)V" ) - void method4364(class122 var1, int var2) { - Skeleton var3 = var1.field1485; // L: 428 + void method5017(class122 var1, int var2) { + Skeleton var3 = var1.field1472; // L: 428 for (int var4 = 0; var4 < var3.count; ++var4) { // L: 429 int var5 = var3.transformTypes[var4]; // L: 430 - if (var5 == 5 && var1.field1480 != null && var1.field1480[var4] != null && var1.field1480[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 - class117 var6 = var1.field1480[var4][0]; // L: 433 + if (var5 == 5 && var1.field1474 != null && var1.field1474[var4] != null && var1.field1474[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 + class117 var6 = var1.field1474[var4][0]; // L: 433 int[] var7 = var3.labels[var4]; // L: 434 int var8 = var7.length; // L: 435 @@ -780,7 +778,7 @@ public class Model extends Renderable { for (int var12 = 0; var12 < var11.length; ++var12) { // L: 440 int var13 = var11[var12]; // L: 441 - int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2700(var2) * 255.0F); // L: 442 + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2709(var2) * 255.0F); // L: 442 if (var14 < 0) { // L: 443 var14 = 0; } else if (var14 > 255) { // L: 444 @@ -796,17 +794,17 @@ public class Model extends Renderable { } // L: 452 - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgl;I)V" + descriptor = "(Lhk;I)V" ) - void method4365(class202 var1, int var2) { - this.method4381(var1, var2); // L: 456 + void method4978(class231 var1, int var2) { + this.method5034(var1, var2); // L: 456 } // L: 458 - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lgo;ILgo;I[I)V" + descriptor = "(Lim;ILim;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -856,29 +854,29 @@ public class Model extends Renderable { } } // L: 464 490 - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ldu;I[ZZ)V" + descriptor = "(Ldo;I[ZZ)V" ) - public void method4367(class122 var1, int var2, boolean[] var3, boolean var4) { - Skeleton var5 = var1.field1485; // L: 493 - class202 var6 = var5.method4120(); // L: 494 + public void method4965(class122 var1, int var2, boolean[] var3, boolean var4) { + Skeleton var5 = var1.field1472; // L: 493 + class231 var6 = var5.method4721(); // L: 494 if (var6 != null) { // L: 495 - var6.method4116(var1, var2, var3, var4); // L: 496 - this.method4365(var6, var1.method2783()); // L: 497 + var6.method4701(var1, var2, var3, var4); // L: 496 + this.method4978(var6, var1.method2766()); // L: 497 } - if (var1.method2784()) { // L: 499 - this.method4364(var1, var2); // L: 500 + if (var1.method2768()) { // L: 499 + this.method5017(var1, var2); // L: 500 } } // L: 502 - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lgo;I[IZ)V" + descriptor = "(Lim;I[IZ)V" ) - public void method4368(Frames var1, int var2, int[] var3, boolean var4) { + public void method4981(Frames var1, int var2, int[] var3, boolean var4) { if (var3 == null) { // L: 505 this.animate(var1, var2); // L: 506 } else { @@ -908,7 +906,7 @@ public class Model extends Renderable { } } // L: 507 526 - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 529 @@ -1076,7 +1074,7 @@ public class Model extends Renderable { } } // L: 558 573 615 636 654 656 - @ObfuscatedName("q") + @ObfuscatedName("y") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 659 @@ -1088,7 +1086,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 664 } // L: 665 - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 668 @@ -1099,7 +1097,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 672 } // L: 673 - @ObfuscatedName("z") + @ObfuscatedName("e") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 676 @@ -1111,7 +1109,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 681 } // L: 682 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 685 @@ -1126,7 +1124,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 692 } // L: 693 - @ObfuscatedName("t") + @ObfuscatedName("h") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 696 @@ -1141,7 +1139,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 701 } // L: 702 - @ObfuscatedName("i") + @ObfuscatedName("ae") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 705 @@ -1153,11 +1151,11 @@ public class Model extends Renderable { this.resetBounds(); // L: 710 } // L: 711 - @ObfuscatedName("ac") - public final void method4376(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2555[0] = -1; // L: 714 + @ObfuscatedName("aq") + public final void method5003(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2772[0] = -1; // L: 714 if (this.boundsType != 2 && this.boundsType != 1) { // L: 715 - this.method4359(); + this.method4972(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 716 @@ -1200,13 +1198,13 @@ public class Model extends Renderable { var22 += var7; // L: 748 var23 = var21 * var17 - var22 * var16 >> 16; // L: 749 var22 = var21 * var16 + var22 * var17 >> 16; // L: 750 - field2542[var19] = var22 - var18; // L: 752 + field2767[var19] = var22 - var18; // L: 752 modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 753 modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 754 - if (this.field2517 > 0) { // L: 755 - field2543[var19] = var20; // L: 756 - field2547[var19] = var23; // L: 757 - field2545[var19] = var22; // L: 758 + if (this.field2742 > 0) { // L: 755 + field2781[var19] = var20; // L: 756 + field2769[var19] = var23; // L: 757 + field2727[var19] = var22; // L: 758 } } @@ -1217,11 +1215,11 @@ public class Model extends Renderable { } // L: 765 - @ObfuscatedName("ax") - public final void method4366(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2555[0] = -1; // L: 768 + @ObfuscatedName("aw") + public final void method5050(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2772[0] = -1; // L: 768 if (this.boundsType != 2 && this.boundsType != 1) { // L: 769 - this.method4359(); + this.method4972(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 770 @@ -1264,13 +1262,13 @@ public class Model extends Renderable { var23 += var7; // L: 802 var24 = var22 * var18 - var23 * var17 >> 16; // L: 803 var23 = var22 * var17 + var23 * var18 >> 16; // L: 804 - field2542[var20] = var23 - var19; // L: 806 + field2767[var20] = var23 - var19; // L: 806 modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 807 modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 808 - if (this.field2517 > 0) { // L: 809 - field2543[var20] = var21; // L: 810 - field2547[var20] = var24; // L: 811 - field2545[var20] = var23; // L: 812 + if (this.field2742 > 0) { // L: 809 + field2781[var20] = var21; // L: 810 + field2769[var20] = var24; // L: 811 + field2727[var20] = var23; // L: 812 } } @@ -1281,16 +1279,16 @@ public class Model extends Renderable { } // L: 819 - @ObfuscatedName("ay") + @ObfuscatedName("am") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 945 + if (this.diameter < 1600) { // L: 1003 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 946 - field2555[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1004 + field2772[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 947 + var6 = var3 ? 20 : 5; // L: 1005 int var7; int var8; @@ -1302,493 +1300,464 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 948 - if (this.faceColors3[var7] != -2) { // L: 949 - var8 = this.indices1[var7]; // L: 950 - var9 = this.indices2[var7]; // L: 951 - var10 = this.indices3[var7]; // L: 952 - var11 = modelViewportXs[var8]; // L: 953 - var12 = modelViewportXs[var9]; // L: 954 - var28 = modelViewportXs[var10]; // L: 955 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1006 + if (this.faceColors3[var7] != -2) { // L: 1007 + var8 = this.indices1[var7]; // L: 1008 + var9 = this.indices2[var7]; // L: 1009 + var10 = this.indices3[var7]; // L: 1010 + var11 = modelViewportXs[var8]; // L: 1011 + var12 = modelViewportXs[var9]; // L: 1012 + var28 = modelViewportXs[var10]; // L: 1013 int var29; - int var30; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 956 - if (var2) { // L: 982 - var15 = modelViewportYs[var8]; // L: 984 - var16 = modelViewportYs[var9]; // L: 985 - var30 = modelViewportYs[var10]; // L: 986 - var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 988 - boolean var34; - if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 989 - var34 = false; // L: 990 - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; // L: 993 - if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 994 - var34 = false; // L: 995 - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 998 - if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 999 - var34 = false; // L: 1000 - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; // L: 1003 - if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 1004 - var34 = false; // L: 1005 - } else { - var34 = true; // L: 1008 - } - } - } - } - - if (var34) { // L: 1010 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1013 - var2 = false; // L: 1015 - } + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1014 + if (var2 && class135.method2919(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 1040 + KeyHandler.method350(var4); // L: 1041 + var2 = false; // L: 1042 } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1018 - field2539[var7] = false; // L: 1019 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1020 - field2538[var7] = false; // L: 1021 + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1044 + field2764[var7] = false; // L: 1045 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1046 + field2796[var7] = false; // L: 1047 } else { - field2538[var7] = true; + field2796[var7] = true; } - var29 = (field2542[var8] + field2542[var9] + field2542[var10]) / 3 + this.radius; // L: 1022 - field2548[var29][field2555[var29]++] = var7; // L: 1023 + var29 = (field2767[var8] + field2767[var9] + field2767[var10]) / 3 + this.radius; // L: 1048 + field2773[var29][field2772[var29]++] = var7; // L: 1049 } } else { - var29 = field2543[var8]; // L: 957 - var15 = field2543[var9]; // L: 958 - var16 = field2543[var10]; // L: 959 - var30 = field2547[var8]; // L: 960 - var18 = field2547[var9]; // L: 961 - int var19 = field2547[var10]; // L: 962 - int var20 = field2545[var8]; // L: 963 - int var21 = field2545[var9]; // L: 964 - int var22 = field2545[var10]; // L: 965 - var29 -= var15; // L: 966 - var16 -= var15; // L: 967 - var30 -= var18; // L: 968 - var19 -= var18; // L: 969 - var20 -= var21; // L: 970 - var22 -= var21; // L: 971 - int var23 = var30 * var22 - var20 * var19; // L: 972 - int var24 = var20 * var16 - var29 * var22; // L: 973 - int var25 = var29 * var19 - var30 * var16; // L: 974 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 975 - field2539[var7] = true; // L: 976 - int var26 = (field2542[var8] + field2542[var9] + field2542[var10]) / 3 + this.radius; // L: 977 - field2548[var26][field2555[var26]++] = var7; // L: 978 + var29 = field2781[var8]; // L: 1015 + var15 = field2781[var9]; // L: 1016 + var16 = field2781[var10]; // L: 1017 + int var30 = field2769[var8]; // L: 1018 + var18 = field2769[var9]; // L: 1019 + int var19 = field2769[var10]; // L: 1020 + int var20 = field2727[var8]; // L: 1021 + int var21 = field2727[var9]; // L: 1022 + int var22 = field2727[var10]; // L: 1023 + var29 -= var15; // L: 1024 + var16 -= var15; // L: 1025 + var30 -= var18; // L: 1026 + var19 -= var18; // L: 1027 + var20 -= var21; // L: 1028 + var22 -= var21; // L: 1029 + int var23 = var30 * var22 - var20 * var19; // L: 1030 + int var24 = var20 * var16 - var29 * var22; // L: 1031 + int var25 = var29 * var19 - var30 * var16; // L: 1032 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1033 + field2764[var7] = true; // L: 1034 + int var26 = (field2767[var8] + field2767[var9] + field2767[var10]) / 3 + this.radius; // L: 1035 + field2773[var26][field2772[var26]++] = var7; // L: 1036 } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 1027 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1028 - var8 = field2555[var7]; // L: 1029 - if (var8 > 0) { // L: 1030 - var27 = field2548[var7]; // L: 1031 + if (this.faceRenderPriorities == null) { // L: 1053 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1054 + var8 = field2772[var7]; // L: 1055 + if (var8 > 0) { // L: 1056 + var27 = field2773[var7]; // L: 1057 - for (var10 = 0; var10 < var8; ++var10) { // L: 1032 + for (var10 = 0; var10 < var8; ++var10) { // L: 1058 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 1037 - field2521[var7] = 0; // L: 1038 - field2567[var7] = 0; // L: 1039 + for (var7 = 0; var7 < 12; ++var7) { // L: 1063 + field2719[var7] = 0; // L: 1064 + field2776[var7] = 0; // L: 1065 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1041 - var8 = field2555[var7]; // L: 1042 - if (var8 > 0) { // L: 1043 - var27 = field2548[var7]; // L: 1044 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1067 + var8 = field2772[var7]; // L: 1068 + if (var8 > 0) { // L: 1069 + var27 = field2773[var7]; // L: 1070 - for (var10 = 0; var10 < var8; ++var10) { // L: 1045 - var11 = var27[var10]; // L: 1046 - byte var33 = this.faceRenderPriorities[var11]; // L: 1047 - var28 = field2521[var33]++; // L: 1048 - field2525[var33][var28] = var11; // L: 1049 - if (var33 < 10) { // L: 1050 - int[] var10000 = field2567; - var10000[var33] += var7; - } else if (var33 == 10) { // L: 1051 - field2526[var28] = var7; + for (var10 = 0; var10 < var8; ++var10) { // L: 1071 + var11 = var27[var10]; // L: 1072 + byte var31 = this.faceRenderPriorities[var11]; // L: 1073 + var28 = field2719[var31]++; // L: 1074 + field2775[var31][var28] = var11; // L: 1075 + if (var31 < 10) { // L: 1076 + int[] var10000 = field2776; + var10000[var31] += var7; + } else if (var31 == 10) { // L: 1077 + field2789[var28] = var7; } else { - field2552[var28] = var7; // L: 1052 + field2745[var28] = var7; // L: 1078 } } } } - var7 = 0; // L: 1056 - if (field2521[1] > 0 || field2521[2] > 0) { // L: 1057 - var7 = (field2567[1] + field2567[2]) / (field2521[1] + field2521[2]); + var7 = 0; // L: 1082 + if (field2719[1] > 0 || field2719[2] > 0) { // L: 1083 + var7 = (field2776[1] + field2776[2]) / (field2719[1] + field2719[2]); } - var8 = 0; // L: 1058 - if (field2521[3] > 0 || field2521[4] > 0) { // L: 1059 - var8 = (field2567[3] + field2567[4]) / (field2521[3] + field2521[4]); + var8 = 0; // L: 1084 + if (field2719[3] > 0 || field2719[4] > 0) { // L: 1085 + var8 = (field2776[3] + field2776[4]) / (field2719[3] + field2719[4]); } - var9 = 0; // L: 1060 - if (field2521[6] > 0 || field2521[8] > 0) { // L: 1061 - var9 = (field2567[8] + field2567[6]) / (field2521[8] + field2521[6]); + var9 = 0; // L: 1086 + if (field2719[6] > 0 || field2719[8] > 0) { // L: 1087 + var9 = (field2776[8] + field2776[6]) / (field2719[8] + field2719[6]); } - var11 = 0; // L: 1063 - var12 = field2521[10]; // L: 1064 - int[] var13 = field2525[10]; // L: 1065 - int[] var14 = field2526; // L: 1066 - if (var11 == var12) { // L: 1067 - var11 = 0; // L: 1068 - var12 = field2521[11]; // L: 1069 - var13 = field2525[11]; // L: 1070 - var14 = field2552; // L: 1071 + var11 = 0; // L: 1089 + var12 = field2719[10]; // L: 1090 + int[] var13 = field2775[10]; // L: 1091 + int[] var14 = field2789; // L: 1092 + if (var11 == var12) { // L: 1093 + var11 = 0; // L: 1094 + var12 = field2719[11]; // L: 1095 + var13 = field2775[11]; // L: 1096 + var14 = field2745; // L: 1097 } - if (var11 < var12) { // L: 1073 + if (var11 < var12) { // L: 1099 var10 = var14[var11]; } else { - var10 = -1000; // L: 1074 + var10 = -1000; // L: 1100 } - for (var15 = 0; var15 < 10; ++var15) { // L: 1075 - while (var15 == 0 && var10 > var7) { // L: 1076 - this.drawFace(var13[var11++]); // L: 1077 - if (var11 == var12 && var13 != field2525[11]) { // L: 1078 - var11 = 0; // L: 1079 - var12 = field2521[11]; // L: 1080 - var13 = field2525[11]; // L: 1081 - var14 = field2552; // L: 1082 + for (var15 = 0; var15 < 10; ++var15) { // L: 1101 + while (var15 == 0 && var10 > var7) { // L: 1102 + this.drawFace(var13[var11++]); // L: 1103 + if (var11 == var12 && var13 != field2775[11]) { // L: 1104 + var11 = 0; // L: 1105 + var12 = field2719[11]; // L: 1106 + var13 = field2775[11]; // L: 1107 + var14 = field2745; // L: 1108 } - if (var11 < var12) { // L: 1084 + if (var11 < var12) { // L: 1110 var10 = var14[var11]; } else { - var10 = -1000; // L: 1085 + var10 = -1000; // L: 1111 } } - while (var15 == 3 && var10 > var8) { // L: 1087 - this.drawFace(var13[var11++]); // L: 1088 - if (var11 == var12 && var13 != field2525[11]) { // L: 1089 - var11 = 0; // L: 1090 - var12 = field2521[11]; // L: 1091 - var13 = field2525[11]; // L: 1092 - var14 = field2552; // L: 1093 + while (var15 == 3 && var10 > var8) { // L: 1113 + this.drawFace(var13[var11++]); // L: 1114 + if (var11 == var12 && var13 != field2775[11]) { // L: 1115 + var11 = 0; // L: 1116 + var12 = field2719[11]; // L: 1117 + var13 = field2775[11]; // L: 1118 + var14 = field2745; // L: 1119 } - if (var11 < var12) { // L: 1095 + if (var11 < var12) { // L: 1121 var10 = var14[var11]; } else { - var10 = -1000; // L: 1096 + var10 = -1000; // L: 1122 } } - while (var15 == 5 && var10 > var9) { // L: 1098 - this.drawFace(var13[var11++]); // L: 1099 - if (var11 == var12 && var13 != field2525[11]) { // L: 1100 - var11 = 0; // L: 1101 - var12 = field2521[11]; // L: 1102 - var13 = field2525[11]; // L: 1103 - var14 = field2552; // L: 1104 + while (var15 == 5 && var10 > var9) { // L: 1124 + this.drawFace(var13[var11++]); // L: 1125 + if (var11 == var12 && var13 != field2775[11]) { // L: 1126 + var11 = 0; // L: 1127 + var12 = field2719[11]; // L: 1128 + var13 = field2775[11]; // L: 1129 + var14 = field2745; // L: 1130 } - if (var11 < var12) { // L: 1106 + if (var11 < var12) { // L: 1132 var10 = var14[var11]; } else { - var10 = -1000; // L: 1107 + var10 = -1000; // L: 1133 } } - var16 = field2521[var15]; // L: 1109 - int[] var17 = field2525[var15]; // L: 1110 + var16 = field2719[var15]; // L: 1135 + int[] var17 = field2775[var15]; // L: 1136 - for (var18 = 0; var18 < var16; ++var18) { // L: 1111 - this.drawFace(var17[var18]); // L: 1112 + for (var18 = 0; var18 < var16; ++var18) { // L: 1137 + this.drawFace(var17[var18]); // L: 1138 } } - while (var10 != -1000) { // L: 1115 - this.drawFace(var13[var11++]); // L: 1116 - if (var11 == var12 && var13 != field2525[11]) { // L: 1117 - var11 = 0; // L: 1118 - var13 = field2525[11]; // L: 1119 - var12 = field2521[11]; // L: 1120 - var14 = field2552; // L: 1121 + while (var10 != -1000) { // L: 1141 + this.drawFace(var13[var11++]); // L: 1142 + if (var11 == var12 && var13 != field2775[11]) { // L: 1143 + var11 = 0; // L: 1144 + var13 = field2775[11]; // L: 1145 + var12 = field2719[11]; // L: 1146 + var14 = field2745; // L: 1147 } - if (var11 < var12) { // L: 1123 + if (var11 < var12) { // L: 1149 var10 = var14[var11]; } else { - var10 = -1000; // L: 1124 + var10 = -1000; // L: 1150 } } } } - } // L: 1035 1126 + } // L: 1061 1152 - @ObfuscatedName("au") + @ObfuscatedName("ak") @Export("drawFace") final void drawFace(int var1) { - if (field2539[var1]) { // L: 1129 - this.method4412(var1); // L: 1130 + if (field2764[var1]) { // L: 1155 + this.method5010(var1); // L: 1156 } else { - int var2 = this.indices1[var1]; // L: 1133 - int var3 = this.indices2[var1]; // L: 1134 - int var4 = this.indices3[var1]; // L: 1135 - Rasterizer3D.field2334 = field2538[var1]; // L: 1136 - if (this.faceAlphas == null) { // L: 1137 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1138 + int var2 = this.indices1[var1]; // L: 1159 + int var3 = this.indices2[var1]; // L: 1160 + int var4 = this.indices3[var1]; // L: 1161 + Rasterizer3D.field2562 = field2796[var1]; // L: 1162 + if (this.faceAlphas == null) { // L: 1163 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1164 } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1141 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1167 } - this.method4413(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1143 + this.method4994(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1169 } - } // L: 1131 1144 + } // L: 1157 1170 - @ObfuscatedName("at") - final void method4413(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1147 + @ObfuscatedName("ao") + final void method4994(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1173 int var11; int var12; int var13; - if (this.field2514 != null && this.field2514[var1] != -1) { // L: 1165 - int var14 = this.field2514[var1] & 255; // L: 1166 - var11 = this.field2541[var14]; // L: 1167 - var12 = this.field2519[var14]; // L: 1168 - var13 = this.field2520[var14]; // L: 1169 + if (this.field2739 != null && this.field2739[var1] != -1) { // L: 1191 + int var14 = this.field2739[var1] & 255; // L: 1192 + var11 = this.field2743[var14]; // L: 1193 + var12 = this.field2744[var14]; // L: 1194 + var13 = this.field2794[var14]; // L: 1195 } else { - var11 = this.indices1[var1]; // L: 1172 - var12 = this.indices2[var1]; // L: 1173 - var13 = this.indices3[var1]; // L: 1174 + var11 = this.indices1[var1]; // L: 1198 + var12 = this.indices2[var1]; // L: 1199 + var13 = this.indices3[var1]; // L: 1200 } - if (this.faceColors3[var1] == -1) { // L: 1176 - Rasterizer3D.method4010(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2543[var11], field2543[var12], field2543[var13], field2547[var11], field2547[var12], field2547[var13], field2545[var11], field2545[var12], field2545[var13], this.faceTextures[var1]); // L: 1177 + if (this.faceColors3[var1] == -1) { // L: 1202 + Rasterizer3D.method4620(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2781[var11], field2781[var12], field2781[var13], field2769[var11], field2769[var12], field2769[var13], field2727[var11], field2727[var12], field2727[var13], this.faceTextures[var1]); // L: 1203 } else { - Rasterizer3D.method4010(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2543[var11], field2543[var12], field2543[var13], field2547[var11], field2547[var12], field2547[var13], field2545[var11], field2545[var12], field2545[var13], this.faceTextures[var1]); // L: 1180 + Rasterizer3D.method4620(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2781[var11], field2781[var12], field2781[var13], field2769[var11], field2769[var12], field2769[var13], field2727[var11], field2727[var12], field2727[var13], this.faceTextures[var1]); // L: 1206 } - } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1148 - Rasterizer3D.method4008(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1149 - } else if (this.faceColors3[var1] == -1) { // L: 1151 - Rasterizer3D.method4007(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1152 - } else if (this.overrideAmount > 0) { // L: 1154 - Rasterizer3D.method4084(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1155 + } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1174 + Rasterizer3D.method4618(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1175 + } else if (this.faceColors3[var1] == -1) { // L: 1177 + Rasterizer3D.method4617(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1178 + } else if (this.overrideAmount > 0) { // L: 1180 + Rasterizer3D.method4614(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1181 } else { - Rasterizer3D.method4003(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1158 + Rasterizer3D.method4613(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1184 } - } // L: 1183 + } // L: 1209 - @ObfuscatedName("aw") - final void method4412(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1186 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1187 - int var4 = 0; // L: 1188 - int var5 = this.indices1[var1]; // L: 1189 - int var6 = this.indices2[var1]; // L: 1190 - int var7 = this.indices3[var1]; // L: 1191 - int var8 = field2545[var5]; // L: 1192 - int var9 = field2545[var6]; // L: 1193 - int var10 = field2545[var7]; // L: 1194 - if (this.faceAlphas == null) { // L: 1195 + @ObfuscatedName("aj") + final void method5010(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1212 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1213 + int var4 = 0; // L: 1214 + int var5 = this.indices1[var1]; // L: 1215 + int var6 = this.indices2[var1]; // L: 1216 + int var7 = this.indices3[var1]; // L: 1217 + int var8 = field2727[var5]; // L: 1218 + int var9 = field2727[var6]; // L: 1219 + int var10 = field2727[var7]; // L: 1220 + if (this.faceAlphas == null) { // L: 1221 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1196 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1222 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1197 - field2509[var4] = modelViewportXs[var5]; // L: 1198 - field2529[var4] = modelViewportYs[var5]; // L: 1199 - field2556[var4++] = this.faceColors1[var1]; // L: 1200 + if (var8 >= 50) { // L: 1223 + field2779[var4] = modelViewportXs[var5]; // L: 1224 + field2765[var4] = modelViewportYs[var5]; // L: 1225 + field2784[var4++] = this.faceColors1[var1]; // L: 1226 } else { - var11 = field2543[var5]; // L: 1203 - var12 = field2547[var5]; // L: 1204 - var13 = this.faceColors1[var1]; // L: 1205 - if (var10 >= 50) { // L: 1206 - var14 = field2553[var10 - var8] * (50 - var8); // L: 1207 - field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var7] - var11) * var14 >> 16)) / 50; // L: 1208 - field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1209 - field2556[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1210 + var11 = field2781[var5]; // L: 1229 + var12 = field2769[var5]; // L: 1230 + var13 = this.faceColors1[var1]; // L: 1231 + if (var10 >= 50) { // L: 1232 + var14 = field2791[var10 - var8] * (50 - var8); // L: 1233 + field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var7] - var11) * var14 >> 16)) / 50; // L: 1234 + field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var7] - var12) * var14 >> 16)) / 50; // L: 1235 + field2784[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1236 } - if (var9 >= 50) { // L: 1212 - var14 = field2553[var9 - var8] * (50 - var8); // L: 1213 - field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var6] - var11) * var14 >> 16)) / 50; // L: 1214 - field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1215 - field2556[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1216 + if (var9 >= 50) { // L: 1238 + var14 = field2791[var9 - var8] * (50 - var8); // L: 1239 + field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var6] - var11) * var14 >> 16)) / 50; // L: 1240 + field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var6] - var12) * var14 >> 16)) / 50; // L: 1241 + field2784[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1242 } } - if (var9 >= 50) { // L: 1219 - field2509[var4] = modelViewportXs[var6]; // L: 1220 - field2529[var4] = modelViewportYs[var6]; // L: 1221 - field2556[var4++] = this.faceColors2[var1]; // L: 1222 + if (var9 >= 50) { // L: 1245 + field2779[var4] = modelViewportXs[var6]; // L: 1246 + field2765[var4] = modelViewportYs[var6]; // L: 1247 + field2784[var4++] = this.faceColors2[var1]; // L: 1248 } else { - var11 = field2543[var6]; // L: 1225 - var12 = field2547[var6]; // L: 1226 - var13 = this.faceColors2[var1]; // L: 1227 - if (var8 >= 50) { // L: 1228 - var14 = field2553[var8 - var9] * (50 - var9); // L: 1229 - field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var5] - var11) * var14 >> 16)) / 50; // L: 1230 - field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1231 - field2556[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1232 + var11 = field2781[var6]; // L: 1251 + var12 = field2769[var6]; // L: 1252 + var13 = this.faceColors2[var1]; // L: 1253 + if (var8 >= 50) { // L: 1254 + var14 = field2791[var8 - var9] * (50 - var9); // L: 1255 + field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var5] - var11) * var14 >> 16)) / 50; // L: 1256 + field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var5] - var12) * var14 >> 16)) / 50; // L: 1257 + field2784[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1258 } - if (var10 >= 50) { // L: 1234 - var14 = field2553[var10 - var9] * (50 - var9); // L: 1235 - field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var7] - var11) * var14 >> 16)) / 50; // L: 1236 - field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1237 - field2556[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1238 + if (var10 >= 50) { // L: 1260 + var14 = field2791[var10 - var9] * (50 - var9); // L: 1261 + field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var7] - var11) * var14 >> 16)) / 50; // L: 1262 + field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var7] - var12) * var14 >> 16)) / 50; // L: 1263 + field2784[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1264 } } - if (var10 >= 50) { // L: 1241 - field2509[var4] = modelViewportXs[var7]; // L: 1242 - field2529[var4] = modelViewportYs[var7]; // L: 1243 - field2556[var4++] = this.faceColors3[var1]; // L: 1244 + if (var10 >= 50) { // L: 1267 + field2779[var4] = modelViewportXs[var7]; // L: 1268 + field2765[var4] = modelViewportYs[var7]; // L: 1269 + field2784[var4++] = this.faceColors3[var1]; // L: 1270 } else { - var11 = field2543[var7]; // L: 1247 - var12 = field2547[var7]; // L: 1248 - var13 = this.faceColors3[var1]; // L: 1249 - if (var9 >= 50) { // L: 1250 - var14 = field2553[var9 - var10] * (50 - var10); // L: 1251 - field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var6] - var11) * var14 >> 16)) / 50; // L: 1252 - field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1253 - field2556[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1254 + var11 = field2781[var7]; // L: 1273 + var12 = field2769[var7]; // L: 1274 + var13 = this.faceColors3[var1]; // L: 1275 + if (var9 >= 50) { // L: 1276 + var14 = field2791[var9 - var10] * (50 - var10); // L: 1277 + field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var6] - var11) * var14 >> 16)) / 50; // L: 1278 + field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var6] - var12) * var14 >> 16)) / 50; // L: 1279 + field2784[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1280 } - if (var8 >= 50) { // L: 1256 - var14 = field2553[var8 - var10] * (50 - var10); // L: 1257 - field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var5] - var11) * var14 >> 16)) / 50; // L: 1258 - field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1259 - field2556[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1260 + if (var8 >= 50) { // L: 1282 + var14 = field2791[var8 - var10] * (50 - var10); // L: 1283 + field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var5] - var11) * var14 >> 16)) / 50; // L: 1284 + field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var5] - var12) * var14 >> 16)) / 50; // L: 1285 + field2784[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1286 } } - var11 = field2509[0]; // L: 1263 - var12 = field2509[1]; // L: 1264 - var13 = field2509[2]; // L: 1265 - var14 = field2529[0]; // L: 1266 - int var15 = field2529[1]; // L: 1267 - int var16 = field2529[2]; // L: 1268 - Rasterizer3D.field2334 = false; // L: 1269 - if (var4 == 3) { // L: 1270 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1271 - Rasterizer3D.field2334 = true; + var11 = field2779[0]; // L: 1289 + var12 = field2779[1]; // L: 1290 + var13 = field2779[2]; // L: 1291 + var14 = field2765[0]; // L: 1292 + int var15 = field2765[1]; // L: 1293 + int var16 = field2765[2]; // L: 1294 + Rasterizer3D.field2562 = false; // L: 1295 + if (var4 == 3) { // L: 1296 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1297 + Rasterizer3D.field2562 = true; } - this.method4413(var1, var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2]); // L: 1272 + this.method4994(var1, var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2]); // L: 1298 } - if (var4 == 4) { // L: 1274 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2509[3] < 0 || field2509[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1275 - Rasterizer3D.field2334 = true; + if (var4 == 4) { // L: 1300 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2779[3] < 0 || field2779[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1301 + Rasterizer3D.field2562 = true; } int var17; - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1276 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1302 int var18; int var19; - if (this.field2514 != null && this.field2514[var1] != -1) { // L: 1300 - int var20 = this.field2514[var1] & 255; // L: 1301 - var17 = this.field2541[var20]; // L: 1302 - var18 = this.field2519[var20]; // L: 1303 - var19 = this.field2520[var20]; // L: 1304 + if (this.field2739 != null && this.field2739[var1] != -1) { // L: 1326 + int var20 = this.field2739[var1] & 255; // L: 1327 + var17 = this.field2743[var20]; // L: 1328 + var18 = this.field2744[var20]; // L: 1329 + var19 = this.field2794[var20]; // L: 1330 } else { - var17 = var5; // L: 1307 - var18 = var6; // L: 1308 - var19 = var7; // L: 1309 + var17 = var5; // L: 1333 + var18 = var6; // L: 1334 + var19 = var7; // L: 1335 } - short var21 = this.faceTextures[var1]; // L: 1311 - if (this.faceColors3[var1] == -1) { // L: 1312 - Rasterizer3D.method4010(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1313 - Rasterizer3D.method4010(var14, var16, field2529[3], var11, var13, field2509[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1314 + short var21 = this.faceTextures[var1]; // L: 1337 + if (this.faceColors3[var1] == -1) { // L: 1338 + Rasterizer3D.method4620(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1339 + Rasterizer3D.method4620(var14, var16, field2765[3], var11, var13, field2779[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1340 } else { - Rasterizer3D.method4010(var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1317 - Rasterizer3D.method4010(var14, var16, field2529[3], var11, var13, field2509[3], field2556[0], field2556[2], field2556[3], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1318 + Rasterizer3D.method4620(var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1343 + Rasterizer3D.method4620(var14, var16, field2765[3], var11, var13, field2779[3], field2784[0], field2784[2], field2784[3], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1344 } - } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1277 - var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1278 - Rasterizer3D.method4008(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1279 - Rasterizer3D.method4008(var14, var16, field2529[3], var11, var13, field2509[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1280 - } else if (this.faceColors3[var1] == -1) { // L: 1282 - var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1283 - Rasterizer3D.method4007(var14, var15, var16, var11, var12, var13, var17); // L: 1284 - Rasterizer3D.method4007(var14, var16, field2529[3], var11, var13, field2509[3], var17); // L: 1285 - } else if (this.overrideAmount > 0) { // L: 1287 - Rasterizer3D.method4084(var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1288 - Rasterizer3D.method4084(var14, var16, field2529[3], var11, var13, field2509[3], field2556[0], field2556[2], field2556[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1289 + } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1303 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1304 + Rasterizer3D.method4618(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1305 + Rasterizer3D.method4618(var14, var16, field2765[3], var11, var13, field2779[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1306 + } else if (this.faceColors3[var1] == -1) { // L: 1308 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1309 + Rasterizer3D.method4617(var14, var15, var16, var11, var12, var13, var17); // L: 1310 + Rasterizer3D.method4617(var14, var16, field2765[3], var11, var13, field2779[3], var17); // L: 1311 + } else if (this.overrideAmount > 0) { // L: 1313 + Rasterizer3D.method4614(var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1314 + Rasterizer3D.method4614(var14, var16, field2765[3], var11, var13, field2779[3], field2784[0], field2784[2], field2784[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1315 } else { - Rasterizer3D.method4003(var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2]); // L: 1292 - Rasterizer3D.method4003(var14, var16, field2529[3], var11, var13, field2509[3], field2556[0], field2556[2], field2556[3]); // L: 1293 + Rasterizer3D.method4613(var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2]); // L: 1318 + Rasterizer3D.method4613(var14, var16, field2765[3], var11, var13, field2779[3], field2784[0], field2784[2], field2784[3]); // L: 1319 } } - } // L: 1322 + } // L: 1348 - @ObfuscatedName("ar") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILnu;)V" + descriptor = "(ILnt;)V" ) - void method4383(int var1, class387 var2) { - float var3 = (float)this.verticesX[var1]; // L: 1325 - float var4 = (float)(-this.verticesY[var1]); // L: 1326 - float var5 = (float)(-this.verticesZ[var1]); // L: 1327 - float var6 = 1.0F; // L: 1328 - this.verticesX[var1] = (int)(var2.field4347[0] * var3 + var2.field4347[4] * var4 + var2.field4347[8] * var5 + var2.field4347[12] * var6); // L: 1329 - this.verticesY[var1] = -((int)(var2.field4347[1] * var3 + var2.field4347[5] * var4 + var2.field4347[9] * var5 + var2.field4347[13] * var6)); // L: 1330 - this.verticesZ[var1] = -((int)(var2.field4347[2] * var3 + var2.field4347[6] * var4 + var2.field4347[10] * var5 + var2.field4347[14] * var6)); // L: 1331 - } // L: 1332 + void method4996(int var1, class387 var2) { + float var3 = (float)this.verticesX[var1]; // L: 1351 + float var4 = (float)(-this.verticesY[var1]); // L: 1352 + float var5 = (float)(-this.verticesZ[var1]); // L: 1353 + float var6 = 1.0F; // L: 1354 + this.verticesX[var1] = (int)(var2.field4348[0] * var3 + var2.field4348[4] * var4 + var2.field4348[8] * var5 + var2.field4348[12] * var6); // L: 1355 + this.verticesY[var1] = -((int)(var2.field4348[1] * var3 + var2.field4348[5] * var4 + var2.field4348[9] * var5 + var2.field4348[13] * var6)); // L: 1356 + this.verticesZ[var1] = -((int)(var2.field4348[2] * var3 + var2.field4348[6] * var4 + var2.field4348[10] * var5 + var2.field4348[14] * var6)); // L: 1357 + } // L: 1358 - @ObfuscatedName("ae") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lgl;I)V" + descriptor = "(Lhk;I)V" ) - void method4381(class202 var1, int var2) { - if (this.field2523 != null) { // L: 1335 - for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1336 - int[] var4 = this.field2523[var3]; // L: 1337 - if (var4 != null && var4.length != 0) { // L: 1338 - int[] var5 = this.field2524[var3]; // L: 1339 - field2498.method7063(); // L: 1340 + void method5034(class231 var1, int var2) { + if (this.field2748 != null) { // L: 1361 + for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1362 + int[] var4 = this.field2748[var3]; // L: 1363 + if (var4 != null && var4.length != 0) { // L: 1364 + int[] var5 = this.field2726[var3]; // L: 1365 + field2723.method7064(); // L: 1366 - for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1341 - int var7 = var4[var6]; // L: 1342 - class115 var8 = var1.method4099(var7); // L: 1343 - if (var8 != null) { // L: 1344 - field2499.method7065((float)var5[var6] / 255.0F); // L: 1345 - field2505.method7064(var8.method2657(var2)); // L: 1346 - field2505.method7109(field2499); // L: 1347 - field2498.method7067(field2505); // L: 1348 + for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1367 + int var7 = var4[var6]; // L: 1368 + class115 var8 = var1.method4718(var7); // L: 1369 + if (var8 != null) { // L: 1370 + field2724.method7043((float)var5[var6] / 255.0F); // L: 1371 + field2749.method7032(var8.method2671(var2)); // L: 1372 + field2749.method7017(field2724); // L: 1373 + field2723.method7016(field2749); // L: 1374 } } - this.method4383(var3, field2498); // L: 1350 + this.method4996(var3, field2723); // L: 1376 } } } - } // L: 1352 + } // L: 1378 - @ObfuscatedName("cv") + @ObfuscatedName("co") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2555[0] = -1; // L: 822 + field2772[0] = -1; // L: 822 if (this.boundsType != 1) { // L: 823 this.calculateBoundsCylinder(); } @@ -1819,104 +1788,146 @@ public class Model extends Renderable { var26 = true; } - boolean var27 = var26 || this.field2517 > 0; // L: 847 - int var28 = SpotAnimationDefinition.method3517(); // L: 848 - int var29 = ViewportMouse.ViewportMouse_y; // L: 851 - boolean var31 = Client.method1198(); // L: 854 - boolean var32 = class162.method3274(var9); // L: 855 - boolean var33 = false; // L: 856 - int var35; - int var36; - int var37; - if (var32 && var31) { // L: 857 - boolean var34 = false; // L: 858 - if (field2560) { // L: 859 - var34 = FloorDecoration.method3980(this, var6, var7, var8); // L: 860 + boolean var27 = var26 || this.field2742 > 0; // L: 847 + int var28 = ViewportMouse.ViewportMouse_x; // L: 850 + int var30 = class118.method2747(); // L: 853 + boolean var31 = ViewportMouse.ViewportMouse_isInViewport; // L: 856 + boolean var34 = 0L != var9; // L: 861 + boolean var35; + if (var34) { // L: 862 + var35 = (int)(var9 >>> 16 & 1L) == 1; // L: 865 + var34 = !var35; // L: 867 + } + + var35 = false; // L: 872 + int var40; + int var41; + int var42; + int var43; + int var44; + int var49; + int var53; + int var54; + if (var34 && var31) { // L: 873 + boolean var36 = false; // L: 874 + if (field2777) { // L: 875 + boolean var39 = ViewportMouse.ViewportMouse_isInViewport; // L: 881 + boolean var37; + if (!var39) { // L: 883 + var37 = false; // L: 884 + } else { + WorldMapSection0.method4283(); // L: 887 + var40 = this.xMid + var6; // L: 888 + var41 = var7 + this.yMid; // L: 889 + var42 = var8 + this.zMid; // L: 890 + var43 = this.xMidOffset; // L: 891 + var44 = this.yMidOffset; // L: 892 + int var45 = this.zMidOffset; // L: 893 + int var46 = FaceNormal.field2664 - var40; // L: 894 + int var47 = ItemComposition.field2076 - var41; // L: 895 + int var48 = ViewportMouse.field2802 - var42; // L: 896 + if (Math.abs(var46) > var43 + class9.field35) { // L: 897 + var37 = false; // L: 898 + } else if (Math.abs(var47) > var44 + ViewportMouse.field2808) { // L: 901 + var37 = false; // L: 902 + } else if (Math.abs(var48) > var45 + class196.field2204) { // L: 905 + var37 = false; // L: 906 + } else if (Math.abs(var48 * ViewportMouse.field2804 - var47 * class18.field95) > var44 * class196.field2204 + var45 * ViewportMouse.field2808) { // L: 909 + var37 = false; // L: 910 + } else if (Math.abs(var46 * class18.field95 - var48 * ViewportMouse.field2805) > var45 * class9.field35 + var43 * class196.field2204) { // L: 913 + var37 = false; // L: 914 + } else if (Math.abs(var47 * ViewportMouse.field2805 - var46 * ViewportMouse.field2804) > var44 * class9.field35 + var43 * ViewportMouse.field2808) { // L: 917 + var37 = false; // L: 918 + } else { + var37 = true; // L: 921 + } + } + + var36 = var37; // L: 923 } else { - var35 = var12 - var13; // L: 863 - if (var35 <= 50) { // L: 864 - var35 = 50; + var54 = var12 - var13; // L: 926 + if (var54 <= 50) { // L: 927 + var54 = 50; } - if (var15 > 0) { // L: 865 - var16 /= var14; // L: 866 - var17 /= var35; // L: 867 + if (var15 > 0) { // L: 928 + var16 /= var14; // L: 929 + var17 /= var54; // L: 930 } else { - var17 /= var14; // L: 870 - var16 /= var35; // L: 871 + var17 /= var14; // L: 933 + var16 /= var54; // L: 934 } - if (var18 > 0) { // L: 873 - var23 /= var14; // L: 874 - var21 /= var35; // L: 875 + if (var18 > 0) { // L: 936 + var23 /= var14; // L: 937 + var21 /= var54; // L: 938 } else { - var21 /= var14; // L: 878 - var23 /= var35; // L: 879 + var21 /= var14; // L: 941 + var23 /= var54; // L: 942 } - var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 881 - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 882 - if (var36 > var16 && var36 < var17 && var37 > var23 && var37 < var21) { // L: 883 - var34 = true; // L: 884 + var49 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 944 + var53 = var30 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 945 + if (var49 > var16 && var49 < var17 && var53 > var23 && var53 < var21) { // L: 946 + var36 = true; // L: 947 } } - if (var34) { // L: 887 - if (this.isSingleTile) { // L: 888 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 891 + if (var36) { // L: 950 + if (this.isSingleTile) { // L: 951 + KeyHandler.method350(var9); } else { - var33 = true; // L: 894 + var35 = true; // L: 952 } } } - int var47 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 897 - var35 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 898 - var36 = 0; // L: 899 - var37 = 0; // L: 900 - if (var1 != 0) { // L: 901 - var36 = Model_sine[var1]; // L: 902 - var37 = Model_cosine[var1]; // L: 903 + int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 955 + var54 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 956 + var49 = 0; // L: 957 + var53 = 0; // L: 958 + if (var1 != 0) { // L: 959 + var49 = Model_sine[var1]; // L: 960 + var53 = Model_cosine[var1]; // L: 961 } - for (int var38 = 0; var38 < this.verticesCount; ++var38) { // L: 905 - int var39 = this.verticesX[var38]; // L: 906 - int var40 = this.verticesY[var38]; // L: 907 - int var41 = this.verticesZ[var38]; // L: 908 - int var42; - if (var1 != 0) { // L: 909 - var42 = var41 * var36 + var39 * var37 >> 16; // L: 910 - var41 = var41 * var37 - var39 * var36 >> 16; // L: 911 - var39 = var42; // L: 912 + for (var40 = 0; var40 < this.verticesCount; ++var40) { // L: 963 + var41 = this.verticesX[var40]; // L: 964 + var42 = this.verticesY[var40]; // L: 965 + var43 = this.verticesZ[var40]; // L: 966 + if (var1 != 0) { // L: 967 + var44 = var43 * var49 + var41 * var53 >> 16; // L: 968 + var43 = var43 * var53 - var41 * var49 >> 16; // L: 969 + var41 = var44; // L: 970 } - var39 += var6; // L: 914 - var40 += var7; // L: 915 - var41 += var8; // L: 916 - var42 = var41 * var4 + var5 * var39 >> 16; // L: 917 - var41 = var5 * var41 - var39 * var4 >> 16; // L: 918 - var39 = var42; // L: 919 - var42 = var3 * var40 - var41 * var2 >> 16; // L: 920 - var41 = var40 * var2 + var3 * var41 >> 16; // L: 921 - field2542[var38] = var41 - var12; // L: 923 - if (var41 >= 50) { // L: 924 - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; // L: 925 - modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; // L: 926 + var41 += var6; // L: 972 + var42 += var7; // L: 973 + var43 += var8; // L: 974 + var44 = var43 * var4 + var5 * var41 >> 16; // L: 975 + var43 = var5 * var43 - var41 * var4 >> 16; // L: 976 + var41 = var44; // L: 977 + var44 = var3 * var42 - var43 * var2 >> 16; // L: 978 + var43 = var42 * var2 + var3 * var43 >> 16; // L: 979 + field2767[var40] = var43 - var12; // L: 981 + if (var43 >= 50) { // L: 982 + modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var52; // L: 983 + modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var54; // L: 984 } else { - modelViewportXs[var38] = -5000; // L: 929 - var25 = true; // L: 930 + modelViewportXs[var40] = -5000; // L: 987 + var25 = true; // L: 988 } - if (var27) { // L: 932 - field2543[var38] = var39; // L: 933 - field2547[var38] = var42; // L: 934 - field2545[var38] = var41; // L: 935 + if (var27) { // L: 990 + field2781[var40] = var41; // L: 991 + field2769[var40] = var44; // L: 992 + field2727[var40] = var43; // L: 993 } } try { - this.draw0(var25, var33, this.isSingleTile, var9); // L: 939 - } catch (Exception var46) { // L: 941 + this.draw0(var25, var35, this.isSingleTile, var9); // L: 997 + } catch (Exception var51) { // L: 999 } } @@ -1924,5 +1935,5 @@ public class Model extends Renderable { } } } - } // L: 942 + } // L: 1000 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index ea7b24c4dc..01154809c8 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,139 +3,139 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("hc") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("av") - static int[] field2256; - @ObfuscatedName("aq") - static int[] field2257; - @ObfuscatedName("an") - static int field2258; - @ObfuscatedName("ah") + @ObfuscatedName("ac") + static int[] field2485; + @ObfuscatedName("ab") + static int[] field2486; + @ObfuscatedName("au") + static int field2487; + @ObfuscatedName("af") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("am") + @ObfuscatedName("ad") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("verticesCount") int verticesCount; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("verticesX") int[] verticesX; @ObfuscatedName("n") @Export("verticesY") int[] verticesY; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("faceCount") int faceCount; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("indices1") int[] indices1; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("indices2") int[] indices2; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("indices3") int[] indices3; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("faceColors") short[] faceColors; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("priority") byte priority; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("texTriangleX") short[] texTriangleX; @ObfuscatedName("y") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("texTriangleZ") short[] texTriangleZ; @ObfuscatedName("e") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ax") - int[][] field2243; - @ObfuscatedName("ay") - int[][] field2244; - @ObfuscatedName("au") + @ObfuscatedName("aq") + int[][] field2464; + @ObfuscatedName("aw") + int[][] field2476; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "[Lgc;" + descriptor = "[Lia;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lil;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lil;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("ambient") public short ambient; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("contrast") public short contrast; - @ObfuscatedName("ab") + @ObfuscatedName("av") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("aa") - int field2250; - @ObfuscatedName("ad") - int field2252; - @ObfuscatedName("aj") - int field2230; - @ObfuscatedName("as") - int field2222; - @ObfuscatedName("ao") - int field2255; + @ObfuscatedName("at") + int field2445; + @ObfuscatedName("an") + int field2480; + @ObfuscatedName("ay") + int field2482; + @ObfuscatedName("ag") + int field2483; + @ObfuscatedName("ah") + int field2489; static { - field2256 = new int[10000]; // L: 49 - field2257 = new int[10000]; // L: 50 - field2258 = 0; // L: 51 + field2485 = new int[10000]; // L: 49 + field2486 = new int[10000]; // L: 50 + field2487 = 0; // L: 51 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53 } @@ -148,7 +148,7 @@ public class ModelData extends Renderable { } // L: 55 @ObfuscatedSignature( - descriptor = "([Lgt;I)V" + descriptor = "([Lhc;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -192,7 +192,7 @@ public class ModelData extends Renderable { var6 |= var11.faceSkins != null; // L: 945 var7 |= var11.faceTextures != null; // L: 946 var8 |= var11.textureCoords != null; // L: 947 - var9 |= var11.field2243 != null; // L: 948 + var9 |= var11.field2464 != null; // L: 948 } } @@ -228,8 +228,8 @@ public class ModelData extends Renderable { } if (var9) { // L: 964 - this.field2243 = new int[this.verticesCount][]; // L: 965 - this.field2244 = new int[this.verticesCount][]; // L: 966 + this.field2464 = new int[this.verticesCount][]; // L: 965 + this.field2476 = new int[this.verticesCount][]; // L: 966 } this.faceColors = new short[this.faceCount]; // L: 968 @@ -249,8 +249,8 @@ public class ModelData extends Renderable { if (var11 != null) { // L: 980 int var12; for (var12 = 0; var12 < var11.faceCount; ++var12) { // L: 981 - if (var3 && var11.faceRenderTypes != null) { // L: 982 983 - this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; + if (var3 && var11.faceRenderTypes != null) { // L: 982 + this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; // L: 983 } if (var4) { // L: 985 @@ -286,18 +286,18 @@ public class ModelData extends Renderable { } this.faceColors[this.faceCount] = var11.faceColors[var12]; // L: 1003 - this.indices1[this.faceCount] = this.method3906(var11, var11.indices1[var12]); // L: 1004 - this.indices2[this.faceCount] = this.method3906(var11, var11.indices2[var12]); // L: 1005 - this.indices3[this.faceCount] = this.method3906(var11, var11.indices3[var12]); // L: 1006 + this.indices1[this.faceCount] = this.method4522(var11, var11.indices1[var12]); // L: 1004 + this.indices2[this.faceCount] = this.method4522(var11, var11.indices2[var12]); // L: 1005 + this.indices3[this.faceCount] = this.method4522(var11, var11.indices3[var12]); // L: 1006 ++this.faceCount; // L: 1007 } for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { // L: 1009 byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; // L: 1010 if (var13 == 0) { // L: 1011 - this.texTriangleX[this.textureTriangleCount] = (short)this.method3906(var11, var11.texTriangleX[var12]); // L: 1012 - this.texTriangleY[this.textureTriangleCount] = (short)this.method3906(var11, var11.texTriangleY[var12]); // L: 1013 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3906(var11, var11.texTriangleZ[var12]); // L: 1014 + this.texTriangleX[this.textureTriangleCount] = (short)this.method4522(var11, var11.texTriangleX[var12]); // L: 1012 + this.texTriangleY[this.textureTriangleCount] = (short)this.method4522(var11, var11.texTriangleY[var12]); // L: 1013 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method4522(var11, var11.texTriangleZ[var12]); // L: 1014 } ++this.textureTriangleCount; // L: 1016 @@ -315,19 +315,19 @@ public class ModelData extends Renderable { Buffer var2 = new Buffer(10); // L: 64 var2.writeShort(-2); // L: 65 if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { // L: 66 - this.method3911(var1); + this.method4511(var1); } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67 - this.method3966(var1); + this.method4527(var1); } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68 - this.method3903(var1); + this.method4513(var1); } else { - this.method3904(var1); // L: 69 + this.method4514(var1); // L: 69 } } // L: 70 @ObfuscatedSignature( - descriptor = "(Lgt;ZZZZ)V", + descriptor = "(Lhc;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -394,14 +394,14 @@ public class ModelData extends Renderable { this.vertexNormals = var1.vertexNormals; // L: 1101 this.faceNormals = var1.faceNormals; // L: 1102 this.vertexVertices = var1.vertexVertices; // L: 1103 - this.field2243 = var1.field2243; // L: 1104 - this.field2244 = var1.field2244; // L: 1105 + this.field2464 = var1.field2464; // L: 1104 + this.field2476 = var1.field2476; // L: 1105 this.ambient = var1.ambient; // L: 1106 this.contrast = var1.contrast; // L: 1107 } - @ObfuscatedName("h") - void method3911(byte[] var1) { + @ObfuscatedName("i") + void method4511(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 73 Buffer var3 = new Buffer(var1); // L: 74 Buffer var4 = new Buffer(var1); // L: 75 @@ -544,8 +544,8 @@ public class ModelData extends Renderable { } if (var18 == 1) { // L: 169 - this.field2243 = new int[var9][]; // L: 170 - this.field2244 = new int[var9][]; // L: 171 + this.field2464 = new int[var9][]; // L: 170 + this.field2476 = new int[var9][]; // L: 171 } this.faceColors = new short[var10]; // L: 173 @@ -600,12 +600,12 @@ public class ModelData extends Renderable { if (var18 == 1) { // L: 203 for (var53 = 0; var53 < var9; ++var53) { // L: 204 var54 = var6.readUnsignedByte(); // L: 205 - this.field2243[var53] = new int[var54]; // L: 206 - this.field2244[var53] = new int[var54]; // L: 207 + this.field2464[var53] = new int[var54]; // L: 206 + this.field2476[var53] = new int[var54]; // L: 207 for (var55 = 0; var55 < var54; ++var55) { // L: 208 - this.field2243[var53][var55] = var6.readUnsignedByte(); // L: 209 - this.field2244[var53][var55] = var6.readUnsignedByte(); // L: 210 + this.field2464[var53][var55] = var6.readUnsignedByte(); // L: 209 + this.field2476[var53][var55] = var6.readUnsignedByte(); // L: 210 } } } @@ -723,8 +723,8 @@ public class ModelData extends Renderable { } // L: 299 - @ObfuscatedName("n") - void method3966(byte[] var1) { + @ObfuscatedName("f") + void method4527(byte[] var1) { boolean var2 = false; // L: 302 boolean var3 = false; // L: 303 Buffer var4 = new Buffer(var1); // L: 304 @@ -825,8 +825,8 @@ public class ModelData extends Renderable { } if (var17 == 1) { // L: 376 - this.field2243 = new int[var9][]; // L: 377 - this.field2244 = new int[var9][]; // L: 378 + this.field2464 = new int[var9][]; // L: 377 + this.field2476 = new int[var9][]; // L: 378 } this.faceColors = new short[var10]; // L: 380 @@ -875,12 +875,12 @@ public class ModelData extends Renderable { if (var17 == 1) { // L: 405 for (var40 = 0; var40 < var9; ++var40) { // L: 406 var41 = var8.readUnsignedByte(); // L: 407 - this.field2243[var40] = new int[var41]; // L: 408 - this.field2244[var40] = new int[var41]; // L: 409 + this.field2464[var40] = new int[var41]; // L: 408 + this.field2476[var40] = new int[var41]; // L: 409 for (var42 = 0; var42 < var41; ++var42) { // L: 410 - this.field2243[var40][var42] = var8.readUnsignedByte(); // L: 411 - this.field2244[var40][var42] = var8.readUnsignedByte(); // L: 412 + this.field2464[var40][var42] = var8.readUnsignedByte(); // L: 411 + this.field2476[var40][var42] = var8.readUnsignedByte(); // L: 412 } } } @@ -1017,8 +1017,8 @@ public class ModelData extends Renderable { } // L: 511 - @ObfuscatedName("d") - void method3903(byte[] var1) { + @ObfuscatedName("l") + void method4513(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 514 Buffer var3 = new Buffer(var1); // L: 515 Buffer var4 = new Buffer(var1); // L: 516 @@ -1323,8 +1323,8 @@ public class ModelData extends Renderable { } // L: 723 - @ObfuscatedName("f") - void method3904(byte[] var1) { + @ObfuscatedName("q") + void method4514(byte[] var1) { boolean var2 = false; // L: 726 boolean var3 = false; // L: 727 Buffer var4 = new Buffer(var1); // L: 728 @@ -1600,11 +1600,11 @@ public class ModelData extends Renderable { } // L: 918 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgt;I)I" + descriptor = "(Lhc;I)I" ) - final int method3906(ModelData var1, int var2) { + final int method4522(ModelData var1, int var2) { int var3 = -1; // L: 1023 int var4 = var1.verticesX[var2]; // L: 1024 int var5 = var1.verticesY[var2]; // L: 1025 @@ -1625,9 +1625,9 @@ public class ModelData extends Renderable { this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037 } - if (var1.field2243 != null) { // L: 1038 - this.field2243[this.verticesCount] = var1.field2243[var2]; // L: 1039 - this.field2244[this.verticesCount] = var1.field2244[var2]; // L: 1040 + if (var1.field2464 != null) { // L: 1038 + this.field2464[this.verticesCount] = var1.field2464[var2]; // L: 1039 + this.field2476[this.verticesCount] = var1.field2476[var2]; // L: 1040 } var3 = this.verticesCount++; // L: 1042 @@ -1638,7 +1638,7 @@ public class ModelData extends Renderable { @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lgt;" + descriptor = "()Lhc;" ) @Export("copyModelData") public ModelData copyModelData() { @@ -1681,16 +1681,16 @@ public class ModelData extends Renderable { return var1; // L: 1144 } - @ObfuscatedName("k") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgt;" + descriptor = "([[IIIIZI)Lhc;" ) - public ModelData method3918(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method4517(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); // L: 1148 - int var7 = var2 + this.field2252; // L: 1149 - int var8 = var2 + this.field2230; // L: 1150 - int var9 = var4 + this.field2255; // L: 1151 - int var10 = var4 + this.field2222; // L: 1152 + int var7 = var2 + this.field2480; // L: 1149 + int var8 = var2 + this.field2482; // L: 1150 + int var9 = var4 + this.field2489; // L: 1151 + int var10 = var4 + this.field2483; // L: 1152 if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 1153 var7 >>= 7; // L: 1154 var8 = var8 + 127 >> 7; // L: 1155 @@ -1775,8 +1775,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("x") - void method3910() { + @ObfuscatedName("w") + void method4518() { int[] var1; int var2; int var10002; @@ -1836,8 +1836,8 @@ public class ModelData extends Renderable { } // L: 1266 - @ObfuscatedName("c") - public void method3920() { + @ObfuscatedName("k") + public void method4553() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1269 int var2 = this.verticesX[var1]; // L: 1270 this.verticesX[var1] = this.verticesZ[var1]; // L: 1271 @@ -1847,8 +1847,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1274 } // L: 1275 - @ObfuscatedName("j") - public void method3912() { + @ObfuscatedName("d") + public void method4520() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1278 this.verticesX[var1] = -this.verticesX[var1]; // L: 1279 this.verticesZ[var1] = -this.verticesZ[var1]; // L: 1280 @@ -1857,8 +1857,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1282 } // L: 1283 - @ObfuscatedName("p") - public void method3913() { + @ObfuscatedName("m") + public void method4521() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1286 int var2 = this.verticesZ[var1]; // L: 1287 this.verticesZ[var1] = this.verticesX[var1]; // L: 1288 @@ -1868,8 +1868,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1291 } // L: 1292 - @ObfuscatedName("s") - public void method3914(int var1) { + @ObfuscatedName("u") + public void method4512(int var1) { int var2 = ModelData_sine[var1]; // L: 1295 int var3 = ModelData_cosine[var1]; // L: 1296 @@ -1882,7 +1882,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1302 } // L: 1303 - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1306 @@ -1897,7 +1897,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1311 } // L: 1312 - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1315 @@ -1908,7 +1908,7 @@ public class ModelData extends Renderable { } // L: 1318 - @ObfuscatedName("a") + @ObfuscatedName("x") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 1321 @@ -1921,8 +1921,8 @@ public class ModelData extends Renderable { } } // L: 1325 - @ObfuscatedName("m") - public void method3900() { + @ObfuscatedName("a") + public void method4526() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1937,7 +1937,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1334 } // L: 1335 - @ObfuscatedName("q") + @ObfuscatedName("y") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1338 @@ -1949,7 +1949,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1343 } // L: 1344 - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 1347 @@ -2025,7 +2025,7 @@ public class ModelData extends Renderable { } } // L: 1402 - @ObfuscatedName("z") + @ObfuscatedName("e") @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 1405 @@ -2034,43 +2034,43 @@ public class ModelData extends Renderable { this.isBoundsCalculated = false; // L: 1408 } // L: 1409 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 1412 super.height = 0; // L: 1413 - this.field2250 = 0; // L: 1414 - this.field2252 = 999999; // L: 1415 - this.field2230 = -999999; // L: 1416 - this.field2222 = -99999; // L: 1417 - this.field2255 = 99999; // L: 1418 + this.field2445 = 0; // L: 1414 + this.field2480 = 999999; // L: 1415 + this.field2482 = -999999; // L: 1416 + this.field2483 = -99999; // L: 1417 + this.field2489 = 99999; // L: 1418 for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1419 int var2 = this.verticesX[var1]; // L: 1420 int var3 = this.verticesY[var1]; // L: 1421 int var4 = this.verticesZ[var1]; // L: 1422 - if (var2 < this.field2252) { // L: 1423 - this.field2252 = var2; + if (var2 < this.field2480) { // L: 1423 + this.field2480 = var2; } - if (var2 > this.field2230) { // L: 1424 - this.field2230 = var2; + if (var2 > this.field2482) { // L: 1424 + this.field2482 = var2; } - if (var4 < this.field2255) { // L: 1425 - this.field2255 = var4; + if (var4 < this.field2489) { // L: 1425 + this.field2489 = var4; } - if (var4 > this.field2222) { // L: 1426 - this.field2222 = var4; + if (var4 > this.field2483) { // L: 1426 + this.field2483 = var4; } if (-var3 > super.height) { // L: 1427 super.height = -var3; } - if (var3 > this.field2250) { // L: 1428 - this.field2250 = var3; + if (var3 > this.field2445) { // L: 1428 + this.field2445 = var3; } } @@ -2078,9 +2078,9 @@ public class ModelData extends Renderable { } } // L: 1431 - @ObfuscatedName("i") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIII)Lhx;" + descriptor = "(IIIII)Liq;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -2101,38 +2101,38 @@ public class ModelData extends Renderable { } } - var8.field2517 = 0; // L: 1502 + var8.field2742 = 0; // L: 1502 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504 - ++var8.field2517; + ++var8.field2742; } } - var8.field2541 = new int[var8.field2517]; // L: 1506 - var8.field2519 = new int[var8.field2517]; // L: 1507 - var8.field2520 = new int[var8.field2517]; // L: 1508 + var8.field2743 = new int[var8.field2742]; // L: 1506 + var8.field2744 = new int[var8.field2742]; // L: 1507 + var8.field2794 = new int[var8.field2742]; // L: 1508 var10 = 0; // L: 1509 int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1510 if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1511 - var8.field2541[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 - var8.field2519[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 - var8.field2520[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 + var8.field2743[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 + var8.field2744[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 + var8.field2794[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 var9[var11] = var10++; // L: 1515 } else { var9[var11] = -1; // L: 1517 } } - var8.field2514 = new byte[this.faceCount]; // L: 1519 + var8.field2739 = new byte[this.faceCount]; // L: 1519 for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1520 if (this.textureCoords[var11] != -1) { // L: 1521 - var8.field2514[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2739[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2514[var11] = -1; // L: 1522 + var8.field2739[var11] = -1; // L: 1522 } } } @@ -2175,7 +2175,7 @@ public class ModelData extends Renderable { if (var17 == 1) { // L: 1555 var19 = this.faceNormals[var16]; // L: 1556 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1557 - var8.faceColors1[var16] = method3924(this.faceColors[var16] & '\uffff', var14); // L: 1558 + var8.faceColors1[var16] = method4535(this.faceColors[var16] & '\uffff', var14); // L: 1558 var8.faceColors3[var16] = -1; // L: 1559 } else if (var17 == 3) { // L: 1561 var8.faceColors1[var16] = 128; // L: 1562 @@ -2192,7 +2192,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544 - var8.faceColors1[var16] = method3924(var15, var14); // L: 1545 + var8.faceColors1[var16] = method4535(var15, var14); // L: 1545 if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546 var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2200,7 +2200,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548 - var8.faceColors2[var16] = method3924(var15, var14); // L: 1549 + var8.faceColors2[var16] = method4535(var15, var14); // L: 1549 if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550 var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2208,13 +2208,13 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552 - var8.faceColors3[var16] = method3924(var15, var14); // L: 1553 + var8.faceColors3[var16] = method4535(var15, var14); // L: 1553 } } else if (var17 != 0) { // L: 1570 if (var17 == 1) { // L: 1586 var19 = this.faceNormals[var16]; // L: 1587 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1588 - var8.faceColors1[var16] = method3905(var14); // L: 1589 + var8.faceColors1[var16] = method4534(var14); // L: 1589 var8.faceColors3[var16] = -1; // L: 1590 } else { var8.faceColors3[var16] = -2; // L: 1593 @@ -2227,7 +2227,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575 - var8.faceColors1[var16] = method3905(var14); // L: 1576 + var8.faceColors1[var16] = method4534(var14); // L: 1576 if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577 var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2235,19 +2235,19 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1579 - var8.faceColors2[var16] = method3905(var14); // L: 1580 - if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1581 - var13 = this.vertexVertices[this.indices3[var16]]; + var8.faceColors2[var16] = method4534(var14); // L: 1580 + if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { + var13 = this.vertexVertices[this.indices3[var16]]; // L: 1581 } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1582 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583 - var8.faceColors3[var16] = method3905(var14); // L: 1584 + var8.faceColors3[var16] = method4534(var14); // L: 1584 } } - this.method3910(); // L: 1597 + this.method4518(); // L: 1597 var8.verticesCount = this.verticesCount; // L: 1598 var8.verticesX = this.verticesX; // L: 1599 var8.verticesY = this.verticesY; // L: 1600 @@ -2258,18 +2258,18 @@ public class ModelData extends Renderable { var8.indices3 = this.indices3; // L: 1605 var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1606 var8.faceAlphas = this.faceAlphas; // L: 1607 - var8.field2546 = this.priority; // L: 1608 + var8.field2741 = this.priority; // L: 1608 var8.vertexLabels = this.vertexLabels; // L: 1609 var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1610 var8.faceTextures = this.faceTextures; // L: 1611 - var8.field2523 = this.field2243; // L: 1612 - var8.field2524 = this.field2244; // L: 1613 + var8.field2748 = this.field2464; // L: 1612 + var8.field2726 = this.field2476; // L: 1613 return var8; // L: 1614 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;II)Lgt;" + descriptor = "(Lln;II)Lhc;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -2277,16 +2277,16 @@ public class ModelData extends Renderable { return var3 == null ? null : new ModelData(var3); // L: 59 } - @ObfuscatedName("t") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgt;Lgt;IIIZ)V" + descriptor = "(Lhc;Lhc;IIIZ)V" ) - static void method3976(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method4531(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); // L: 1434 var0.calculateVertexNormals(); // L: 1435 var1.calculateBounds(); // L: 1436 var1.calculateVertexNormals(); // L: 1437 - ++field2258; // L: 1438 + ++field2487; // L: 1438 int var6 = 0; // L: 1439 int[] var7 = var1.verticesX; // L: 1440 int var8 = var1.verticesCount; // L: 1441 @@ -2296,11 +2296,11 @@ public class ModelData extends Renderable { VertexNormal var10 = var0.vertexNormals[var9]; // L: 1443 if (var10.magnitude != 0) { // L: 1444 int var11 = var0.verticesY[var9] - var3; // L: 1445 - if (var11 <= var1.field2250) { // L: 1446 + if (var11 <= var1.field2445) { // L: 1446 int var12 = var0.verticesX[var9] - var2; // L: 1447 - if (var12 >= var1.field2252 && var12 <= var1.field2230) { // L: 1448 + if (var12 >= var1.field2480 && var12 <= var1.field2482) { // L: 1448 int var13 = var0.verticesZ[var9] - var4; // L: 1449 - if (var13 >= var1.field2255 && var13 <= var1.field2222) { // L: 1450 + if (var13 >= var1.field2489 && var13 <= var1.field2483) { // L: 1450 for (int var14 = 0; var14 < var8; ++var14) { // L: 1451 VertexNormal var15 = var1.vertexNormals[var14]; // L: 1452 if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 1453 @@ -2331,8 +2331,8 @@ public class ModelData extends Renderable { var17.z += var10.z; // L: 1466 var17.magnitude += var10.magnitude; // L: 1467 ++var6; // L: 1468 - field2256[var9] = field2258; // L: 1469 - field2257[var14] = field2258; // L: 1470 + field2485[var9] = field2487; // L: 1469 + field2486[var14] = field2487; // L: 1470 } } } @@ -2343,7 +2343,7 @@ public class ModelData extends Renderable { if (var6 >= 3 && var5) { // L: 1474 for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1475 - if (field2256[var0.indices1[var9]] == field2258 && field2256[var0.indices2[var9]] == field2258 && field2256[var0.indices3[var9]] == field2258) { // L: 1476 + if (field2485[var0.indices1[var9]] == field2487 && field2485[var0.indices2[var9]] == field2487 && field2485[var0.indices3[var9]] == field2487) { // L: 1476 if (var0.faceRenderTypes == null) { // L: 1477 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -2353,7 +2353,7 @@ public class ModelData extends Renderable { } for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1481 - if (field2258 == field2257[var1.indices1[var9]] && field2258 == field2257[var1.indices2[var9]] && field2258 == field2257[var1.indices3[var9]]) { // L: 1482 + if (field2487 == field2486[var1.indices1[var9]] && field2487 == field2486[var1.indices2[var9]] && field2487 == field2486[var1.indices3[var9]]) { // L: 1482 if (var1.faceRenderTypes == null) { // L: 1483 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -2365,8 +2365,8 @@ public class ModelData extends Renderable { } } // L: 1487 - @ObfuscatedName("ac") - static final int method3924(int var0, int var1) { + @ObfuscatedName("aq") + static final int method4535(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1618 if (var1 < 2) { // L: 1619 var1 = 2; @@ -2377,8 +2377,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; // L: 1621 } - @ObfuscatedName("ax") - static final int method3905(int var0) { + @ObfuscatedName("aw") + static final int method4534(int var0) { if (var0 < 2) { // L: 1625 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 f85206becb..d1590a6bea 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,9 +1,73 @@ +import java.applet.Applet; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("ic") @Implements("ModelData0") public class ModelData0 { ModelData0() { } // L: 4 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1428405987" + ) + public static void method5093(Applet var0, String var1) { + class29.field176 = var0; // L: 22 + if (var1 != null) { // L: 23 + class29.field175 = var1; + } + + } // L: 24 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1801328016" + ) + public static int method5091(int var0, int var1, int var2) { + int var3 = class54.method1078(var2 - var1 + 1); // L: 43 + var3 <<= var1; // L: 44 + var0 |= var3; // L: 45 + return var0; // L: 46 + } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "([Lky;IIIZI)V", + garbageValue = "1997359276" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10805 + Widget var6 = var0[var5]; // L: 10806 + if (var6 != null && var6.parentId == var1) { // L: 10807 10808 + ApproximateRouteStrategy.alignWidgetSize(var6, var2, var3, var4); // L: 10809 + HealthBarUpdate.alignWidgetPosition(var6, var2, var3); // L: 10810 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10811 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 10812 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10813 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 10814 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 10815 + AbstractByteArrayCopier.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 10817 } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 541b86954e..8ba97fabc7 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,123 +9,117 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("aj") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Laj;" ) @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("l") + static MouseHandler MouseHandler_instance; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 107284469 + intValue = -1215511241 ) @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; + static volatile int MouseHandler_idleCycles; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 46919017 + intValue = -1775726367 ) @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("d") + static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -196949191 + intValue = 85689575 ) @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("f") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 44426053 + intValue = -1306099979 ) @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("u") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 51726182366578667L + longValue = -4643079622769248037L ) @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("r") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1741182953 + intValue = 1731887577 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1113383001 + intValue = 945035617 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -601944997 + intValue = -785295255 ) @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -3366277212682218721L + longValue = 4725999527355171863L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -173750849 + intValue = 1519434749 ) @Export("MouseHandler_lastButtonVolatile") - public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("p") + static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1130317715 + intValue = -981711317 ) @Export("MouseHandler_lastPressedXVolatile") - public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("s") + static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 533285241 + intValue = 1147584293 ) @Export("MouseHandler_lastPressedYVolatile") - public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("b") + static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -5019639506180718005L + longValue = 1021935901074327701L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("w") + static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1259465113 + intValue = -192789509 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -416250337 + intValue = 647045439 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -769215047 + intValue = -1945736255 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 4641952122808710007L + longValue = -2565305597523014613L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("ei") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive4") - static Archive archive4; static { MouseHandler_instance = new MouseHandler(); // L: 15 @@ -151,281 +145,413 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } // L: 34 - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;B)I", - garbageValue = "1" + garbageValue = "-6" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 55 - if (!var1.isAltDown() && var2 != 2) { // L: 56 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 57 58 + int var2 = var1.getButton(); // L: 67 + if (!var1.isAltDown() && var2 != 2) { // L: 68 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 69 70 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 103 - MouseHandler_idleCycles = 0; // L: 104 - MouseHandler_xVolatile = var1.getX(); // L: 105 - MouseHandler_yVolatile = var1.getY(); // L: 106 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107 + if (MouseHandler_instance != null) { // L: 115 + MouseHandler_idleCycles = 0; // L: 116 + MouseHandler_xVolatile = var1.getX(); // L: 117 + MouseHandler_yVolatile = var1.getY(); // L: 118 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 119 } - } // L: 109 + } // L: 121 + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 102 + MouseHandler_idleCycles = 0; // L: 103 + MouseHandler_xVolatile = -1; // L: 104 + MouseHandler_yVolatile = -1; // L: 105 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 106 + } + + } // L: 108 + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 111 + } // L: 112 + + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 86 + MouseHandler_idleCycles = 0; // L: 87 + MouseHandler_currentButtonVolatile = 0; // L: 88 + } + + if (var1.isPopupTrigger()) { // L: 90 + var1.consume(); + } + + } // L: 91 + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); // L: 98 + } // L: 99 + + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { // L: 126 + MouseHandler_currentButtonVolatile = 0; + } + + } // L: 127 + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 94 + var1.consume(); + } + + } // L: 95 + + public final void focusGained(FocusEvent var1) { + } // L: 123 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 62 - MouseHandler_idleCycles = 0; // L: 63 - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 64 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 65 - MouseHandler_lastPressedTimeMillisVolatile = WorldMapSprite.method4989(); // L: 66 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 67 - if (MouseHandler_lastButtonVolatile != 0) { // L: 68 + if (MouseHandler_instance != null) { // L: 74 + MouseHandler_idleCycles = 0; // L: 75 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 76 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 77 + MouseHandler_lastPressedTimeMillisVolatile = class136.method2931(); // L: 78 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 79 + if (MouseHandler_lastButtonVolatile != 0) { // L: 80 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 70 - var1.consume(); - } - - } // L: 71 - - public final void mouseClicked(MouseEvent var1) { if (var1.isPopupTrigger()) { // L: 82 var1.consume(); } } // L: 83 - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 90 - MouseHandler_idleCycles = 0; // L: 91 - MouseHandler_xVolatile = -1; // L: 92 - MouseHandler_yVolatile = -1; // L: 93 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 94 - } - - } // L: 96 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 86 - } // L: 87 - - public final void focusGained(FocusEvent var1) { - } // L: 111 - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 114 - MouseHandler_currentButtonVolatile = 0; - } - - } // L: 115 - - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 74 - MouseHandler_idleCycles = 0; // L: 75 - MouseHandler_currentButtonVolatile = 0; // L: 76 - } - - if (var1.isPopupTrigger()) { // L: 78 - var1.consume(); - } - - } // L: 79 - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 99 - } // L: 100 - - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZZB)Lqx;", - garbageValue = "28" + descriptor = "(ILbd;ZI)I", + garbageValue = "-1283526589" ) - static IndexedSprite method622(boolean var0, boolean var1) { - return var0 ? (var1 ? class143.field1639 : Skeleton.options_buttons_2Sprite) : (var1 ? InvDefinition.field1814 : class160.options_buttons_0Sprite); // L: 274 + static int method613(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 427 + return class168.method3353(var0, var1, var2); + } else if (var0 < 1100) { // L: 428 + return class7.method54(var0, var1, var2); + } else if (var0 < 1200) { // L: 429 + return UserComparator9.method2621(var0, var1, var2); + } else if (var0 < 1300) { // L: 430 + return class134.method2906(var0, var1, var2); + } else if (var0 < 1400) { // L: 431 + return UserComparator3.method2607(var0, var1, var2); + } else if (var0 < 1500) { // L: 432 + return Language.method6079(var0, var1, var2); + } else if (var0 < 1600) { // L: 433 + return class296.method5749(var0, var1, var2); + } else if (var0 < 1700) { // L: 434 + return SoundSystem.method761(var0, var1, var2); + } else if (var0 < 1800) { // L: 435 + return class135.method2922(var0, var1, var2); + } else if (var0 < 1900) { // L: 436 + return NPC.method2361(var0, var1, var2); + } else if (var0 < 2000) { // L: 437 + return HealthBarUpdate.method2186(var0, var1, var2); + } else if (var0 < 2100) { // L: 438 + return class7.method54(var0, var1, var2); + } else if (var0 < 2200) { // L: 439 + return UserComparator9.method2621(var0, var1, var2); + } else if (var0 < 2300) { // L: 440 + return class134.method2906(var0, var1, var2); + } else if (var0 < 2400) { // L: 441 + return UserComparator3.method2607(var0, var1, var2); + } else if (var0 < 2500) { + return Language.method6079(var0, var1, var2); // L: 442 + } else if (var0 < 2600) { // L: 443 + return ApproximateRouteStrategy.method1124(var0, var1, var2); + } else if (var0 < 2700) { // L: 444 + return class135.method2921(var0, var1, var2); + } else if (var0 < 2800) { // L: 445 + return class271.method5220(var0, var1, var2); + } else if (var0 < 2900) { // L: 446 + return class127.method2840(var0, var1, var2); + } else if (var0 < 3000) { // L: 447 + return HealthBarUpdate.method2186(var0, var1, var2); + } else if (var0 < 3200) { // L: 448 + return Projectile.method1976(var0, var1, var2); + } else if (var0 < 3300) { // L: 449 + return PlayerType.method5803(var0, var1, var2); + } else if (var0 < 3400) { // L: 450 + return ViewportMouse.method5089(var0, var1, var2); + } else if (var0 < 3500) { // L: 451 + return SecureRandomFuture.method1985(var0, var1, var2); + } else if (var0 < 3600) { // L: 452 + return class356.method6582(var0, var1, var2); + } else if (var0 < 3700) { // L: 453 + return AbstractByteArrayCopier.method5506(var0, var1, var2); + } else if (var0 < 3800) { // L: 454 + return GameObject.method5111(var0, var1, var2); + } else if (var0 < 3900) { // L: 455 + return WorldMapSectionType.method4310(var0, var1, var2); + } else if (var0 < 4000) { // L: 456 + return Player.method2112(var0, var1, var2); + } else if (var0 < 4100) { // L: 457 + return Strings.method5790(var0, var1, var2); + } else if (var0 < 4200) { + return WorldMapLabel.method4354(var0, var1, var2); // L: 458 + } else if (var0 < 4300) { // L: 459 + return NetCache.method5965(var0, var1, var2); + } else if (var0 < 5100) { // L: 460 + return class151.method3159(var0, var1, var2); + } else if (var0 < 5400) { // L: 461 + return class160.method3279(var0, var1, var2); + } else if (var0 < 5600) { // L: 462 + return Language.method6091(var0, var1, var2); + } else if (var0 < 5700) { // L: 463 + return BufferedSink.method6911(var0, var1, var2); + } else if (var0 < 6300) { // L: 464 + return SecureRandomFuture.method1984(var0, var1, var2); + } else if (var0 < 6600) { // L: 465 + return ScriptFrame.method1085(var0, var1, var2); + } else if (var0 < 6700) { // L: 466 + return class11.method100(var0, var1, var2); + } else if (var0 < 6800) { // L: 467 + return class271.method5221(var0, var1, var2); + } else if (var0 < 6900) { // L: 468 + return HealthBar.method2343(var0, var1, var2); + } else if (var0 < 7000) { // L: 469 + return class10.method87(var0, var1, var2); + } else if (var0 < 7100) { // L: 470 + return MouseRecorder.method2094(var0, var1, var2); + } else if (var0 < 7200) { // L: 471 + return Skeleton.method4729(var0, var1, var2); + } else if (var0 < 7300) { // L: 472 + return class19.method286(var0, var1, var2); + } else { + return var0 < 7500 ? ApproximateRouteStrategy.method1123(var0, var1, var2) : 2; // L: 473 474 + } } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Law;I)V", - garbageValue = "1699393273" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-76237077" ) - static void method621(GameEngine var0) { - while (class16.isKeyDown()) { // L: 1957 - if (class241.field2833 == 13) { // L: 1958 - Login.worldSelectOpen = false; // L: 1960 - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1961 - class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1962 - HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 1963 - return; // L: 1965 + public static String method584(String var0) { + int var1 = var0.length(); // L: 150 + char[] var2 = new char[var1]; // L: 151 + byte var3 = 2; // L: 152 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 153 + char var5 = var0.charAt(var4); // L: 154 + if (var3 == 0) { // L: 155 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 156 + var5 = class129.method2863(var5); } - if (class241.field2833 == 96) { // L: 1967 - if (Login.worldSelectPage > 0 && Interpreter.worldSelectLeftSprite != null) { // L: 1968 - --Login.worldSelectPage; // L: 1969 + if (Character.isLetter(var5)) { // L: 157 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 158 + if (Character.isSpaceChar(var5)) { // L: 159 + if (var3 != 2) { // L: 160 + var3 = 1; + } + } else { + var3 = 1; // L: 162 } - } else if (class241.field2833 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class124.worldSelectRightSprite != null) { // L: 1972 1973 - ++Login.worldSelectPage; // L: 1974 + } else { + var3 = 2; } + + var2[var4] = var5; // L: 163 } - if (MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler_lastButton == 4) { // L: 1978 - int var1 = Login.xPadding + 280; // L: 1979 - if (MouseHandler_lastPressedX >= var1 && MouseHandler_lastPressedX <= var1 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1980 - Interpreter.changeWorldSelectSorting(0, 0); // L: 1981 - return; // L: 1982 - } + return new String(var2); // L: 165 + } - if (MouseHandler_lastPressedX >= var1 + 15 && MouseHandler_lastPressedX <= var1 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1984 - Interpreter.changeWorldSelectSorting(0, 1); // L: 1985 - return; // L: 1986 - } - - int var2 = Login.xPadding + 390; // L: 1988 - if (MouseHandler_lastPressedX >= var2 && MouseHandler_lastPressedX <= var2 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1989 - Interpreter.changeWorldSelectSorting(1, 0); // L: 1990 - return; // L: 1991 - } - - if (MouseHandler_lastPressedX >= var2 + 15 && MouseHandler_lastPressedX <= var2 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1993 - Interpreter.changeWorldSelectSorting(1, 1); // L: 1994 - return; // L: 1995 - } - - int var3 = Login.xPadding + 500; // L: 1997 - if (MouseHandler_lastPressedX >= var3 && MouseHandler_lastPressedX <= var3 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1998 - Interpreter.changeWorldSelectSorting(2, 0); // L: 1999 - return; // L: 2000 - } - - if (MouseHandler_lastPressedX >= var3 + 15 && MouseHandler_lastPressedX <= var3 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 2002 - Interpreter.changeWorldSelectSorting(2, 1); // L: 2003 - return; // L: 2004 - } - - int var4 = Login.xPadding + 610; // L: 2006 - if (MouseHandler_lastPressedX >= var4 && MouseHandler_lastPressedX <= var4 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 2007 - Interpreter.changeWorldSelectSorting(3, 0); // L: 2008 - return; // L: 2009 - } - - if (MouseHandler_lastPressedX >= var4 + 15 && MouseHandler_lastPressedX <= var4 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 2011 - Interpreter.changeWorldSelectSorting(3, 1); // L: 2012 - return; // L: 2013 - } - - if (MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler_lastPressedY <= 20) { // L: 2015 - Login.worldSelectOpen = false; // L: 2017 - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 2018 - class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 2019 - HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 2020 - return; // L: 2022 - } - - if (Login.hoveredWorldIndex != -1) { // L: 2024 - World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 2025 - ItemContainer.changeWorld(var5); // L: 2026 - Login.worldSelectOpen = false; // L: 2028 - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 2029 - class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 2030 - HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 2031 - return; // L: 2033 - } - - if (Login.worldSelectPage > 0 && Interpreter.worldSelectLeftSprite != null && MouseHandler_lastPressedX >= 0 && MouseHandler_lastPressedX <= Interpreter.worldSelectLeftSprite.subWidth && MouseHandler_lastPressedY >= class309.canvasHeight / 2 - 50 && MouseHandler_lastPressedY <= class309.canvasHeight / 2 + 50) { // L: 2035 - --Login.worldSelectPage; // L: 2036 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && class124.worldSelectRightSprite != null && MouseHandler_lastPressedX >= class4.canvasWidth - class124.worldSelectRightSprite.subWidth - 5 && MouseHandler_lastPressedX <= class4.canvasWidth && MouseHandler_lastPressedY >= class309.canvasHeight / 2 - 50 && MouseHandler_lastPressedY <= class309.canvasHeight / 2 + 50) { // L: 2038 - ++Login.worldSelectPage; // L: 2039 - } - } - - } // L: 2042 - - @ObfuscatedName("fr") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "797091978" + descriptor = "(Lpz;B)V", + garbageValue = "2" ) - static final void method593() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2583 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2586 - KitDefinition.KitDefinition_cached.clear(); // L: 2589 - ObjectComposition.ObjectDefinition_cached.clear(); // L: 2592 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2593 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2594 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2595 - WorldMapDecoration.method4988(); // L: 2597 - ItemComposition.ItemDefinition_cached.clear(); // L: 2599 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 2600 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 2601 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2604 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2605 - SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2606 - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2609 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2610 - VarbitComposition.VarbitDefinition_cached.clear(); // L: 2613 - FontName.method7509(); // L: 2615 - ScriptEvent.HitSplatDefinition_cachedSprites.method7640(); // L: 2616 - FontName.HitSplatDefinition_cached.method7640(); // L: 2617 - class146.method3040(); // L: 2618 - UserComparator1.method8029(); // L: 2619 - class141.method2995(); // L: 2620 - StructComposition.method3605(); // L: 2621 - PacketWriter.method2485(); // L: 2622 - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2624 - Widget.Widget_cachedSprites.clear(); // L: 2627 - Widget.Widget_cachedModels.clear(); // L: 2628 - Widget.Widget_cachedFonts.clear(); // L: 2629 - Widget.Widget_cachedSpriteMasks.clear(); // L: 2630 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2632 - Script.Script_cached.clear(); // L: 2633 - TileItem.archive0.clearFiles(); // L: 2634 - class321.archive1.clearFiles(); // L: 2635 - class121.archive3.clearFiles(); // L: 2636 - archive4.clearFiles(); // L: 2637 - class302.archive5.clearFiles(); // L: 2638 - ArchiveLoader.archive6.clearFiles(); // L: 2639 - class145.archive7.clearFiles(); // L: 2640 - WorldMapData_1.archive8.clearFiles(); // L: 2641 - class132.archive9.clearFiles(); // L: 2642 - World.archive10.clearFiles(); // L: 2643 - class268.archive11.clearFiles(); // L: 2644 - class135.archive12.clearFiles(); // L: 2645 - } // L: 2646 + static final void method593(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field547; ++var1) { // L: 8207 + int var2 = Client.field548[var1]; // L: 8208 + NPC var3 = Client.npcs[var2]; // L: 8209 + int var4 = var0.readUnsignedByte(); // L: 8210 + int var5; + if (class431.field4602 && (var4 & 64) != 0) { // L: 8211 + var5 = var0.readUnsignedByte(); // L: 8212 + var4 += var5 << 8; // L: 8213 + } - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1201561793" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class182.pcmPlayer1 != null) { // L: 3298 - class182.pcmPlayer1.run(); + int var6; + int var7; + int var8; + if ((var4 & 1) != 0) { // L: 8215 + var5 = var0.readUnsignedShort(); // L: 8216 + var6 = var0.method7715(); // L: 8217 + if (class431.field4602) { // L: 8218 + var3.field1144 = var0.method7875() == 1; // L: 8219 + } + + var7 = var3.x - (var5 - GrandExchangeOfferOwnWorldComparator.baseX - GrandExchangeOfferOwnWorldComparator.baseX) * 64; // L: 8221 + var8 = var3.y - (var6 - VarcInt.baseY - VarcInt.baseY) * 64; // L: 8222 + if (var7 != 0 || var8 != 0) { // L: 8223 + var3.field1121 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 1024) != 0) { // L: 8225 + var3.field1182 = var0.readInt(); // L: 8226 + } + + if ((var4 & 16) != 0) { // L: 8228 + var3.spotAnimation = var0.readUnsignedShort(); // L: 8229 + var5 = var0.readInt(); // L: 8230 + var3.spotAnimationHeight = var5 >> 16; // L: 8231 + var3.field1134 = (var5 & 65535) + Client.cycle; // L: 8232 + var3.spotAnimationFrame = 0; // L: 8233 + var3.spotAnimationFrameCycle = 0; // L: 8234 + if (var3.field1134 > Client.cycle) { // L: 8235 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 8236 + var3.spotAnimation = -1; + } + } + + if ((var4 & 128) != 0) { // L: 8238 + var5 = var0.readUnsignedByte(); // L: 8239 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 8240 + for (var6 = 0; var6 < var5; ++var6) { // L: 8241 + var8 = -1; // L: 8243 + var9 = -1; // L: 8244 + var10 = -1; // L: 8245 + var7 = var0.readUShortSmart(); // L: 8246 + if (var7 == 32767) { // L: 8247 + var7 = var0.readUShortSmart(); // L: 8248 + var9 = var0.readUShortSmart(); // L: 8249 + var8 = var0.readUShortSmart(); // L: 8250 + var10 = var0.readUShortSmart(); // L: 8251 + } else if (var7 != 32766) { // L: 8253 + var9 = var0.readUShortSmart(); // L: 8254 + } else { + var7 = -1; // L: 8256 + } + + var11 = var0.readUShortSmart(); // L: 8257 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 8258 + } + } + + var6 = var0.method7773(); // L: 8261 + if (var6 > 0) { // L: 8262 + for (var7 = 0; var7 < var6; ++var7) { // L: 8263 + var8 = var0.readUShortSmart(); // L: 8264 + var9 = var0.readUShortSmart(); // L: 8265 + if (var9 != 32767) { // L: 8266 + var10 = var0.readUShortSmart(); // L: 8267 + var11 = var0.readUnsignedByte(); // L: 8268 + int var12 = var9 > 0 ? var0.method7875() : var11; // L: 8269 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 8270 + } else { + var3.removeHealthBar(var8); // L: 8272 + } + } + } + } + + if (class431.field4602 && (var4 & 256) != 0 || !class431.field4602 && (var4 & 64) != 0) { // L: 8276 + var3.field1129 = var0.method7885(); // L: 8277 + var3.field1160 = var0.method7707(); // L: 8278 + var3.field1132 = var0.readByte(); // L: 8279 + var3.field1161 = var0.readByte(); // L: 8280 + var3.field1143 = var0.method7715() + Client.cycle; // L: 8281 + var3.field1163 = var0.readUnsignedShort() + Client.cycle; // L: 8282 + var3.field1135 = var0.method7715(); // L: 8283 + var3.pathLength = 1; // L: 8284 + var3.field1170 = 0; // L: 8285 + var3.field1129 += var3.pathX[0]; // L: 8286 + var3.field1160 += var3.pathY[0]; // L: 8287 + var3.field1132 += var3.pathX[0]; // L: 8288 + var3.field1161 += var3.pathY[0]; // L: 8289 + } + + if ((var4 & 512) != 0) { // L: 8291 + var3.field1167 = Client.cycle + var0.method7713(); // L: 8292 + var3.field1168 = Client.cycle + var0.method7714(); // L: 8293 + var3.field1169 = var0.readByte(); // L: 8294 + var3.field1114 = var0.method7707(); // L: 8295 + var3.field1171 = var0.method7707(); // L: 8296 + var3.field1122 = (byte)var0.method7742(); // L: 8297 + } + + if ((var4 & 2) != 0) { // L: 8299 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 8300 + var3.overheadTextCyclesRemaining = 100; // L: 8301 + } + + if ((var4 & 4) != 0) { // L: 8303 + var3.targetIndex = var0.method7714(); // L: 8304 + if (var3.targetIndex == 65535) { // L: 8305 + var3.targetIndex = -1; + } + } + + if ((var4 & 32) != 0) { // L: 8307 + var3.definition = KeyHandler.getNpcDefinition(var0.method7715()); // L: 8308 + var3.field1150 = var3.definition.size; // L: 8309 + var3.field1175 = var3.definition.rotation; // L: 8310 + var3.walkSequence = var3.definition.walkSequence; // L: 8311 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 8312 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 8313 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 8314 + var3.idleSequence = var3.definition.idleSequence; // L: 8315 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 8316 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 8317 + } + + if ((var4 & 8) != 0) { // L: 8319 + var5 = var0.method7713(); // L: 8320 + if (var5 == 65535) { // L: 8321 + var5 = -1; // L: 8322 + } + + var6 = var0.method7875(); // L: 8324 + if (var5 == var3.sequence && var5 != -1) { // L: 8325 + var7 = class163.SequenceDefinition_get(var5).field2161; // L: 8326 + if (var7 == 1) { // L: 8327 + var3.sequenceFrame = 0; // L: 8328 + var3.sequenceFrameCycle = 0; // L: 8329 + var3.sequenceDelay = var6; // L: 8330 + var3.field1152 = 0; // L: 8331 + } + + if (var7 == 2) { // L: 8333 + var3.field1152 = 0; // L: 8334 + } + } else if (var5 == -1 || var3.sequence == -1 || class163.SequenceDefinition_get(var5).field2155 >= class163.SequenceDefinition_get(var3.sequence).field2155) { // L: 8337 + var3.sequence = var5; // L: 8338 + var3.sequenceFrame = 0; // L: 8339 + var3.sequenceFrameCycle = 0; // L: 8340 + var3.sequenceDelay = var6; // L: 8341 + var3.field1152 = 0; // L: 8342 + var3.field1170 = var3.pathLength; // L: 8343 + } + } } - if (class290.pcmPlayer0 != null) { // L: 3299 - class290.pcmPlayer0.run(); - } - - } // L: 3300 - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1506401046" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (MusicPatchNode2.loadInterface(var0)) { // L: 11114 - ClanSettings.runComponentCloseListeners(EnumComposition.Widget_interfaceComponents[var0], var1); // L: 11115 - } - } // L: 11116 + } // L: 8348 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 9a9874d91d..b7107e1b25 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -2,32 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cf") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("uv") - @ObfuscatedGetter( - intValue = 270412709 - ) - @Export("foundItemIndex") - static int foundItemIndex; @ObfuscatedName("v") @Export("isRunning") boolean isRunning; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("lock") Object lock; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -154058261 + intValue = 1040654815 ) @Export("index") int index; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("xs") int[] xs; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("ys") int[] ys; @ObfuscatedName("n") @@ -41,19 +36,269 @@ public class MouseRecorder implements Runnable { this.xs = new int[500]; // L: 10 this.ys = new int[500]; // L: 11 this.millis = new long[500]; // L: 12 - } // L: 14 + } public void run() { - for (; this.isRunning; GrandExchangeOfferTotalQuantityComparator.method6007(50L)) { // L: 18 27 - synchronized(this.lock) { // L: 19 - if (this.index < 500) { // L: 20 - this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21 - this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 22 - this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 23 - ++this.index; // L: 24 + for (; this.isRunning; class93.method2384(50L)) { // L: 26 + synchronized(this.lock) { // L: 18 + if (this.index < 500) { // L: 19 + this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 + this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 21 + this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 22 + ++this.index; // L: 23 } } } - } // L: 29 + } // L: 28 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1730658434" + ) + static int method2093(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2109167375" + ) + public static void method2098() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 82 + } // L: 83 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1423538345" + ) + static int method2094(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4547 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4551 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4555 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4559 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4563 + if (var0 != 7031 && var0 != 7032) { // L: 4567 + if (var0 == 7033) { // L: 4572 + --class122.Interpreter_stringStackSize; // L: 4573 + return 1; // L: 4574 + } else if (var0 != 7036 && var0 != 7037) { // L: 4576 + if (var0 == 7038) { // L: 4580 + --Interpreter.Interpreter_intStackSize; // L: 4581 + return 1; // L: 4582 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4584 + return 2; // L: 4588 + } else { + --Interpreter.Interpreter_intStackSize; // L: 4585 + return 1; // L: 4586 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 4577 + return 1; // L: 4578 + } + } else { + --class122.Interpreter_stringStackSize; // L: 4568 + --Interpreter.Interpreter_intStackSize; // L: 4569 + return 1; // L: 4570 + } + } else { + --Interpreter.Interpreter_intStackSize; // L: 4564 + return 1; // L: 4565 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 4560 + return 1; // L: 4561 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 4556 + return 1; // L: 4557 + } + } else { + Interpreter.Interpreter_intStackSize -= 3; // L: 4552 + return 1; // L: 4553 + } + } else { + Interpreter.Interpreter_intStackSize -= 5; // L: 4548 + return 1; // L: 4549 + } + } + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1147144850" + ) + static final void method2096(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; // L: 5289 + boolean var4 = false; // L: 5290 + int var5 = -1; // L: 5291 + int var6 = -1; // L: 5292 + int var7 = Players.Players_count; // L: 5293 + int[] var8 = Players.Players_indices; // L: 5294 + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 5295 + Object var20; + if (var9 < var7) { // L: 5297 + var20 = Client.players[var8[var9]]; // L: 5298 + if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 5299 + var4 = true; // L: 5300 + var5 = var9; // L: 5301 + continue; + } + + if (var20 == GrandExchangeEvents.localPlayer) { // L: 5304 + var6 = var9; // L: 5305 + continue; // L: 5306 + } + } else { + var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 5309 + } + + ScriptFrame.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 5310 + } + + if (Client.renderSelf && var6 != -1) { // L: 5312 + ScriptFrame.drawActor2d(GrandExchangeEvents.localPlayer, var6, var0, var1, var2, var3); // L: 5313 + } + + if (var4) { // L: 5315 + ScriptFrame.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 5316 + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 5318 + int var10 = Client.overheadTextXs[var9]; // L: 5319 + int var11 = Client.overheadTextYs[var9]; // L: 5320 + int var12 = Client.overheadTextXOffsets[var9]; // L: 5321 + int var13 = Client.overheadTextAscents[var9]; // L: 5322 + boolean var14 = true; // L: 5323 + + while (var14) { + var14 = false; // L: 5325 + + for (int var19 = 0; var19 < var9; ++var19) { // L: 5326 + if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var10 + var12 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 5327 5328 + var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 5329 + var14 = true; // L: 5330 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; // L: 5335 + Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 5336 + String var15 = Client.overheadText[var9]; // L: 5337 + if (Client.chatEffects == 0) { // L: 5338 + int var16 = 16776960; // L: 5339 + if (Client.overheadTextColors[var9] < 6) { // L: 5340 + var16 = Client.field725[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { // L: 5341 + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { // L: 5342 + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { // L: 5343 + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { // L: 5344 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5345 + if (var17 < 50) { // L: 5346 + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { // L: 5347 + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 5348 + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { // L: 5350 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5351 + if (var17 < 50) { // L: 5352 + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { // L: 5353 + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 5354 + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { // L: 5356 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5357 + if (var17 < 50) { // L: 5358 + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { // L: 5359 + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { // L: 5360 + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { // L: 5362 + RouteStrategy.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { // L: 5363 + RouteStrategy.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { // L: 5364 + RouteStrategy.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { // L: 5365 + RouteStrategy.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { // L: 5366 + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (RouteStrategy.fontBold12.stringWidth(var15) + 100) / 150; // L: 5367 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5368 + RouteStrategy.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 5369 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5370 + } + + if (Client.overheadTextEffects[var9] == 5) { // L: 5372 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5373 + int var18 = 0; // L: 5374 + if (var17 < 25) { // L: 5375 + var18 = var17 - 25; + } else if (var17 > 125) { // L: 5376 + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - RouteStrategy.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5377 + RouteStrategy.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 5378 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5379 + } + } else { + RouteStrategy.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5383 + } + } + + } // L: 5386 + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "551926222" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (class155.loadInterface(var0)) { // L: 11718 + class155.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 11719 + } + } // L: 11720 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index fb36e4ec17..a868106f72 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -6,10 +6,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ls") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 7fc3ff22a0..7b3142ea4f 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("z") +@ObfuscatedName("j") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements class158, MouseWheelListener { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1339814873 + intValue = -1835748205 ) @Export("rotation") int rotation; @@ -24,27 +24,27 @@ public final class MouseWheelHandler implements class158, MouseWheelListener { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-377555450" + garbageValue = "-577945862" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1281199631" + garbageValue = "1462071319" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-665818879" + garbageValue = "34380601" ) @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 481d0a2c93..474cc63e66 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,4 +1,3 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -10,38 +9,38 @@ import net.runelite.mapping.ObfuscatedSignature; public class MusicPatch extends Node { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1376988033 + intValue = 1242230189 ) - int field3227; - @ObfuscatedName("o") + int field3228; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Laj;" + descriptor = "[Lat;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("h") - short[] field3228; - @ObfuscatedName("g") - byte[] field3229; - @ObfuscatedName("l") - byte[] field3230; + @ObfuscatedName("i") + short[] field3227; + @ObfuscatedName("f") + byte[] field3223; + @ObfuscatedName("b") + byte[] field3222; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Ljf;" + descriptor = "[Ljy;" ) - MusicPatchNode2[] field3231; - @ObfuscatedName("d") - byte[] field3232; - @ObfuscatedName("f") + MusicPatchNode2[] field3224; + @ObfuscatedName("s") + byte[] field3220; + @ObfuscatedName("l") int[] field3226; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; // L: 21 - this.field3228 = new short[128]; // L: 22 - this.field3229 = new byte[128]; // L: 23 - this.field3230 = new byte[128]; // L: 24 - this.field3231 = new MusicPatchNode2[128]; // L: 25 - this.field3232 = new byte[128]; // L: 26 + this.field3227 = new short[128]; // L: 22 + this.field3223 = new byte[128]; // L: 23 + this.field3222 = new byte[128]; // L: 24 + this.field3224 = new MusicPatchNode2[128]; // L: 25 + this.field3220 = new byte[128]; // L: 26 this.field3226 = new int[128]; // L: 27 Buffer var2 = new Buffer(var1); // L: 28 @@ -49,57 +48,57 @@ public class MusicPatch extends Node { for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 } - byte[] var4 = new byte[var3]; + byte[] var4 = new byte[var3]; // L: 31 int var5; for (var5 = 0; var5 < var3; ++var5) { // L: 32 var4[var5] = var2.readByte(); } - ++var2.offset; - ++var3; - var5 = var2.offset; - var2.offset += var3; + ++var2.offset; // L: 33 + ++var3; // L: 34 + var5 = var2.offset; // L: 35 + var2.offset += var3; // L: 36 int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38 } - byte[] var7 = new byte[var6]; + byte[] var7 = new byte[var6]; // L: 39 int var8; - for (var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { // L: 40 var7[var8] = var2.readByte(); } - ++var2.offset; - ++var6; - var8 = var2.offset; - var2.offset += var6; + ++var2.offset; // L: 41 + ++var6; // L: 42 + var8 = var2.offset; // L: 43 + var2.offset += var6; // L: 44 int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46 } - byte[] var10 = new byte[var9]; + byte[] var10 = new byte[var9]; // L: 47 for (int var11 = 0; var11 < var9; ++var11) { // L: 48 var10[var11] = var2.readByte(); } - ++var2.offset; - ++var9; - byte[] var36 = new byte[var9]; + ++var2.offset; // L: 49 + ++var9; // L: 50 + byte[] var36 = new byte[var9]; // L: 51 int var12; int var14; if (var9 > 1) { // L: 53 var36[1] = 1; // L: 54 - int var13 = 1; - var12 = 2; + int var13 = 1; // L: 55 + var12 = 2; // L: 56 - for (var14 = 2; var14 < var9; ++var14) { + for (var14 = 2; var14 < var9; ++var14) { // L: 57 int var41 = var2.readUnsignedByte(); // L: 58 - if (var41 == 0) { + if (var41 == 0) { // L: 59 var13 = var12++; } else { if (var41 <= var13) { // L: 61 @@ -122,13 +121,13 @@ public class MusicPatch extends Node { var15 = var37[var14] = new MusicPatchNode2(); // L: 70 int var40 = var2.readUnsignedByte(); // L: 71 if (var40 > 0) { // L: 72 - var15.field3165 = new byte[var40 * 2]; + var15.field3160 = new byte[var40 * 2]; } var40 = var2.readUnsignedByte(); // L: 73 if (var40 > 0) { // L: 74 - var15.field3162 = new byte[var40 * 2 + 2]; // L: 75 - var15.field3162[1] = 64; // L: 76 + var15.field3165 = new byte[var40 * 2 + 2]; // L: 75 + var15.field3165[1] = 64; // L: 76 } } @@ -155,7 +154,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { // L: 90 var19 += var2.readUnsignedByte(); // L: 91 - this.field3228[var20] = (short)var19; // L: 92 + this.field3227[var20] = (short)var19; // L: 92 } var19 = 0; // L: 94 @@ -163,7 +162,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { // L: 95 var19 += var2.readUnsignedByte(); // L: 96 - var48 = this.field3228; // L: 97 + var48 = this.field3227; // L: 97 var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -183,7 +182,7 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); // L: 106 } - var48 = this.field3228; // L: 108 + var48 = this.field3227; // L: 108 var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); this.field3226[var23] = var22; // L: 109 --var20; // L: 110 @@ -206,7 +205,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; // L: 120 } - this.field3232[var24] = (byte)var23; // L: 122 + this.field3220[var24] = (byte)var23; // L: 122 --var20; // L: 123 } } @@ -227,7 +226,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field3230[var25] = (byte)var24; // L: 135 + this.field3222[var25] = (byte)var24; // L: 135 --var20; // L: 136 } } @@ -248,7 +247,7 @@ public class MusicPatch extends Node { } } - this.field3231[var26] = var38; // L: 148 + this.field3224[var26] = var38; // L: 148 --var20; // L: 149 } } @@ -271,25 +270,25 @@ public class MusicPatch extends Node { } } - this.field3229[var27] = (byte)var26; // L: 160 + this.field3223[var27] = (byte)var26; // L: 160 --var20; // L: 161 } - this.field3227 = var2.readUnsignedByte() + 1; // L: 163 + this.field3228 = var2.readUnsignedByte() + 1; // L: 163 int var29; MusicPatchNode2 var39; for (var27 = 0; var27 < var12; ++var27) { // L: 164 var39 = var37[var27]; // L: 165 - if (var39.field3165 != null) { // L: 166 - for (var29 = 1; var29 < var39.field3165.length; var29 += 2) { // L: 167 - var39.field3165[var29] = var2.readByte(); + if (var39.field3160 != null) { // L: 166 + for (var29 = 1; var29 < var39.field3160.length; var29 += 2) { // L: 167 + var39.field3160[var29] = var2.readByte(); } } - if (var39.field3162 != null) { // L: 169 - for (var29 = 3; var29 < var39.field3162.length - 2; var29 += 2) { // L: 170 - var39.field3162[var29] = var2.readByte(); + if (var39.field3165 != null) { // L: 169 + for (var29 = 3; var29 < var39.field3165.length - 2; var29 += 2) { // L: 170 + var39.field3165[var29] = var2.readByte(); } } } @@ -308,24 +307,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { // L: 179 var39 = var37[var27]; // L: 180 - if (var39.field3162 != null) { // L: 181 + if (var39.field3165 != null) { // L: 181 var19 = 0; // L: 182 - for (var29 = 2; var29 < var39.field3162.length; var29 += 2) { // L: 183 + for (var29 = 2; var29 < var39.field3165.length; var29 += 2) { // L: 183 var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184 - var39.field3162[var29] = (byte)var19; // L: 185 + var39.field3165[var29] = (byte)var19; // L: 185 } } } for (var27 = 0; var27 < var12; ++var27) { // L: 189 var39 = var37[var27]; // L: 190 - if (var39.field3165 != null) { // L: 191 + if (var39.field3160 != null) { // L: 191 var19 = 0; // L: 192 - for (var29 = 2; var29 < var39.field3165.length; var29 += 2) { // L: 193 + for (var29 = 2; var29 < var39.field3160.length; var29 += 2) { // L: 193 var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var39.field3165[var29] = (byte)var19; // L: 195 + var39.field3160[var29] = (byte)var19; // L: 195 } } } @@ -349,7 +348,7 @@ public class MusicPatch extends Node { byte var28 = var42[1]; // L: 207 for (var29 = 0; var29 < var47; ++var29) { // L: 208 - this.field3229[var29] = (byte)(var28 * this.field3229[var29] + 32 >> 6); + this.field3223[var29] = (byte)(var28 * this.field3223[var29] + 32 >> 6); } for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221 @@ -358,8 +357,8 @@ public class MusicPatch extends Node { var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213 for (var33 = var47; var33 < var30; ++var33) { // L: 214 - var34 = class7.method53(var32, var30 - var47); // L: 215 - this.field3229[var33] = (byte)(var34 * this.field3229[var33] + 32 >> 6); // L: 216 + var34 = class82.method2102(var32, var30 - var47); // L: 215 + this.field3223[var33] = (byte)(var34 * this.field3223[var33] + 32 >> 6); // L: 216 var32 += var31 - var28; // L: 217 } @@ -368,7 +367,7 @@ public class MusicPatch extends Node { } for (var45 = var47; var45 < 128; ++var45) { // L: 223 - this.field3229[var45] = (byte)(var28 * this.field3229[var45] + 32 >> 6); + this.field3223[var45] = (byte)(var28 * this.field3223[var45] + 32 >> 6); } var15 = null; // L: 224 @@ -387,7 +386,7 @@ public class MusicPatch extends Node { int var44 = var16[1] << 1; // L: 234 for (var29 = 0; var29 < var47; ++var29) { // L: 235 - var45 = var44 + (this.field3230[var29] & 255); // L: 236 + var45 = var44 + (this.field3222[var29] & 255); // L: 236 if (var45 < 0) { // L: 237 var45 = 0; } @@ -396,7 +395,7 @@ public class MusicPatch extends Node { var45 = 128; } - this.field3230[var29] = (byte)var45; // L: 239 + this.field3222[var29] = (byte)var45; // L: 239 } int var46; @@ -406,8 +405,8 @@ public class MusicPatch extends Node { var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245 for (var33 = var47; var33 < var30; ++var33) { // L: 246 - var34 = class7.method53(var32, var30 - var47); // L: 247 - int var35 = var34 + (this.field3230[var33] & 255); // L: 248 + var34 = class82.method2102(var32, var30 - var47); // L: 247 + int var35 = var34 + (this.field3222[var33] & 255); // L: 248 if (var35 < 0) { // L: 249 var35 = 0; } @@ -416,7 +415,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field3230[var33] = (byte)var35; // L: 251 + this.field3222[var33] = (byte)var35; // L: 251 var32 += var46 - var44; // L: 252 } @@ -425,7 +424,7 @@ public class MusicPatch extends Node { } for (var45 = var47; var45 < 128; ++var45) { // L: 258 - var46 = var44 + (this.field3230[var45] & 255); // L: 259 + var46 = var44 + (this.field3222[var45] & 255); // L: 259 if (var46 < 0) { // L: 260 var46 = 0; } @@ -434,46 +433,46 @@ public class MusicPatch extends Node { var46 = 128; } - this.field3230[var45] = (byte)var46; // L: 262 + this.field3222[var45] = (byte)var46; // L: 262 } Object var43 = null; // L: 264 } for (var27 = 0; var27 < var12; ++var27) { // L: 266 - var37[var27].field3164 = var2.readUnsignedByte(); + var37[var27].field3162 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 267 var39 = var37[var27]; // L: 268 - if (var39.field3165 != null) { // L: 269 - var39.field3168 = var2.readUnsignedByte(); + if (var39.field3160 != null) { // L: 269 + var39.field3159 = var2.readUnsignedByte(); } - if (var39.field3162 != null) { // L: 270 + if (var39.field3165 != null) { // L: 270 var39.field3163 = var2.readUnsignedByte(); } - if (var39.field3164 > 0) { // L: 271 - var39.field3173 = var2.readUnsignedByte(); + if (var39.field3162 > 0) { // L: 271 + var39.field3164 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { // L: 273 - var37[var27].field3169 = var2.readUnsignedByte(); + var37[var27].field3166 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 274 var39 = var37[var27]; // L: 275 - if (var39.field3169 > 0) { // L: 276 - var39.field3171 = var2.readUnsignedByte(); + if (var39.field3166 > 0) { // L: 276 + var39.field3161 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { // L: 278 var39 = var37[var27]; // L: 279 - if (var39.field3171 > 0) { // L: 280 - var39.field3170 = var2.readUnsignedByte(); + if (var39.field3161 > 0) { // L: 280 + var39.field3167 = var2.readUnsignedByte(); } } @@ -481,10 +480,10 @@ public class MusicPatch extends Node { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lan;[B[IS)Z", - garbageValue = "-29454" + descriptor = "(Lac;[B[IB)Z", + garbageValue = "-3" ) - boolean method5460(SoundCache var1, byte[] var2, int[] var3) { + boolean method5427(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; // L: 285 int var5 = 0; // L: 286 RawSound var6 = null; // L: 287 @@ -493,7 +492,7 @@ public class MusicPatch extends Node { if (var2 == null || var2[var7] != 0) { // L: 289 int var8 = this.field3226[var7]; // L: 290 if (var8 != 0) { // L: 291 - if (var5 != var8) { // L: 292 + if (var8 != var5) { // L: 292 var5 = var8--; // L: 293 294 if ((var8 & 1) == 0) { // L: 295 var6 = var1.getSoundEffect(var8 >> 2, var3); @@ -517,53 +516,69 @@ public class MusicPatch extends Node { return var4; // L: 305 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "12" + descriptor = "(I)V", + garbageValue = "-1421286153" ) @Export("clear") void clear() { this.field3226 = null; // L: 309 } // L: 310 - @ObfuscatedName("v") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-130061000" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "2078599773" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (class345.World_request == null) { // L: 31 - class345.World_request = UserComparator9.urlRequester.request(new URL(class152.field1686)); - } else if (class345.World_request.isDone()) { // L: 33 - byte[] var0 = class345.World_request.getResponse(); // L: 34 - Buffer var1 = new Buffer(var0); // L: 35 - var1.readInt(); // L: 36 - World.World_count = var1.readUnsignedShort(); // L: 37 - World.World_worlds = new World[World.World_count]; // L: 38 - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 - var3 = World.World_worlds[var2] = new World(); // L: 40 - var3.id = var1.readUnsignedShort(); // L: 41 - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); // L: 43 - var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 - var3.location = var1.readUnsignedByte(); // L: 45 - var3.population = var1.readShort(); // L: 46 - } - - WorldMapDecorationType.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - class345.World_request = null; // L: 50 - return true; // L: 51 + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4411 + byte var2 = 4; // L: 4412 + int var3 = var2 + 6; // L: 4413 + int var4 = var2 + 6; // L: 4414 + int var5 = class13.fontPlain12.lineWidth(var0, 250); // L: 4415 + int var6 = class13.fontPlain12.lineCount(var0, 250) * 13; // L: 4416 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); // L: 4417 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); // L: 4418 + class13.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4419 + HealthBar.method2330(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2); // L: 4420 + if (var1) { // L: 4421 + FontName.rasterProvider.drawFull(0, 0); // L: 4422 + } else { + ScriptEvent.method2092(var3, var4, var5, var6); // L: 4425 + } + + } + } // L: 4427 + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1118853304" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4811 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4812 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4813 + int var3 = var2.x >> 7; // L: 4814 + int var4 = var2.y >> 7; // L: 4815 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4816 + if (var2.field1150 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4817 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4818 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4819 + } + + long var5 = GameObject.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4821 + var2.playerCycle = Client.cycle; // L: 4822 + ArchiveLoader.scene.drawEntity(class18.Client_plane, var2.x, var2.y, WorldMapLabel.getTileHeight(var2.field1150 * 64 - 64 + var2.x, var2.field1150 * 64 - 64 + var2.y, class18.Client_plane), var2.field1150 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4823 + } } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - class345.World_request = null; // L: 57 } - return false; // L: 59 - } + } // L: 4827 } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index fce26e10e2..d960ecfbf2 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,117 +4,117 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jn") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1932719699 + intValue = -85807901 ) - int field3240; - @ObfuscatedName("o") + int field3248; + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Ljb;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Laj;" + descriptor = "Lat;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - MusicPatchNode2 field3242; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 389268709 - ) - int field3243; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1018403147 - ) - int field3244; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1602906341 - ) - int field3245; @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1234953283 + @ObfuscatedSignature( + descriptor = "Ljy;" ) - int field3254; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2037770949 - ) - int field3247; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1573845693 - ) - int field3248; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1045686589 - ) - int field3249; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1320174817 - ) - int field3251; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -794832495 - ) - int field3255; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -860984771 - ) - int field3252; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1408530903 - ) - int field3253; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1332405085 - ) - int field3250; + MusicPatchNode2 field3247; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -801153411 + intValue = 388699889 ) - int field3258; + int field3239; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1603871991 + ) + int field3251; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -467029619 + ) + int field3241; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 244268301 + ) + int field3242; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1685721651 + ) + int field3243; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 574011949 + ) + int field3244; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 322850677 + ) + int field3245; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 286335067 + ) + int field3246; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 841486627 + intValue = 1066885049 ) - int field3259; - @ObfuscatedName("a") + int field3235; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -921472867 + ) + int field3252; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -443275667 + ) + int field3249; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1587247393 + ) + int field3250; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1104457881 + ) + int field3253; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -579957291 + ) + int field3237; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Lau;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1551077753 + intValue = 2013381951 ) - int field3256; + int field3255; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 417761005 + intValue = 2077025655 ) - int field3239; + int field3238; MusicPatchNode() { } // L: 31 @@ -122,12 +122,12 @@ public class MusicPatchNode extends Node { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1112307051" + garbageValue = "-1181491124" ) - void method5501() { + void method5473() { this.patch = null; // L: 34 this.rawSound = null; // L: 35 - this.field3242 = null; // L: 36 + this.field3247 = null; // L: 36 this.stream = null; // L: 37 } // L: 38 } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index e28a956853..838e4f2677 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,116 +1,50 @@ -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("jf") +@ObfuscatedName("jy") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("rs") - @ObfuscatedSignature( - descriptor = "Lql;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("jl") - @ObfuscatedGetter( - intValue = -631116799 - ) - @Export("cameraYaw") - static int cameraYaw; @ObfuscatedName("v") + byte[] field3160; + @ObfuscatedName("c") byte[] field3165; - @ObfuscatedName("o") - byte[] field3162; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1461465763 + intValue = -1091435735 ) - int field3164; - @ObfuscatedName("g") + int field3162; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1955861837 + intValue = 1957731725 ) - int field3168; - @ObfuscatedName("l") + int field3159; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 45595669 + intValue = 897940521 ) int field3163; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1235565489 + intValue = 100002585 ) - int field3173; - @ObfuscatedName("d") + int field3164; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1278953517 + intValue = 369050739 ) - int field3171; - @ObfuscatedName("f") + int field3161; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1566400781 + intValue = 199056997 ) - int field3169; - @ObfuscatedName("u") + int field3166; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 798353979 + intValue = 1008423979 ) - int field3170; + int field3167; MusicPatchNode2() { } // L: 14 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-26373" - ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "5194" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Frames.Widget_loadedInterfaces[var0]) { // L: 237 - return true; - } else if (!class122.Widget_archive.tryLoadGroup(var0)) { // L: 238 - return false; - } else { - int var1 = class122.Widget_archive.getGroupFileCount(var0); // L: 239 - if (var1 == 0) { // L: 240 - Frames.Widget_loadedInterfaces[var0] = true; // L: 241 - return true; // L: 242 - } else { - if (EnumComposition.Widget_interfaceComponents[var0] == null) { // L: 244 - EnumComposition.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { // L: 245 - if (EnumComposition.Widget_interfaceComponents[var0][var2] == null) { // L: 246 - byte[] var3 = class122.Widget_archive.takeFile(var0, var2); // L: 247 - if (var3 != null) { // L: 248 - EnumComposition.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 249 - EnumComposition.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 250 - if (var3[0] == -1) { // L: 251 - EnumComposition.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - EnumComposition.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 252 - } - } - } - } - - Frames.Widget_loadedInterfaces[var0] = true; // L: 256 - return true; // L: 257 - } - } - } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 451c3aec0d..e5a4a0c3d3 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -2,32 +2,31 @@ 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("jr") +@ObfuscatedName("jt") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lje;" + descriptor = "Lji;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lal;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lje;)V" + descriptor = "(Lji;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); // L: 11 @@ -37,46 +36,46 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lju;[IIIII)V", - garbageValue = "710104322" + descriptor = "(Ljn;[IIIII)V", + garbageValue = "664452285" ) - void method5470(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field3200[var1.field3240] & 4) != 0 && var1.field3253 < 0) { // L: 73 - int var6 = this.superStream.field3202[var1.field3240] / SecureRandomFuture.field949; // L: 74 + void method5443(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field3193[var1.field3248] & 4) != 0 && var1.field3249 < 0) { // L: 73 + int var6 = this.superStream.field3195[var1.field3248] / PcmPlayer.field268; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field3239) / var6; // L: 76 + int var7 = (var6 + 1048575 - var1.field3238) / var6; // L: 76 if (var7 > var4) { // L: 77 - var1.field3239 += var6 * var4; // L: 99 + var1.field3238 += var4 * var6; // L: 99 break; } var1.stream.fill(var2, var3, var7); // L: 78 var3 += var7; // L: 79 var4 -= var7; // L: 80 - var1.field3239 += var7 * var6 - 1048576; // L: 81 - int var8 = SecureRandomFuture.field949 / 100; // L: 82 + var1.field3238 += var6 * var7 - 1048576; // L: 81 + int var8 = PcmPlayer.field268 / 100; // L: 82 int var9 = 262144 / var6; // L: 83 if (var9 < var8) { // L: 84 var8 = var9; } RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field3190[var1.field3240] == 0) { // L: 86 - var1.stream = RawPcmStream.method924(var1.rawSound, var10.method838(), var10.method865(), var10.method822()); // L: 87 + if (this.superStream.field3189[var1.field3248] == 0) { // L: 86 + var1.stream = RawPcmStream.method791(var1.rawSound, var10.method866(), var10.method797(), var10.method798()); // L: 87 } else { - var1.stream = RawPcmStream.method924(var1.rawSound, var10.method838(), 0, var10.method822()); // L: 90 - this.superStream.method5285(var1, var1.patch.field3228[var1.field3244] < 0); // L: 91 - var1.stream.method826(var8, var10.method865()); // L: 92 + var1.stream = RawPcmStream.method791(var1.rawSound, var10.method866(), 0, var10.method798()); // L: 90 + this.superStream.method5342(var1, var1.patch.field3227[var1.field3251] < 0); // L: 91 + var1.stream.method802(var8, var10.method797()); // L: 92 } - if (var1.patch.field3228[var1.field3244] < 0) { // L: 94 + if (var1.patch.field3227[var1.field3251] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method828(var8); // L: 95 + var10.method882(var8); // L: 95 var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method832()) { // L: 97 + if (var10.method808()) { // L: 97 this.mixer.addSubStream(var10); } } @@ -85,29 +84,29 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); // L: 101 } // L: 102 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lju;IB)V", - garbageValue = "0" + descriptor = "(Ljn;II)V", + garbageValue = "-1438401552" ) - void method5471(MusicPatchNode var1, int var2) { - if ((this.superStream.field3200[var1.field3240] & 4) != 0 && var1.field3253 < 0) { // L: 105 - int var3 = this.superStream.field3202[var1.field3240] / SecureRandomFuture.field949; // L: 106 - int var4 = (var3 + 1048575 - var1.field3239) / var3; // L: 107 - var1.field3239 = var3 * var2 + var1.field3239 & 1048575; // L: 108 + void method5442(MusicPatchNode var1, int var2) { + if ((this.superStream.field3193[var1.field3248] & 4) != 0 && var1.field3249 < 0) { // L: 105 + int var3 = this.superStream.field3195[var1.field3248] / PcmPlayer.field268; // L: 106 + int var4 = (var3 + 1048575 - var1.field3238) / var3; // L: 107 + var1.field3238 = var3 * var2 + var1.field3238 & 1048575; // L: 108 if (var4 <= var2) { // L: 109 - if (this.superStream.field3190[var1.field3240] == 0) { // L: 110 - var1.stream = RawPcmStream.method924(var1.rawSound, var1.stream.method838(), var1.stream.method865(), var1.stream.method822()); // L: 111 + if (this.superStream.field3189[var1.field3248] == 0) { // L: 110 + var1.stream = RawPcmStream.method791(var1.rawSound, var1.stream.method866(), var1.stream.method797(), var1.stream.method798()); // L: 111 } else { - var1.stream = RawPcmStream.method924(var1.rawSound, var1.stream.method838(), 0, var1.stream.method822()); // L: 114 - this.superStream.method5285(var1, var1.patch.field3228[var1.field3244] < 0); // L: 115 + var1.stream = RawPcmStream.method791(var1.rawSound, var1.stream.method866(), 0, var1.stream.method798()); // L: 114 + this.superStream.method5342(var1, var1.patch.field3227[var1.field3251] < 0); // L: 115 } - if (var1.patch.field3228[var1.field3244] < 0) { // L: 117 + if (var1.patch.field3227[var1.field3251] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field3239 / var3; // L: 118 + var2 = var1.field3238 / var3; // L: 118 } } @@ -116,260 +115,115 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); if (var1 == null) { return null; // L: 20 } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 22 } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { var1 = (MusicPatchNode)this.queue.previous(); // L: 27 - if (var1 == null) { - return null; // L: 28 + if (var1 == null) { // L: 28 + return null; } } while(var1.stream == null); // L: 29 return var1.stream; } - @ObfuscatedName("f") - protected int vmethod5476() { + @ObfuscatedName("l") + protected int vmethod5441() { return 0; // L: 34 } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); // L: 40 for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method5307(var6)) { // L: 42 + if (!this.superStream.method5273(var6)) { // L: 42 int var4 = var2; // L: 43 int var5 = var3; // L: 44 do { - if (var5 <= var6.field3256) { // L: 45 - this.method5470(var6, var1, var4, var5, var5 + var4); // L: 51 - var6.field3256 -= var5; // L: 52 + if (var5 <= var6.field3255) { // L: 45 + this.method5443(var6, var1, var4, var5, var4 + var5); // L: 51 + var6.field3255 -= var5; // L: 52 break; } - this.method5470(var6, var1, var4, var6.field3256, var5 + var4); // L: 46 - var4 += var6.field3256; // L: 47 - var5 -= var6.field3256; // L: 48 - } while(!this.superStream.method5396(var6, var1, var4, var5)); // L: 49 + this.method5443(var6, var1, var4, var6.field3255, var5 + var4); // L: 46 + var4 += var6.field3255; // L: 47 + var5 -= var6.field3255; // L: 48 + } while(!this.superStream.method5311(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); // L: 58 for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 - if (!this.superStream.method5307(var3)) { // L: 60 + if (!this.superStream.method5273(var3)) { // L: 60 int var2 = var1; // L: 61 do { - if (var2 <= var3.field3256) { // L: 62 - this.method5471(var3, var2); // L: 67 - var3.field3256 -= var2; // L: 68 + if (var2 <= var3.field3255) { // L: 62 + this.method5442(var3, var2); // L: 67 + var3.field3255 -= var2; // L: 68 break; } - this.method5471(var3, var3.field3256); // L: 63 - var2 -= var3.field3256; // L: 64 - } while(!this.superStream.method5396(var3, (int[])null, 0, var2)); // L: 65 + this.method5442(var3, var3.field3255); // L: 63 + var2 -= var3.field3255; // L: 64 + } while(!this.superStream.method5311(var3, (int[])null, 0, var2)); // L: 65 } } } // L: 70 - @ObfuscatedName("at") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "96" + descriptor = "([Lls;II)Lls;", + garbageValue = "-1189056832" ) - static int method5485(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2710 - if (class134.guestClanSettings != null) { // L: 2711 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2712 - class129.field1535 = class134.guestClanSettings; // L: 2713 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2715 - } + @Export("findEnumerated") + public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { + MouseWheel[] var2 = var0; // L: 17 - return 1; // L: 2716 - } else { - int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2718 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2719 - if (Client.currentClanSettings[var3] != null) { // L: 2720 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2721 - class129.field1535 = Client.currentClanSettings[var3]; // L: 2722 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2724 - } - - return 1; // L: 2725 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2727 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class129.field1535.name; // L: 2728 - return 1; // L: 2729 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2731 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.allowGuests ? 1 : 0; // L: 2732 - return 1; // L: 2733 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2735 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1602; // L: 2736 - return 1; // L: 2737 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2739 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1603; // L: 2740 - return 1; // L: 2741 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2743 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1604; // L: 2744 - return 1; // L: 2745 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2747 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1613; // L: 2748 - return 1; // L: 2749 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2751 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.memberCount; // L: 2752 - return 1; // L: 2753 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2755 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2756 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class129.field1535.memberNames[var3]; // L: 2757 - return 1; // L: 2758 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2760 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2761 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.memberRanks[var3]; // L: 2762 - return 1; // L: 2763 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2765 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.bannedMemberCount; // L: 2766 - return 1; // L: 2767 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2769 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2770 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class129.field1535.bannedMemberNames[var3]; // L: 2771 - return 1; // L: 2772 - } else { - int var5; - int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2774 - class295.Interpreter_intStackSize -= 3; // L: 2775 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2776 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2777 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2778 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.method2915(var3, var6, var5); // L: 2779 - return 1; // L: 2780 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2782 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.currentOwner; // L: 2783 - return 1; // L: 2784 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2786 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1614; // L: 2787 - return 1; // L: 2788 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2790 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.method2979(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 2791 - return 1; // L: 2792 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2794 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = class129.field1535.getSortedMembers()[Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]]; // L: 2795 - return 1; // L: 2796 - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2798 - class295.Interpreter_intStackSize -= 2; // L: 2799 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2800 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2801 - UrlRequest.method2555(var6, var3); // L: 2802 - return 1; // L: 2803 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2805 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2806 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1611[var3]; // L: 2807 - return 1; // L: 2808 - } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2810 - class295.Interpreter_intStackSize -= 3; // L: 2811 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2812 - boolean var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 2813 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2814 - class147.method3051(var5, var3, var4); // L: 2815 - } - - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2817 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2818 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1600[var3] ? 1 : 0; // L: 2819 - return 1; // L: 2820 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2822 - if (class83.guestClanChannel != null) { // L: 2823 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2824 - UrlRequest.field1344 = class83.guestClanChannel; // L: 2825 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2827 - } - - return 1; // L: 2828 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2830 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2831 - if (Client.currentClanChannels[var3] != null) { // L: 2832 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2833 - UrlRequest.field1344 = Client.currentClanChannels[var3]; // L: 2834 - class307.field3588 = var3; // L: 2835 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2837 - } - - return 1; // L: 2838 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2840 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = UrlRequest.field1344.name; // L: 2841 - return 1; // L: 2842 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2844 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.field1669; // L: 2845 - return 1; // L: 2846 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2848 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.field1666; // L: 2849 - return 1; // L: 2850 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2852 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.method3056(); // L: 2853 - return 1; // L: 2854 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2856 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2857 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ((ClanChannelMember)UrlRequest.field1344.members.get(var3)).username.getName(); // L: 2858 - return 1; // L: 2859 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2861 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2862 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((ClanChannelMember)UrlRequest.field1344.members.get(var3)).rank; // L: 2863 - return 1; // L: 2864 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2866 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2867 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((ClanChannelMember)UrlRequest.field1344.members.get(var3)).world; // L: 2868 - return 1; // L: 2869 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2871 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2872 - class19.method307(class307.field3588, var3); // L: 2873 - return 1; // L: 2874 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2876 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.method3057(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 2877 - return 1; // L: 2878 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2880 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.getSortedMembers()[Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]]; // L: 2881 - return 1; // L: 2882 - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2884 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = GameEngine.field205 != null ? 1 : 0; // L: 2885 - return 1; // L: 2886 - } else { - return 2; // L: 2888 - } - } + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + MouseWheel var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } } + + return null; // L: 25 + } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(B)J", + garbageValue = "-100" + ) + static long method5456() { + return Client.field623; // L: 2963 } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 51be46f436..ef762c6c08 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("ju") @Implements("MusicTrack") public class MusicTrack extends Node { @ObfuscatedName("v") @@ -12,12 +12,12 @@ public class MusicTrack extends Node { ) @Export("table") NodeHashTable table; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("o") - void method5489() { + @ObfuscatedName("c") + void method5463() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -416,7 +416,7 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("clear") void clear() { this.table = null; // L: 334 @@ -424,10 +424,10 @@ public class MusicTrack extends Node { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;II)Ljs;" + descriptor = "(Lln;II)Lju;" ) @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); // L: 16 return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 6c912dc0f7..d647c267d6 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,22 +1,15 @@ -import java.io.IOException; -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cx") +@ObfuscatedName("cy") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("oy") - @ObfuscatedGetter( - intValue = -1198609277 - ) - static int field1253; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lft;" ) @Export("definition") NPCComposition definition; @@ -26,10 +19,10 @@ public final class NPC extends Actor { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILgv;I)V", - garbageValue = "-1208741979" + descriptor = "(ILgm;I)V", + garbageValue = "-1427084845" ) - final void method2357(int var1, class193 var2) { + final void method2347(int var1, class193 var2) { int var3 = super.pathX[0]; // L: 15 int var4 = super.pathY[0]; // L: 16 if (var1 == 0) { // L: 17 @@ -68,7 +61,7 @@ public final class NPC extends Actor { --var4; // L: 35 } - if (super.sequence != -1 && ItemContainer.SequenceDefinition_get(super.sequence).field2171 == 1) { // L: 37 + if (super.sequence != -1 && class163.SequenceDefinition_get(super.sequence).field2158 == 1) { // L: 37 super.sequence = -1; } @@ -76,9 +69,9 @@ public final class NPC extends Actor { ++super.pathLength; } - for (int var5 = super.pathLength; var5 > 0; --var5) { - super.pathX[var5] = super.pathX[var5 - 1]; - super.pathY[var5] = super.pathY[var5 - 1]; + for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 + super.pathX[var5] = super.pathX[var5 - 1]; // L: 40 + super.pathY[var5] = super.pathY[var5 - 1]; // L: 41 super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 } @@ -87,18 +80,18 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; // L: 46 } // L: 47 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" + descriptor = "(B)Liq;", + garbageValue = "103" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { // L: 77 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ItemContainer.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null) ? ItemContainer.SequenceDefinition_get(super.movementSequence) : null; // L: 79 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class163.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? class163.SequenceDefinition_get(super.movementSequence) : null; // L: 79 Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 if (var3 == null) { // L: 81 return null; @@ -106,7 +99,7 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); // L: 82 super.defaultHeight = var3.height; // L: 83 if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = class6.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + Model var4 = ClientPreferences.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 if (var4 != null) { // L: 86 var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 87 Model[] var5 = new Model[]{var3, var4}; // L: 88 @@ -118,11 +111,11 @@ public final class NPC extends Actor { var3.isSingleTile = true; } - if (super.field1189 != 0 && Client.cycle >= super.field1133 && Client.cycle < super.field1185) { // L: 93 - var3.overrideHue = super.field1146; // L: 94 - var3.overrideSaturation = super.field1187; // L: 95 - var3.overrideLuminance = super.field1188; // L: 96 - var3.overrideAmount = super.field1189; // L: 97 + if (super.field1122 != 0 && Client.cycle >= super.field1167 && Client.cycle < super.field1168) { // L: 93 + var3.overrideHue = super.field1169; // L: 94 + var3.overrideSaturation = super.field1114; // L: 95 + var3.overrideLuminance = super.field1171; // L: 96 + var3.overrideAmount = super.field1122; // L: 97 } else { var3.overrideAmount = 0; // L: 100 } @@ -132,13 +125,13 @@ public final class NPC extends Actor { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1745876062" + garbageValue = "646080626" ) - final void method2353(int var1, int var2, boolean var3) { - if (super.sequence != -1 && ItemContainer.SequenceDefinition_get(super.sequence).field2171 == 1) { // L: 50 + final void method2348(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class163.SequenceDefinition_get(super.sequence).field2158 == 1) { // L: 50 super.sequence = -1; } @@ -158,263 +151,82 @@ public final class NPC extends Actor { super.pathX[0] = var1; // L: 61 super.pathY[0] = var2; // L: 62 - super.pathTraversed[0] = class193.field2193; // L: 63 - return; // L: 64 + super.pathTraversed[0] = class193.field2185; // L: 63 + return; } } - super.pathLength = 0; // L: 67 - super.field1134 = 0; // L: 68 - super.field1197 = 0; // L: 69 - super.pathX[0] = var1; // L: 70 - super.pathY[0] = var2; // L: 71 - super.x = super.field1145 * 64 + super.pathX[0] * 128; // L: 72 - super.y = super.field1145 * 64 + super.pathY[0] * 128; // L: 73 - } // L: 74 + super.pathLength = 0; + super.field1170 = 0; + super.field1179 = 0; + super.pathX[0] = var1; + super.pathY[0] = var2; + super.x = super.pathX[0] * 128 + super.field1150 * 64; + super.y = super.pathY[0] * 128 + super.field1150 * 64; + } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-450224469" + garbageValue = "-323504433" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 106 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-22" + descriptor = "(B)V", + garbageValue = "20" ) - public static void method2366(boolean var0) { - if (NetCache.NetCache_socket != null) { // L: 193 - try { - Buffer var1 = new Buffer(4); // L: 195 - var1.writeByte(var0 ? 2 : 3); // L: 196 - var1.writeMedium(0); // L: 197 - NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 198 - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); // L: 202 - } catch (Exception var3) { // L: 204 + static void method2360() { + Tiles.Tiles_underlays = null; // L: 64 + class14.Tiles_overlays = null; // L: 65 + class147.Tiles_shapes = null; // L: 66 + Tiles.field983 = null; // L: 67 + class420.field4545 = null; // L: 68 + class392.field4374 = null; // L: 69 + Tiles.field998 = null; // L: 70 + BufferedNetSocket.Tiles_hue = null; // L: 71 + class116.Tiles_saturation = null; // L: 72 + Tiles.Tiles_lightness = null; // L: 73 + class357.Tiles_hueMultiplier = null; // L: 74 + class361.field4213 = null; // L: 75 + } // L: 76 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-1163810213" + ) + static int method2361(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1248 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var3)); // L: 1250 + return 1; // L: 1251 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260 + if (var3.dataText == null) { // L: 1261 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262 } - ++NetCache.NetCache_ioExceptions; // L: 205 - NetCache.NetCache_socket = null; // L: 206 - } - - } - } // L: 208 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-1976233431" - ) - static SecureRandom method2364() { - SecureRandom var0 = new SecureRandom(); // L: 39 - var0.nextInt(); // L: 40 - return var0; // L: 41 - } - - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1011545908" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 4074 - class144.method3014(); // L: 4075 - VertexNormal.method4498(); // L: 4076 - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4078 - class166.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4079 - } - - ItemContainer.addNpcsToScene(true); // L: 4082 - ItemComposition.method3751(); // L: 4083 - ItemContainer.addNpcsToScene(false); // L: 4084 - - int var6; - for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4086 4087 4104 - if (var4.plane == class160.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4088 - if (Client.cycle >= var4.cycleStart) { // L: 4089 - if (var4.targetIndex > 0) { // L: 4090 - NPC var18 = Client.npcs[var4.targetIndex - 1]; // L: 4091 - if (var18 != null && var18.x >= 0 && var18.x < 13312 && var18.y >= 0 && var18.y < 13312) { // L: 4092 - var4.setDestination(var18.x, var18.y, Archive.getTileHeight(var18.x, var18.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - if (var4.targetIndex < 0) { // L: 4094 - var6 = -var4.targetIndex - 1; // L: 4096 - Player var20; - if (var6 == Client.localPlayerIndex) { // L: 4097 - var20 = class19.localPlayer; - } else { - var20 = Client.players[var6]; // L: 4098 - } - - if (var20 != null && var20.x >= 0 && var20.x < 13312 && var20.y >= 0 && var20.y < 13312) { // L: 4099 - var4.setDestination(var20.x, var20.y, Archive.getTileHeight(var20.x, var20.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - var4.advance(Client.field550); // L: 4101 - FriendSystem.scene.drawEntity(class160.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4102 - } + return 1; // L: 1263 } else { - var4.remove(); + return 2; // L: 1265 } - } - - class160.method3238(); // L: 4107 - Language.setViewportShape(var0, var1, var2, var3, true); // L: 4108 - var0 = Client.viewportOffsetX; // L: 4109 - var1 = Client.viewportOffsetY; // L: 4110 - var2 = Client.viewportWidth; // L: 4111 - var3 = Client.viewportHeight; // L: 4112 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4113 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4114 - int var17 = Client.camAngleX; // L: 4115 - if (Client.field756 / 256 > var17) { // L: 4116 - var17 = Client.field756 / 256; - } - - if (Client.field740[4] && Client.field549[4] + 128 > var17) { // L: 4117 - var17 = Client.field549[4] + 128; - } - - int var5 = Client.camAngleY & 2047; // L: 4118 - class20.method324(Messages.oculusOrbFocalPointX, FloorOverlayDefinition.field2136, class115.oculusOrbFocalPointY, var17, var5, DevicePcmPlayerProvider.method385(var17), var3); // L: 4119 - if (!Client.isCameraLocked) { // L: 4121 - var6 = RouteStrategy.method3869(); } else { - var6 = GrandExchangeOfferOwnWorldComparator.method1133(); // L: 4122 - } - - int var7 = EnumComposition.cameraX; // L: 4123 - int var8 = FriendSystem.cameraY; // L: 4124 - int var9 = CollisionMap.cameraZ; // L: 4125 - int var10 = Language.cameraPitch; // L: 4126 - int var11 = MusicPatchNode2.cameraYaw; // L: 4127 - - int var12; - int var13; - for (var12 = 0; var12 < 5; ++var12) { // L: 4128 - if (Client.field740[var12]) { // L: 4129 - var13 = (int)(Math.random() * (double)(Client.field482[var12] * 2 + 1) - (double)Client.field482[var12] + Math.sin((double)Client.field766[var12] / 100.0D * (double)Client.field744[var12]) * (double)Client.field549[var12]); // L: 4130 - if (var12 == 0) { // L: 4131 - EnumComposition.cameraX += var13; - } - - if (var12 == 1) { // L: 4132 - FriendSystem.cameraY += var13; - } - - if (var12 == 2) { // L: 4133 - CollisionMap.cameraZ += var13; - } - - if (var12 == 3) { // L: 4134 - MusicPatchNode2.cameraYaw = var13 + MusicPatchNode2.cameraYaw & 2047; - } - - if (var12 == 4) { // L: 4135 - Language.cameraPitch += var13; // L: 4136 - if (Language.cameraPitch < 128) { // L: 4137 - Language.cameraPitch = 128; - } - - if (Language.cameraPitch > 383) { // L: 4138 - Language.cameraPitch = 383; - } - } + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1254 + --var4; // L: 1255 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; } + + return 1; // L: 1258 } - - var12 = MouseHandler.MouseHandler_x; // L: 4142 - var13 = MouseHandler.MouseHandler_y; // L: 4143 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4144 - var12 = MouseHandler.MouseHandler_lastPressedX; // L: 4145 - var13 = MouseHandler.MouseHandler_lastPressedY; // L: 4146 - } - - int var14; - int var15; - if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 4148 - var14 = var12 - var0; // L: 4149 - var15 = var13 - var1; // L: 4150 - ViewportMouse.ViewportMouse_x = var14; // L: 4152 - ViewportMouse.ViewportMouse_y = var15; // L: 4153 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 4154 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 4155 - ViewportMouse.ViewportMouse_false0 = false; // L: 4156 - } else { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 4161 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 4162 - } - - MouseHandler.playPcmPlayers(); // L: 4165 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4166 - MouseHandler.playPcmPlayers(); // L: 4167 - var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 4168 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4169 - FriendSystem.scene.draw(EnumComposition.cameraX, FriendSystem.cameraY, CollisionMap.cameraZ, Language.cameraPitch, MusicPatchNode2.cameraYaw, var6); // L: 4170 - Rasterizer3D.Rasterizer3D_zoom = var14; // L: 4171 - MouseHandler.playPcmPlayers(); // L: 4172 - FriendSystem.scene.clearTempGameObjects(); // L: 4173 - InterfaceParent.method2100(var0, var1, var2, var3); // L: 4174 - if (Client.hintArrowType == 2) { // L: 4176 - class10.worldToScreen((Client.hintArrowX - ApproximateRouteStrategy.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class250.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4177 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4178 - VarpDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field550); // L: 4180 - Client.field603 = 0; // L: 4183 - var15 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 4184 - int var16 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 4185 - if (var15 >= 3053 && var15 <= 3156 && var16 >= 3056 && var16 <= 3136) { // L: 4186 - Client.field603 = 1; - } - - if (var15 >= 3072 && var15 <= 3118 && var16 >= 9492 && var16 <= 9535) { // L: 4187 - Client.field603 = 1; - } - - if (Client.field603 == 1 && var15 >= 3139 && var15 <= 3199 && var16 >= 3008 && var16 <= 3062) { // L: 4188 - Client.field603 = 0; - } - - EnumComposition.cameraX = var7; // L: 4191 - FriendSystem.cameraY = var8; // L: 4192 - CollisionMap.cameraZ = var9; // L: 4193 - Language.cameraPitch = var10; // L: 4194 - MusicPatchNode2.cameraYaw = var11; // L: 4195 - if (Client.isLoading) { // L: 4196 - byte var19 = 0; // L: 4199 - var16 = var19 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 4200 - if (var16 == 0) { // L: 4204 - Client.isLoading = false; - } - } - - if (Client.isLoading) { // L: 4206 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4207 - class119.drawLoadingMessage("Loading - please wait.", false); // L: 4208 - } - - } // L: 4210 - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1005562855" - ) - static final String method2367(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10270 10271 } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index cf1c43dc89..0622ee22ed 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -4,187 +4,185 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("ft") @Implements("NPCComposition") public class NPCComposition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("NpcDefinition_archive") static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("NpcDefinition_modelArchive") static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("g") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("fx") - static int[] field1918; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2143016853 + intValue = 1249839807 ) @Export("id") public int id; @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1363241301 + intValue = 53350769 ) @Export("size") public int size; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("models") int[] models; - @ObfuscatedName("u") - int[] field1941; - @ObfuscatedName("r") + @ObfuscatedName("q") + int[] field1900; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -174401589 + intValue = 1838894863 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1489915603 + intValue = -360120719 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1943936215 + intValue = -1182294529 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -15491073 + intValue = -1120334565 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 159519197 + intValue = -1091660001 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 238467661 + intValue = -1992227181 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -49692117 + intValue = -1710177657 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("actions") public String[] actions; @ObfuscatedName("y") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2021557183 + intValue = -867920465 ) @Export("combatLevel") public int combatLevel; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -674598947 + intValue = -1011803827 ) @Export("widthScale") int widthScale; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2097500577 + intValue = -2073300725 ) @Export("heightScale") int heightScale; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 2003503301 + intValue = 1984476119 ) @Export("ambient") int ambient; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1146245031 + intValue = 1324751059 ) @Export("contrast") int contrast; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1820418945 + intValue = -247585293 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -934703889 + intValue = -1502698673 ) @Export("rotation") public int rotation; - @ObfuscatedName("at") + @ObfuscatedName("ak") @Export("transforms") public int[] transforms; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1879234601 + intValue = -1082735029 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1792687465 + intValue = 322255095 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("ab") + @ObfuscatedName("av") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("params") IterableNodeHashTable params; @@ -217,23 +215,23 @@ public class NPCComposition extends DualNode { this.transformVarbit = -1; // L: 47 this.transformVarp = -1; // L: 48 this.isInteractable = true; // L: 49 - this.isClickable = true; // L: 50 - this.isFollower = false; // L: 51 - } // L: 54 + this.isClickable = true; + this.isFollower = false; + } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "8806" + descriptor = "(B)V", + garbageValue = "-46" ) @Export("postDecode") void postDecode() { } // L: 73 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "26" + descriptor = "(Lpi;B)V", + garbageValue = "-28" ) @Export("decode") void decode(Buffer var1) { @@ -247,16 +245,16 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "345201372" + descriptor = "(Lpi;II)V", + garbageValue = "-109994635" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { + if (var2 == 1) { // L: 84 var3 = var1.readUnsignedByte(); // L: 85 this.models = new int[var3]; // L: 86 @@ -307,10 +305,10 @@ public class NPCComposition extends DualNode { } } else if (var2 == 60) { // L: 126 var3 = var1.readUnsignedByte(); // L: 127 - this.field1941 = new int[var3]; // L: 128 + this.field1900 = new int[var3]; // L: 128 for (var4 = 0; var4 < var3; ++var4) { // L: 129 - this.field1941[var4] = var1.readUnsignedShort(); + this.field1900[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { // L: 131 this.drawMapDot = false; @@ -338,12 +336,12 @@ public class NPCComposition extends DualNode { } else if (var2 == 111) { // L: 160 this.isFollower = true; } else if (var2 == 249) { // L: 161 - this.params = NetFileRequest.readStringIntParameters(var1, this.params); + this.params = class214.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 141 - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; // L: 142 + if (this.transformVarbit == 65535) { // L: 142 + this.transformVarbit = -1; } this.transformVarp = var1.readUnsignedShort(); // L: 143 @@ -376,8 +374,8 @@ public class NPCComposition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lgg;ILgg;II)Lhx;", - garbageValue = "-1552465915" + descriptor = "(Lgw;ILgw;II)Liq;", + garbageValue = "1025368138" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -425,12 +423,12 @@ public class NPCComposition extends DualNode { } } - var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - NpcDefinition_cachedModels.put(var5, (long)this.id); + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192 } Model var11; - if (var1 != null && var3 != null) { + if (var1 != null && var3 != null) { // L: 195 var11 = var1.applyTransformations(var5, var2, var3, var4); } else if (var1 != null) { // L: 196 var11 = var1.transformActorModel(var5, var2); @@ -448,23 +446,23 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lgt;", - garbageValue = "-1424786403" + descriptor = "(I)Lhc;", + garbageValue = "-2018540961" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { // L: 204 NPCComposition var7 = this.transform(); // L: 205 return var7 == null ? null : var7.getModelData(); // L: 206 207 - } else if (this.field1941 == null) { // L: 209 + } else if (this.field1900 == null) { // L: 209 return null; } else { boolean var1 = false; // L: 210 - for (int var2 = 0; var2 < this.field1941.length; ++var2) { // L: 211 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1941[var2], 0)) { + for (int var2 = 0; var2 < this.field1900.length; ++var2) { // L: 211 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1900[var2], 0)) { var1 = true; } } @@ -472,10 +470,10 @@ public class NPCComposition extends DualNode { if (var1) { // L: 212 return null; } else { - ModelData[] var5 = new ModelData[this.field1941.length]; // L: 213 + ModelData[] var5 = new ModelData[this.field1900.length]; // L: 213 - for (int var3 = 0; var3 < this.field1941.length; ++var3) { // L: 214 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1941[var3], 0); + for (int var3 = 0; var3 < this.field1900.length; ++var3) { // L: 214 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1900[var3], 0); } ModelData var6; @@ -503,16 +501,16 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lfj;", - garbageValue = "1331074811" + descriptor = "(I)Lft;", + garbageValue = "-1663507633" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; // L: 232 if (this.transformVarbit != -1) { // L: 233 - var1 = WorldMapRegion.getVarbit(this.transformVarbit); + var1 = SecureRandomCallable.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 234 var1 = Varps.Varps_main[this.transformVarp]; } @@ -524,13 +522,13 @@ public class NPCComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class9.getNpcDefinition(var2) : null; // L: 238 239 + return var2 != -1 ? KeyHandler.getNpcDefinition(var2) : null; // L: 238 239 } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-5" + descriptor = "(I)Z", + garbageValue = "155918530" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -539,7 +537,7 @@ public class NPCComposition extends DualNode { } else { int var1 = -1; // L: 244 if (this.transformVarbit != -1) { // L: 245 - var1 = WorldMapRegion.getVarbit(this.transformVarbit); + var1 = SecureRandomCallable.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 246 var1 = Varps.Varps_main[this.transformVarp]; } @@ -552,193 +550,73 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1070953519" + descriptor = "(IIS)I", + garbageValue = "17259" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return ClanSettings.method2976(this.params, var1, var2); // L: 252 + IterableNodeHashTable var4 = this.params; // L: 253 + int var3; + if (var4 == null) { // L: 255 + var3 = var2; // L: 256 + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 259 + if (var5 == null) { // L: 260 + var3 = var2; // L: 261 + } else { + var3 = var5.integer; // L: 264 + } + } + + return var3; // L: 266 } - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-777122666" + garbageValue = "943206349" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class19.method315(this.params, var1, var2); // L: 256 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lpy;I)I", - garbageValue = "1149580844" - ) - static int method3491(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 189 - int var2; - if (var1 == 0) { // L: 191 - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); // L: 192 - } else if (var1 == 2) { // L: 193 - var2 = var0.readBits(8); + IterableNodeHashTable var4 = this.params; // L: 271 + String var3; + if (var4 == null) { // L: 273 + var3 = var2; // L: 274 } else { - var2 = var0.readBits(11); // L: 194 - } - - return var2; // L: 195 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Llq;Ljava/lang/String;Ljava/lang/String;I)Lqx;", - garbageValue = "342414454" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 82 - int var4 = var0.getFileId(var3, var2); // L: 83 - return class16.method218(var0, var3, var4); // L: 84 - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(Lcx;IIII)V", - garbageValue = "527518202" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; // L: 9391 - if (Client.menuOptionsCount < 400) { // L: 9392 - if (var4.transforms != null) { // L: 9393 - var4 = var4.transform(); - } - - if (var4 != null) { // L: 9394 - if (var4.isInteractable) { // L: 9395 - if (!var4.isFollower || Client.followerIndex == var1) { // L: 9396 - String var5 = var4.name; // L: 9397 - int var6; - int var9; - if (var4.combatLevel != 0 && var0.field1161 != 0) { // L: 9398 - var6 = var0.field1161 != -1 ? var0.field1161 * -1966879477 * -544172381 : var4.combatLevel * -2021557183 * -620194879; // L: 9399 - var9 = class19.localPlayer.combatLevel; // L: 9402 - int var10 = var9 - var6; // L: 9404 - String var8; - if (var10 < -9) { // L: 9405 - var8 = ChatChannel.colorStartTag(16711680); // L: 9406 - } else if (var10 < -6) { // L: 9409 - var8 = ChatChannel.colorStartTag(16723968); // L: 9410 - } else if (var10 < -3) { // L: 9413 - var8 = ChatChannel.colorStartTag(16740352); // L: 9414 - } else if (var10 < 0) { // L: 9417 - var8 = ChatChannel.colorStartTag(16756736); // L: 9418 - } else if (var10 > 9) { // L: 9421 - var8 = ChatChannel.colorStartTag(65280); // L: 9422 - } else if (var10 > 6) { // L: 9425 - var8 = ChatChannel.colorStartTag(4259584); // L: 9426 - } else if (var10 > 3) { // L: 9429 - var8 = ChatChannel.colorStartTag(8453888); // L: 9430 - } else if (var10 > 0) { // L: 9433 - var8 = ChatChannel.colorStartTag(12648192); // L: 9434 - } else { - var8 = ChatChannel.colorStartTag(16776960); // L: 9437 - } - - var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 9439 - } - - if (var4.isFollower && Client.followerOpsLowPriority) { // L: 9441 - SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9442 - } - - if (Client.isItemSelected == 1) { // L: 9445 - SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 9446 - } else if (Client.isSpellSelected) { // L: 9449 - if ((class154.selectedSpellFlags & 2) == 2) { // L: 9450 - SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 9451 - } - } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9456 - String[] var7 = var4.actions; // L: 9457 - int var11; - if (var7 != null) { // L: 9458 - for (var11 = 4; var11 >= 0; --var11) { // L: 9459 - if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 9460 - var9 = 0; // L: 9461 - if (var11 == 0) { // L: 9462 - var9 = var6 + 9; - } - - if (var11 == 1) { // L: 9463 - var9 = var6 + 10; - } - - if (var11 == 2) { // L: 9464 - var9 = var6 + 11; - } - - if (var11 == 3) { // L: 9465 - var9 = var6 + 12; - } - - if (var11 == 4) { // L: 9466 - var9 = var6 + 13; - } - - SecureRandomFuture.insertMenuItemNoShift(var7[var11], ChatChannel.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9467 - } - } - } - - if (var7 != null) { // L: 9472 - for (var11 = 4; var11 >= 0; --var11) { // L: 9473 - if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 9474 - short var12 = 0; // L: 9475 - if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9476 - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var4.combatLevel > class19.localPlayer.combatLevel) { // L: 9477 - var12 = 2000; // L: 9478 - } - - var9 = 0; // L: 9480 - if (var11 == 0) { // L: 9481 - var9 = var12 + 9; - } - - if (var11 == 1) { // L: 9482 - var9 = var12 + 10; - } - - if (var11 == 2) { // L: 9483 - var9 = var12 + 11; - } - - if (var11 == 3) { // L: 9484 - var9 = var12 + 12; - } - - if (var11 == 4) { // L: 9485 - var9 = var12 + 13; - } - - SecureRandomFuture.insertMenuItemNoShift(var7[var11], ChatChannel.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9486 - } - } - } - } - - if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 9491 - SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9492 - } - } - - } - } + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 277 + if (var5 == null) { // L: 278 + var3 = var2; // L: 279 + } else { + var3 = (String)var5.obj; // L: 282 } } - } // L: 9496 + + return var3; // L: 284 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILln;IIIZB)V", + garbageValue = "-11" + ) + public static void method3530(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class273.musicPlayerStatus = 1; // L: 50 + class273.musicTrackArchive = var1; // L: 51 + AccessFile.musicTrackGroupId = var2; // L: 52 + class273.musicTrackFileId = var3; // L: 53 + class273.musicTrackVolume = var4; // L: 54 + class17.musicTrackBoolean = var5; // L: 55 + class273.pcmSampleLength = var0; // L: 56 + } // L: 57 + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-43" + ) + static boolean method3531() { + return (Client.drawPlayerNames & 4) != 0; // L: 4849 + } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index ebfabeb9fb..a1daad9ba7 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("ey") @Implements("NanoClock") public class NanoClock extends Clock { @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 5608793746955803797L + longValue = -4737457990311632419L ) @Export("lastTimeNano") long lastTimeNano; - NanoClock() { + public NanoClock() { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "947451014" + garbageValue = "1350330504" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-932830121" + garbageValue = "2026134141" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = (long)var2 * 1000000L; // L: 18 + long var3 = 1000000L * (long)var2; // L: 18 long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 if (var5 < var3) { // L: 20 var5 = var3; } - GrandExchangeOfferTotalQuantityComparator.method6007(var5 / 1000000L); // L: 21 + class93.method2384(var5 / 1000000L); // L: 21 long var7 = System.nanoTime(); // L: 22 int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { // L: 23 24 26 + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 ++var9; // L: 25 } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 7dbb505f09..102d84566e 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,42 +1,40 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import java.util.zip.CRC32; 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("lx") +@ObfuscatedName("lz") @Implements("NetCache") public class NetCache { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lny;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -218484267 + intValue = 875893217 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 2715459608811227853L + longValue = -7945689886712382461L ) - public static long field3976; - @ObfuscatedName("g") + public static long field3982; + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Lpo;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1619207221 + intValue = 1056584685 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; @@ -46,79 +44,73 @@ public class NetCache { ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -447894711 + intValue = -275565499 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Lla;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Lpo;" ) @Export("NetCache_pendingWrites") public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 494273937 + intValue = -644606303 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "Lpo;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 988805017 + intValue = -183804397 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Llf;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -315371955 + intValue = -47257767 ) - public static int field3990; - @ObfuscatedName("a") + public static int field3995; + @ObfuscatedName("g") @Export("NetCache_crc") - static CRC32 NetCache_crc; - @ObfuscatedName("q") + public static CRC32 NetCache_crc; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Llu;" + descriptor = "[Llx;" ) @Export("NetCache_archives") - static Archive[] NetCache_archives; + public static Archive[] NetCache_archives; @ObfuscatedName("y") - public static byte field3999; - @ObfuscatedName("z") + public static byte field3998; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1125875511 + intValue = -1326084145 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1768770895 + intValue = -1735632963 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -135,65 +127,139 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3990 = 0; // L: 28 + field3995 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3999 = 0; // L: 33 + field3998 = 0; // L: 33 NetCache_crcMismatches = 0; // L: 34 NetCache_ioExceptions = 0; // L: 35 } - @ObfuscatedName("n") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "77" + descriptor = "(ILbd;ZI)I", + garbageValue = "-1081311758" ) - static void method5988() { - Messages.Messages_channels.clear(); // L: 50 - Messages.Messages_hashTable.clear(); // L: 51 - Messages.Messages_queue.clear(); // L: 52 - Messages.Messages_count = 0; // L: 53 - } // L: 54 + static int method5965(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3429 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = class19.ItemDefinition_get(var3).name; // L: 3430 + return 1; // L: 3431 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3433 + Interpreter.Interpreter_intStackSize -= 2; // L: 3434 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3435 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3436 + var5 = class19.ItemDefinition_get(var3); // L: 3437 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3439 + } - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "27" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; // L: 600 - if (PendingSpawn.garbageCollector == null || !PendingSpawn.garbageCollector.isValid()) { // L: 601 - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 603 + return 1; // L: 3440 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442 + Interpreter.Interpreter_intStackSize -= 2; // L: 3443 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3444 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3445 + var5 = class19.ItemDefinition_get(var3); // L: 3446 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3448 + } - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 604 - if (var2.isValid()) { // L: 606 - PendingSpawn.garbageCollector = var2; // L: 607 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 608 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 609 + return 1; // L: 3449 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3452 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).price; // L: 3453 + return 1; // L: 3454 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3457 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458 + return 1; // L: 3459 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3462 + var7 = class19.ItemDefinition_get(var3); // L: 3463 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3465 } - } - } catch (Throwable var11) { // L: 614 - } - } - if (PendingSpawn.garbageCollector != null) { // L: 616 - long var9 = WorldMapSprite.method4989(); // L: 617 - long var3 = PendingSpawn.garbageCollector.getCollectionTime(); // L: 618 - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 619 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 620 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 621 - if (var7 != 0L) { // L: 622 - var0 = (int)(100L * var5 / var7); + return 1; // L: 3466 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3469 + var7 = class19.ItemDefinition_get(var3); // L: 3470 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3472 + } + + return 1; // L: 3473 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3476 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477 + return 1; // L: 3478 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3481 + var7 = class19.ItemDefinition_get(var3); // L: 3482 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3484 + } + + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3488 + var7 = class19.ItemDefinition_get(var3); // L: 3489 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3491 + } + + return 1; // L: 3492 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494 + String var6 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3495 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3496 + class12.findItemDefinitions(var6, var4 == 1); // L: 3497 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Script.foundItemIdCount; // L: 3498 + return 1; // L: 3499 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506 + GameEngine.foundItemIndex = 0; // L: 3507 + return 1; // L: 3508 + } else if (var0 == 4213) { // L: 3510 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3511 + var4 = class19.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512 + if (var4 == -1) { // L: 3513 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; // L: 3514 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517 + } + + return 1; // L: 3519 + } else { + return 2; // L: 3521 + } + } else { + if (PendingSpawn.foundItemIds != null && GameEngine.foundItemIndex < Script.foundItemIdCount) { // L: 3502 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PendingSpawn.foundItemIds[++GameEngine.foundItemIndex - 1] & '\uffff'; // L: 3503 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3504 } } - - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 624 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 625 } - - return var0; // L: 627 } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 338033e6c3..9a66981a55 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,100 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("ly") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { + @ObfuscatedName("sd") + @ObfuscatedGetter( + intValue = -1408840155 + ) + static int field3960; + @ObfuscatedName("l") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llx;" ) @Export("archive") - Archive archive; - @ObfuscatedName("o") + public Archive archive; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 102733645 + intValue = 2115176963 ) @Export("crc") - int crc; - @ObfuscatedName("h") + public int crc; + @ObfuscatedName("i") @Export("padding") - byte padding; + public byte padding; NetFileRequest() { } // L: 10 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpd;Lpq;B)Lpq;", - garbageValue = "61" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { // L: 17 - var3 = Login.method1894(var2); // L: 18 - var1 = new IterableNodeHashTable(var3); // L: 19 - } - - for (var3 = 0; var3 < var2; ++var3) { // L: 21 - boolean var4 = var0.readUnsignedByte() == 1; // L: 22 - int var5 = var0.readMedium(); // L: 23 - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); // L: 26 - } - - var1.put((Node)var6, (long)var5); // L: 27 - } - - return var1; // L: 29 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;B)V", - garbageValue = "-69" - ) - public static void method5867(AbstractArchive var0) { - FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; // L: 24 - } // L: 25 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "59" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 143 - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(IIIILql;Lkw;I)V", - garbageValue = "874629723" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; // L: 11649 - if (var6 > 4225 && var6 < 90000) { // L: 11650 - int var7 = Client.camAngleY & 2047; // L: 11651 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11652 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11653 - int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11654 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11655 - double var12 = Math.atan2((double)var10, (double)var11); // L: 11656 - int var14 = var5.width / 2 - 25; // L: 11657 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11658 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11659 - byte var17 = 20; // L: 11660 - Huffman.redHintArrowSprite.method8238(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11661 - } else { - Messages.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11663 - } - - } // L: 11664 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ef2e56b9a1..0801986cdb 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,152 +9,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fd") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { + @ObfuscatedName("j") + @Export("userHomeDirectory") + static String userHomeDirectory; @ObfuscatedName("v") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("o") - @Export("socket") - Socket socket; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("g") + @ObfuscatedName("i") + @Export("socket") + Socket socket; + @ObfuscatedName("f") @Export("isClosed") boolean isClosed; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lff;" ) @Export("taskHandler") TaskHandler taskHandler; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfx;" ) @Export("task") Task task; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1965865583 + intValue = 1178030211 ) @Export("outLength") int outLength; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -401346385 + intValue = -831152753 ) @Export("outOffset") int outOffset; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -418935701 + intValue = 512219451 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1680142407 + intValue = 1168737827 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lfw;I)V" + descriptor = "(Ljava/net/Socket;Lff;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; // L: 16 this.outLength = 0; // L: 20 this.outOffset = 0; // L: 21 this.exceptionWriting = false; // L: 22 - this.taskHandler = var2; // L: 28 - this.socket = var1; // L: 29 + this.taskHandler = var2; + this.socket = var1; this.bufferLength = var3; // L: 30 - this.maxPacketLength = var3 - 100; // L: 31 - this.socket.setSoTimeout(30000); // L: 32 - this.socket.setTcpNoDelay(true); // L: 33 - this.socket.setReceiveBufferSize(65536); // L: 34 + this.maxPacketLength = var3 - 100; + this.socket.setSoTimeout(30000); + this.socket.setTcpNoDelay(true); + this.socket.setReceiveBufferSize(65536); this.socket.setSendBufferSize(65536); // L: 35 this.inputStream = this.socket.getInputStream(); // L: 36 this.outputStream = this.socket.getOutputStream(); // L: 37 - } // L: 38 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "105" + descriptor = "(S)V", + garbageValue = "-13138" ) @Export("close") public void close() { - if (!this.isClosed) { // L: 41 + if (!this.isClosed) { synchronized(this) { // L: 42 this.isClosed = true; // L: 43 - this.notifyAll(); // L: 44 - } + this.notifyAll(); + } // L: 45 - if (this.task != null) { - while (this.task.status == 0) { - GrandExchangeOfferTotalQuantityComparator.method6007(1L); + if (this.task != null) { // L: 46 + while (this.task.status == 0) { // L: 47 + class93.method2384(1L); // L: 48 } - if (this.task.status == 1) { + if (this.task.status == 1) { // L: 50 try { - ((Thread)this.task.result).join(); - } catch (InterruptedException var3) { + ((Thread)this.task.result).join(); // L: 52 + } catch (InterruptedException var3) { // L: 54 } } } - this.task = null; + this.task = null; // L: 57 } - } + } // L: 58 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1669312252" + garbageValue = "-891040314" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); + return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1264669351" + descriptor = "(B)I", + garbageValue = "46" ) @Export("available") public int available() throws IOException { - return this.isClosed ? 0 : this.inputStream.available(); + return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "396806768" + descriptor = "(IB)Z", + garbageValue = "27" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - if (this.isClosed) { + if (this.isClosed) { // L: 75 return false; } else { - return this.inputStream.available() >= var1; + return this.inputStream.available() >= var1; // L: 76 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "52142940" + descriptor = "([BIIB)I", + garbageValue = "-118" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -179,7 +182,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "2083273816" + garbageValue = "-1255813086" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -196,7 +199,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { for (int var5 = 0; var5 < var3; ++var5) { // L: 99 this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100 this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101 - if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 102 + if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102 throw new IOException(); // L: 103 } } @@ -211,19 +214,15 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 111 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-57" + descriptor = "([BIII)V", + garbageValue = "-1359342670" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); // L: 161 - } // L: 162 - - protected void finalize() { - this.close(); - } + this.write0(var1, var2, var3); // L: 160 + } // L: 161 public void run() { try { @@ -264,7 +263,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137 try { - if (this.outOffset == this.outLength) { // L: 139 + if (this.outLength == this.outOffset) { // L: 139 this.outputStream.flush(); } } catch (IOException var8) { // L: 141 @@ -292,95 +291,47 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { // L: 154 - class301.RunException_sendStackTrace((String)null, var12); // L: 155 + Widget.RunException_sendStackTrace((String)null, var12); // L: 155 } } // L: 157 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "682010792" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 45 + protected void finalize() { + this.close(); // L: 61 + } // L: 62 - for (int var6 = 0; var6 < var5; ++var6) { // L: 46 - char var7 = var0.charAt(var6 + var1); // L: 47 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 48 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 49 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 50 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 51 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 52 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 53 - 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) { // L: 58 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 59 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 60 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 61 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 62 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 63 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 64 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 65 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 66 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { // L: 67 - var3[var6 + var4] = -106; - } else if (var7 == 8212) { // L: 68 - var3[var6 + var4] = -105; - } else if (var7 == 732) { // L: 69 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 70 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 71 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 72 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 73 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 74 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 75 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 76 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1794283621" + ) + static final boolean method3309(char var0) { + if (Character.isISOControl(var0)) { // L: 28 + return false; + } else if (class131.isAlphaNumeric(var0)) { // L: 29 + return true; + } else { + char[] var1 = class422.field4560; // L: 31 + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { // L: 32 + var3 = var1[var2]; // L: 33 + if (var0 == var3) { // L: 34 + return true; + } } + + var1 = class422.field4563; // L: 38 + + for (var2 = 0; var2 < var1.length; ++var2) { // L: 39 + var3 = var1[var2]; // L: 40 + if (var0 == var3) { + return true; // L: 41 + } + } + + return false; // L: 44 } - - return var5; // L: 78 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1228266479" - ) - public static int method3271(int var0, int var1, int var2) { - int var3 = class260.method5203(var2 - var1 + 1); // L: 54 - var3 <<= var1; // L: 55 - var0 |= var3; // L: 56 - return var0; // L: 57 } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index a254d114d3..696c29625e 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("oz") +@ObfuscatedName("oq") @Implements("Node") public class Node { - @ObfuscatedName("gf") + @ObfuscatedName("gv") @Export("key") public long key; - @ObfuscatedName("ge") + @ObfuscatedName("gt") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("previous") public Node previous; - @ObfuscatedName("gv") + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("next") public Node next; - @ObfuscatedName("ft") + @ObfuscatedName("fg") @Export("remove") public void remove() { if (this.next != null) { // L: 9 @@ -33,7 +33,7 @@ public class Node { } } // L: 14 - @ObfuscatedName("fo") + @ObfuscatedName("fh") @Export("hasNext") public boolean hasNext() { return this.next != null; // L: 17 diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 1e464ee7f6..13583ccb61 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("le") +@ObfuscatedName("ld") @Implements("NodeDeque") public class NodeDeque { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("current") Node current; @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("removeLast") public Node removeLast() { @@ -88,7 +88,7 @@ public class NodeDeque { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Loz;Loz;)V" + descriptor = "(Loq;Loq;)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 0d910b6543..68dca9a802 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -9,25 +9,25 @@ public final class NodeHashTable { @ObfuscatedName("v") @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Loq;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("current") Node current; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("index") int index; @@ -46,7 +46,7 @@ public final class NodeHashTable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Loz;" + descriptor = "(J)Loq;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Loz;J)V" + descriptor = "(Loq;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); // L: 49 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java b/runescape-client/src/main/java/OAuthApi.java similarity index 78% rename from runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java rename to runescape-client/src/main/java/OAuthApi.java index 3c069565d9..8bca2cb8e0 100644 --- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java +++ b/runescape-client/src/main/java/OAuthApi.java @@ -1,16 +1,16 @@ -package com.jagex.oldscape.pub; - import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @Implements("OAuthApi") +@ObfuscatedName("com/jagex/oldscape/pub/OAuthApi") public interface OAuthApi { boolean isOnLoginScreen(); + long getAccountHash(); + @ObfuscatedSignature( descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" ) void setOtlTokenRequester(OtlTokenRequester var1); - - long getAccountHash(); } diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index 0489b5d9eb..26278f321f 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -1,271 +1,274 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gj") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { + @ObfuscatedName("tp") + @ObfuscatedGetter( + intValue = -1270169191 + ) + static int field2065; @ObfuscatedName("v") @Export("ObjectDefinition_isLowDetail") - static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("o") + public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) - @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("g") + @Export("ObjectDefinition_modelsArchive") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cached") - public static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("l") + static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cachedEntities") - public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("d") + static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ObjectDefinition_cachedModels") - public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("f") + static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lgt;" + descriptor = "[Lhc;" ) - static ModelData[] field2037; - @ObfuscatedName("hh") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("u") + static ModelData[] field2020; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -605468299 + intValue = -1590595383 ) @Export("id") public int id; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("modelIds") int[] modelIds; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("models") int[] models; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("name") public String name; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1277935865 + intValue = -2085287383 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1376406543 + intValue = -876347031 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1253328745 + intValue = -1883412293 ) @Export("interactType") public int interactType; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -265750149 + intValue = -906830101 ) @Export("int1") public int int1; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 184787715 + intValue = -763814967 ) @Export("clipType") int clipType; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("nonFlatShading") boolean nonFlatShading; @ObfuscatedName("e") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -623651777 + intValue = -163974259 ) @Export("animationId") public int animationId; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -578931105 + intValue = 2136398039 ) @Export("int2") public int int2; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -880720415 + intValue = 1916202791 ) @Export("ambient") int ambient; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1121250523 + intValue = -726394467 ) @Export("contrast") int contrast; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("actions") public String[] actions; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 861745861 + intValue = 2034901073 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1711098507 + intValue = -297146651 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("clipped") public boolean clipped; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -247604621 + intValue = 1276797079 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("ab") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -125464421 + intValue = -64921 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 725900101 + intValue = -473772847 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1498839527 + intValue = -852003755 ) @Export("offsetX") int offsetX; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1774749369 + intValue = 232493773 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -692723345 + intValue = 1389514563 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("av") + @ObfuscatedName("ac") @Export("isSolid") boolean isSolid; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1207328659 + intValue = 1878888665 ) @Export("int3") public int int3; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("transforms") public int[] transforms; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -407024831 + intValue = -729176201 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1400380411 + intValue = -2043045051 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("al") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -694832985 + intValue = -1644497933 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1224750981 + intValue = -1328611557 ) @Export("int7") public int int7; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -235035991 + intValue = -171517787 ) @Export("int5") public int int5; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 954058149 + intValue = 398628539 ) @Export("int6") public int int6; - @ObfuscatedName("af") + @ObfuscatedName("az") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ap") + @ObfuscatedName("as") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("params") IterableNodeHashTable params; static { ObjectDefinition_isLowDetail = false; // L: 17 - ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); // L: 20 - ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 + ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); + ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field2037 = new ModelData[4]; + field2020 = new ModelData[4]; } ObjectComposition() { @@ -294,639 +297,678 @@ public class ObjectComposition extends DualNode { this.offsetHeight = 0; // L: 54 this.offsetY = 0; // L: 55 this.boolean2 = false; // L: 56 - this.isSolid = false; // L: 57 - this.int3 = -1; // L: 58 - this.transformVarbit = -1; // L: 60 + this.isSolid = false; + this.int3 = -1; + this.transformVarbit = -1; this.transformVarp = -1; // L: 61 - this.ambientSoundId = -1; // L: 62 - this.int7 = 0; // L: 63 + this.ambientSoundId = -1; + this.int7 = 0; this.int5 = 0; // L: 64 this.int6 = 0; // L: 65 this.boolean3 = true; // L: 67 } // L: 70 - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1555138180" + descriptor = "(B)V", + garbageValue = "2" ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { // L: 95 - this.int1 = 0; // L: 96 - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97 + if (this.int1 == -1) { // L: 89 + this.int1 = 0; // L: 90 + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 91 this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { // L: 98 + for (int var1 = 0; var1 < 5; ++var1) { // L: 92 if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { // L: 100 + if (this.int3 == -1) { // L: 94 this.int3 = this.interactType != 0 ? 1 : 0; } - } // L: 101 + } // L: 95 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1105127327" + descriptor = "(Lpi;I)V", + garbageValue = "-1801029007" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 105 - if (var2 == 0) { // L: 106 - return; // L: 109 + int var2 = var1.readUnsignedByte(); // L: 99 + if (var2 == 0) { // L: 100 + return; // L: 103 } - this.decodeNext(var1, var2); // L: 107 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "35843204" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - int var3; - int var4; - if (var2 == 1) { // L: 112 - var3 = var1.readUnsignedByte(); // L: 113 - if (var3 > 0) { // L: 114 - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115 - var1.offset += var3 * 3; // L: 123 - } else { - this.models = new int[var3]; // L: 116 - this.modelIds = new int[var3]; // L: 117 - - for (var4 = 0; var4 < var3; ++var4) { // L: 118 - this.modelIds[var4] = var1.readUnsignedShort(); // L: 119 - this.models[var4] = var1.readUnsignedByte(); // L: 120 - } - } - } - } else if (var2 == 2) { // L: 126 - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 5) { // L: 127 - var3 = var1.readUnsignedByte(); // L: 128 - if (var3 > 0) { // L: 129 - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130 - var1.offset += 2 * var3; // L: 135 - } else { - this.models = null; // L: 131 - this.modelIds = new int[var3]; // L: 132 - - for (var4 = 0; var4 < var3; ++var4) { // L: 133 - this.modelIds[var4] = var1.readUnsignedShort(); - } - } - } - } else if (var2 == 14) { // L: 138 - this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 139 - this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { // L: 140 - this.interactType = 0; // L: 141 - this.boolean1 = false; // L: 142 - } else if (var2 == 18) { // L: 144 - this.boolean1 = false; - } else if (var2 == 19) { // L: 145 - this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { // L: 146 - this.clipType = 0; - } else if (var2 == 22) { // L: 147 - this.nonFlatShading = true; - } else if (var2 == 23) { // L: 148 - this.modelClipped = true; - } else if (var2 == 24) { // L: 149 - this.animationId = var1.readUnsignedShort(); // L: 150 - if (this.animationId == 65535) { // L: 151 - this.animationId = -1; - } - } else if (var2 == 27) { // L: 153 - this.interactType = 1; - } else if (var2 == 28) { // L: 154 - this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { // L: 155 - this.ambient = var1.readByte(); - } else if (var2 == 39) { // L: 156 - this.contrast = var1.readByte() * 25; - } else if (var2 >= 30 && var2 < 35) { // L: 157 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159 - this.actions[var2 - 30] = null; - } - } else if (var2 == 40) { // L: 161 - var3 = var1.readUnsignedByte(); // L: 162 - this.recolorFrom = new short[var3]; // L: 163 - this.recolorTo = new short[var3]; // L: 164 - - for (var4 = 0; var4 < var3; ++var4) { // L: 165 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167 - } - } else if (var2 == 41) { // L: 170 - var3 = var1.readUnsignedByte(); // L: 171 - this.retextureFrom = new short[var3]; // L: 172 - this.retextureTo = new short[var3]; // L: 173 - - for (var4 = 0; var4 < var3; ++var4) { // L: 174 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176 - } - } else if (var2 == 61) { // L: 179 - var1.readUnsignedShort(); // L: 180 - } else if (var2 == 62) { // L: 182 - this.isRotated = true; - } else if (var2 == 64) { // L: 183 - this.clipped = false; - } else if (var2 == 65) { // L: 184 - this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { // L: 185 - this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { // L: 186 - this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { // L: 187 - this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { // L: 188 - var1.readUnsignedByte(); // L: 189 - } else if (var2 == 70) { // L: 191 - this.offsetX = var1.readShort(); - } else if (var2 == 71) { // L: 192 - this.offsetHeight = var1.readShort(); - } else if (var2 == 72) { // L: 193 - this.offsetY = var1.readShort(); - } else if (var2 == 73) { // L: 194 - this.boolean2 = true; - } else if (var2 == 74) { // L: 195 - this.isSolid = true; - } else if (var2 == 75) { // L: 196 - this.int3 = var1.readUnsignedByte(); - } else if (var2 != 77 && var2 != 92) { // L: 197 - if (var2 == 78) { // L: 215 - this.ambientSoundId = var1.readUnsignedShort(); // L: 216 - this.int7 = var1.readUnsignedByte(); // L: 217 - } else if (var2 == 79) { // L: 219 - this.int5 = var1.readUnsignedShort(); // L: 220 - this.int6 = var1.readUnsignedShort(); // L: 221 - this.int7 = var1.readUnsignedByte(); // L: 222 - var3 = var1.readUnsignedByte(); // L: 223 - this.soundEffectIds = new int[var3]; // L: 224 - - for (var4 = 0; var4 < var3; ++var4) { // L: 225 - this.soundEffectIds[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 81) { // L: 227 - this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { // L: 228 - this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { // L: 229 - this.boolean3 = false; - } else if (var2 == 249) { // L: 230 - this.params = NetFileRequest.readStringIntParameters(var1, this.params); - } - } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 198 - if (this.transformVarbit == 65535) { // L: 199 - this.transformVarbit = -1; - } - - this.transformVarp = var1.readUnsignedShort(); // L: 200 - if (this.transformVarp == 65535) { // L: 201 - this.transformVarp = -1; - } - - var3 = -1; // L: 202 - if (var2 == 92) { // L: 203 - var3 = var1.readUnsignedShort(); // L: 204 - if (var3 == 65535) { // L: 205 - var3 = -1; - } - } - - var4 = var1.readUnsignedByte(); // L: 207 - this.transforms = new int[var4 + 2]; // L: 208 - - for (int var5 = 0; var5 <= var4; ++var5) { // L: 209 - this.transforms[var5] = var1.readUnsignedShort(); // L: 210 - if (this.transforms[var5] == 65535) { // L: 211 - this.transforms[var5] = -1; - } - } - - this.transforms[var4 + 1] = var3; // L: 213 - } - - } // L: 232 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "752380" - ) - public final boolean method3651(int var1) { - if (this.models != null) { // L: 235 - for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 245 - if (this.models[var4] == var1) { // L: 246 - return class175.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); - } - } - - return true; // L: 248 - } else if (this.modelIds == null) { // L: 236 - return true; - } else if (var1 != 10) { // L: 237 - return true; - } else { - boolean var2 = true; // L: 238 - - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239 - var2 &= class175.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 - } - - return var2; // L: 242 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "41570456" - ) - @Export("needsModelFiles") - public final boolean needsModelFiles() { - if (this.modelIds == null) { // L: 253 - return true; - } else { - boolean var1 = true; // L: 254 - - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255 - var1 &= class175.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 - } - - return var1; // L: 258 + this.decodeNext(var1, var2); // L: 101 } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lgh;", - garbageValue = "68" + descriptor = "(Lpi;II)V", + garbageValue = "-1971745226" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + int var3; + int var4; + if (var2 == 1) { // L: 106 + var3 = var1.readUnsignedByte(); // L: 107 + if (var3 > 0) { // L: 108 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 109 + var1.offset += var3 * 3; // L: 117 + } else { + this.models = new int[var3]; // L: 110 + this.modelIds = new int[var3]; // L: 111 + + for (var4 = 0; var4 < var3; ++var4) { // L: 112 + this.modelIds[var4] = var1.readUnsignedShort(); // L: 113 + this.models[var4] = var1.readUnsignedByte(); // L: 114 + } + } + } + } else if (var2 == 2) { // L: 120 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 5) { // L: 121 + var3 = var1.readUnsignedByte(); // L: 122 + if (var3 > 0) { // L: 123 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 124 + var1.offset += 2 * var3; // L: 129 + } else { + this.models = null; // L: 125 + this.modelIds = new int[var3]; // L: 126 + + for (var4 = 0; var4 < var3; ++var4) { // L: 127 + this.modelIds[var4] = var1.readUnsignedShort(); + } + } + } + } else if (var2 == 14) { // L: 132 + this.sizeX = var1.readUnsignedByte(); + } else if (var2 == 15) { // L: 133 + this.sizeY = var1.readUnsignedByte(); + } else if (var2 == 17) { // L: 134 + this.interactType = 0; // L: 135 + this.boolean1 = false; // L: 136 + } else if (var2 == 18) { // L: 138 + this.boolean1 = false; + } else if (var2 == 19) { // L: 139 + this.int1 = var1.readUnsignedByte(); + } else if (var2 == 21) { // L: 140 + this.clipType = 0; + } else if (var2 == 22) { // L: 141 + this.nonFlatShading = true; + } else if (var2 == 23) { // L: 142 + this.modelClipped = true; + } else if (var2 == 24) { // L: 143 + this.animationId = var1.readUnsignedShort(); // L: 144 + if (this.animationId == 65535) { // L: 145 + this.animationId = -1; + } + } else if (var2 == 27) { // L: 147 + this.interactType = 1; + } else if (var2 == 28) { // L: 148 + this.int2 = var1.readUnsignedByte(); + } else if (var2 == 29) { // L: 149 + this.ambient = var1.readByte(); + } else if (var2 == 39) { // L: 150 + this.contrast = var1.readByte() * 25; + } else if (var2 >= 30 && var2 < 35) { // L: 151 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 152 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 153 + this.actions[var2 - 30] = null; + } + } else if (var2 == 40) { // L: 155 + var3 = var1.readUnsignedByte(); // L: 156 + this.recolorFrom = new short[var3]; // L: 157 + this.recolorTo = new short[var3]; // L: 158 + + for (var4 = 0; var4 < var3; ++var4) { // L: 159 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 160 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 161 + } + } else if (var2 == 41) { // L: 164 + var3 = var1.readUnsignedByte(); // L: 165 + this.retextureFrom = new short[var3]; // L: 166 + this.retextureTo = new short[var3]; // L: 167 + + for (var4 = 0; var4 < var3; ++var4) { // L: 168 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 169 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 170 + } + } else if (var2 == 61) { // L: 173 + var1.readUnsignedShort(); // L: 174 + } else if (var2 == 62) { // L: 176 + this.isRotated = true; + } else if (var2 == 64) { // L: 177 + this.clipped = false; + } else if (var2 == 65) { // L: 178 + this.modelSizeX = var1.readUnsignedShort(); + } else if (var2 == 66) { // L: 179 + this.modelHeight = var1.readUnsignedShort(); + } else if (var2 == 67) { // L: 180 + this.modelSizeY = var1.readUnsignedShort(); + } else if (var2 == 68) { // L: 181 + this.mapSceneId = var1.readUnsignedShort(); + } else if (var2 == 69) { // L: 182 + var1.readUnsignedByte(); // L: 183 + } else if (var2 == 70) { // L: 185 + this.offsetX = var1.readShort(); + } else if (var2 == 71) { // L: 186 + this.offsetHeight = var1.readShort(); + } else if (var2 == 72) { // L: 187 + this.offsetY = var1.readShort(); + } else if (var2 == 73) { // L: 188 + this.boolean2 = true; + } else if (var2 == 74) { // L: 189 + this.isSolid = true; + } else if (var2 == 75) { // L: 190 + this.int3 = var1.readUnsignedByte(); + } else if (var2 != 77 && var2 != 92) { // L: 191 + if (var2 == 78) { // L: 209 + this.ambientSoundId = var1.readUnsignedShort(); // L: 210 + this.int7 = var1.readUnsignedByte(); // L: 211 + } else if (var2 == 79) { // L: 213 + this.int5 = var1.readUnsignedShort(); // L: 214 + this.int6 = var1.readUnsignedShort(); // L: 215 + this.int7 = var1.readUnsignedByte(); // L: 216 + var3 = var1.readUnsignedByte(); // L: 217 + this.soundEffectIds = new int[var3]; // L: 218 + + for (var4 = 0; var4 < var3; ++var4) { // L: 219 + this.soundEffectIds[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 81) { // L: 221 + this.clipType = var1.readUnsignedByte() * 256; + } else if (var2 == 82) { // L: 222 + this.mapIconId = var1.readUnsignedShort(); + } else if (var2 == 89) { // L: 223 + this.boolean3 = false; + } else if (var2 == 249) { // L: 224 + this.params = class214.readStringIntParameters(var1, this.params); + } + } else { + this.transformVarbit = var1.readUnsignedShort(); // L: 192 + if (this.transformVarbit == 65535) { // L: 193 + this.transformVarbit = -1; + } + + this.transformVarp = var1.readUnsignedShort(); // L: 194 + if (this.transformVarp == 65535) { // L: 195 + this.transformVarp = -1; + } + + var3 = -1; // L: 196 + if (var2 == 92) { // L: 197 + var3 = var1.readUnsignedShort(); // L: 198 + if (var3 == 65535) { // L: 199 + var3 = -1; + } + } + + var4 = var1.readUnsignedByte(); // L: 201 + this.transforms = new int[var4 + 2]; // L: 202 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 203 + this.transforms[var5] = var1.readUnsignedShort(); // L: 204 + if (this.transforms[var5] == 65535) { // L: 205 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 207 + } + + } // L: 226 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "683516334" + ) + public final boolean method3664(int var1) { + if (this.models != null) { // L: 229 + for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 239 + if (this.models[var4] == var1) { // L: 240 + return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); + } + } + + return true; // L: 242 + } else if (this.modelIds == null) { // L: 230 + return true; + } else if (var1 != 10) { // L: 231 + return true; + } else { + boolean var2 = true; // L: 232 + + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 233 + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 234 + } + + return var2; // L: 236 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1481046668" + ) + @Export("needsModelFiles") + public final boolean needsModelFiles() { + if (this.modelIds == null) { // L: 247 + return true; + } else { + boolean var1 = true; // L: 248 + + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 249 + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 250 + } + + return var1; // L: 252 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II[[IIIIB)Lix;", + garbageValue = "84" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { // L: 263 + if (this.models == null) { // L: 257 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 258 } - Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 265 - if (var9 == null) { // L: 266 - ModelData var10 = this.getModelData(var1, var2); // L: 267 - if (var10 == null) { // L: 268 + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 259 + if (var9 == null) { // L: 260 + ModelData var10 = this.getModelData(var1, var2); // L: 261 + if (var10 == null) { // L: 262 return null; } - if (!this.nonFlatShading) { // L: 269 + if (!this.nonFlatShading) { // L: 263 var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { - var10.ambient = (short)(this.ambient + 64); // L: 271 - var10.contrast = (short)(this.contrast + 768); // L: 272 - var10.calculateVertexNormals(); // L: 273 - var9 = var10; // L: 274 + var10.ambient = (short)(this.ambient + 64); // L: 265 + var10.contrast = (short)(this.contrast + 768); // L: 266 + var10.calculateVertexNormals(); // L: 267 + var9 = var10; // L: 268 } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276 + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 270 } - if (this.nonFlatShading) { // L: 278 - var9 = ((ModelData)var9).copyModelData(); // L: 279 + if (this.nonFlatShading) { // L: 272 + var9 = ((ModelData)var9).copyModelData(); // L: 273 } - if (this.clipType >= 0) { // L: 281 - if (var9 instanceof Model) { // L: 282 + if (this.clipType >= 0) { // L: 275 + if (var9 instanceof Model) { // L: 276 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3918(var3, var4, var5, var6, true, this.clipType); // L: 283 + var9 = ((ModelData)var9).method4517(var3, var4, var5, var6, true, this.clipType); // L: 277 } } - return (Renderable)var9; // L: 285 + return (Renderable)var9; // L: 279 } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lhx;", - garbageValue = "-1204002912" + descriptor = "(II[[IIIII)Liq;", + garbageValue = "-261368298" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { // L: 290 + if (this.models == null) { // L: 284 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 285 } - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 292 - if (var9 == null) { // L: 293 - ModelData var10 = this.getModelData(var1, var2); // L: 294 - if (var10 == null) { // L: 295 + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 286 + if (var9 == null) { // L: 287 + ModelData var10 = this.getModelData(var1, var2); // L: 288 + if (var10 == null) { // L: 289 return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 296 - ObjectDefinition_cachedModels.put(var9, var7); // L: 297 + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 290 + ObjectDefinition_cachedModels.put(var9, var7); // L: 291 } if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299 + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 293 } - return var9; // L: 300 + return var9; // L: 294 } - @ObfuscatedName("r") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II[[IIIILgg;IB)Lhx;", - garbageValue = "102" + descriptor = "(II[[IIIILgw;II)Liq;", + garbageValue = "1099870493" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { long var9; - if (this.models == null) { // L: 305 + if (this.models == null) { // L: 299 var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306 + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 300 } - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 307 - if (var11 == null) { // L: 308 - ModelData var12 = this.getModelData(var1, var2); // L: 309 - if (var12 == null) { // L: 310 + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 301 + if (var11 == null) { // L: 302 + ModelData var12 = this.getModelData(var1, var2); // L: 303 + if (var12 == null) { // L: 304 return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 311 - ObjectDefinition_cachedModels.put(var11, var9); // L: 312 + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 305 + ObjectDefinition_cachedModels.put(var11, var9); // L: 306 } - if (var7 == null && this.clipType == -1) { // L: 314 + if (var7 == null && this.clipType == -1) { // L: 308 return var11; } else { - if (var7 != null) { // L: 315 - var11 = var7.transformObjectModel(var11, var8, var2); // L: 316 + if (var7 != null) { // L: 309 + var11 = var7.transformObjectModel(var11, var8, var2); // L: 310 } else { - var11 = var11.toSharedSequenceModel(true); // L: 318 + var11 = var11.toSharedSequenceModel(true); // L: 312 } - if (this.clipType >= 0) { // L: 319 + if (this.clipType >= 0) { // L: 313 var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; // L: 320 + return var11; // L: 314 } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)Lgt;", - garbageValue = "-1459779784" + descriptor = "(III)Lhc;", + garbageValue = "1620081906" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; // L: 324 + ModelData var3 = null; // L: 318 boolean var4; int var5; int var7; - if (this.models == null) { // L: 325 - if (var1 != 10) { // L: 326 + if (this.models == null) { // L: 319 + if (var1 != 10) { // L: 320 return null; } - if (this.modelIds == null) { // L: 327 + if (this.modelIds == null) { // L: 321 return null; } - var4 = this.isRotated; // L: 328 - if (var1 == 2 && var2 > 3) { // L: 329 + var4 = this.isRotated; // L: 322 + if (var1 == 2 && var2 > 3) { // L: 323 var4 = !var4; } - var5 = this.modelIds.length; // L: 330 + var5 = this.modelIds.length; // L: 324 - for (int var6 = 0; var6 < var5; ++var6) { // L: 331 - var7 = this.modelIds[var6]; // L: 332 - if (var4) { // L: 333 + for (int var6 = 0; var6 < var5; ++var6) { // L: 325 + var7 = this.modelIds[var6]; // L: 326 + if (var4) { // L: 327 var7 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 334 - if (var3 == null) { // L: 335 - var3 = ModelData.ModelData_get(class175.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 336 - if (var3 == null) { // L: 337 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 328 + if (var3 == null) { // L: 329 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 330 + if (var3 == null) { // L: 331 return null; } - if (var4) { // L: 338 - var3.method3900(); + if (var4) { // L: 332 + var3.method4526(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339 + ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 333 } - if (var5 > 1) { // L: 341 - field2037[var6] = var3; + if (var5 > 1) { // L: 335 + field2020[var6] = var3; } } - if (var5 > 1) { // L: 343 - var3 = new ModelData(field2037, var5); + if (var5 > 1) { // L: 337 + var3 = new ModelData(field2020, var5); } } else { - int var9 = -1; // L: 346 + int var9 = -1; // L: 340 - for (var5 = 0; var5 < this.models.length; ++var5) { // L: 347 - if (this.models[var5] == var1) { // L: 348 - var9 = var5; // L: 349 + for (var5 = 0; var5 < this.models.length; ++var5) { // L: 341 + if (this.models[var5] == var1) { // L: 342 + var9 = var5; // L: 343 break; } } - if (var9 == -1) { // L: 353 + if (var9 == -1) { // L: 347 return null; } - var5 = this.modelIds[var9]; // L: 354 - boolean var10 = this.isRotated ^ var2 > 3; // L: 355 - if (var10) { // L: 356 + var5 = this.modelIds[var9]; // L: 348 + boolean var10 = this.isRotated ^ var2 > 3; // L: 349 + if (var10) { // L: 350 var5 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 357 - if (var3 == null) { // L: 358 - var3 = ModelData.ModelData_get(class175.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 359 - if (var3 == null) { // L: 360 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 351 + if (var3 == null) { // L: 352 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 353 + if (var3 == null) { // L: 354 return null; } - if (var10) { // L: 361 - var3.method3900(); + if (var10) { // L: 355 + var3.method4526(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362 + ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 356 } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 366 - var4 = false; // L: 367 + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 360 + var4 = false; // L: 361 } else { var4 = true; } boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 369 - var11 = false; // L: 370 + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 363 + var11 = false; // L: 364 } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 371 - if (var1 == 4 && var2 > 3) { // L: 372 - var8.method3914(256); // L: 373 - var8.changeOffset(45, 0, -45); // L: 374 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); // L: 365 + if (var1 == 4 && var2 > 3) { // L: 366 + var8.method4512(256); // L: 367 + var8.changeOffset(45, 0, -45); // L: 368 } - var2 &= 3; // L: 376 - if (var2 == 1) { // L: 377 - var8.method3920(); - } else if (var2 == 2) { // L: 378 - var8.method3912(); - } else if (var2 == 3) { - var8.method3913(); // L: 379 + var2 &= 3; // L: 370 + if (var2 == 1) { // L: 371 + var8.method4553(); + } else if (var2 == 2) { // L: 372 + var8.method4520(); + } else if (var2 == 3) { // L: 373 + var8.method4521(); } - if (this.recolorFrom != null) { // L: 380 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 381 - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 382 + if (this.recolorFrom != null) { // L: 374 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 375 + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 376 } } - if (this.retextureFrom != null) { // L: 385 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 386 - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 387 + if (this.retextureFrom != null) { // L: 379 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 380 + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 381 } } - if (var4) { // L: 390 + if (var4) { // L: 384 var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { // L: 391 + if (var11) { // L: 385 var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; // L: 392 + return var8; // L: 386 } - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Lgx;", - garbageValue = "-796959800" + descriptor = "(B)Lgj;", + garbageValue = "32" ) @Export("transform") public final ObjectComposition transform() { - int var1 = -1; // L: 396 - if (this.transformVarbit != -1) { // L: 397 - var1 = WorldMapRegion.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 398 + int var1 = -1; // L: 390 + if (this.transformVarbit != -1) { // L: 391 + var1 = SecureRandomCallable.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 392 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 400 - var2 = this.transforms[var1]; // L: 401 + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 394 + var2 = this.transforms[var1]; // L: 395 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class116.getObjectDefinition(var2) : null; // L: 402 403 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "3650" - ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - return ClanSettings.method2976(this.params, var1, var2); // L: 407 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1224347712" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return class19.method315(this.params, var1, var2); // L: 411 + return var2 != -1 ? class146.getObjectDefinition(var2) : null; // L: 396 397 } @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1859764564" + descriptor = "(IIB)I", + garbageValue = "104" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + IterableNodeHashTable var4 = this.params; // L: 402 + int var3; + if (var4 == null) { // L: 404 + var3 = var2; // L: 405 + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 408 + if (var5 == null) { // L: 409 + var3 = var2; // L: 410 + } else { + var3 = var5.integer; // L: 413 + } + } + + return var3; // L: 415 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1640621220" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + IterableNodeHashTable var4 = this.params; // L: 420 + String var3; + if (var4 == null) { // L: 422 + var3 = var2; // L: 423 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 426 + if (var5 == null) { // L: 427 + var3 = var2; // L: 428 + } else { + var3 = (String)var5.obj; // L: 431 + } + } + + return var3; // L: 433 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "45" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 415 + if (this.transforms == null) { // L: 444 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 416 - if (this.transforms[var1] != -1) { // L: 417 - ObjectComposition var2 = class116.getObjectDefinition(this.transforms[var1]); // L: 418 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 419 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 445 + if (this.transforms[var1] != -1) { // L: 446 + ObjectComposition var2 = class146.getObjectDefinition(this.transforms[var1]); // L: 447 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 448 return true; } } } - return false; // L: 422 + return false; // L: 451 } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1745489139" + descriptor = "(II)Lgh;", + garbageValue = "2086980764" ) - static void method3692(int var0) { - class386.field4337 = var0; // L: 22 - class386.field4342 = new class386[var0]; // L: 23 - class386.field4336 = 0; // L: 24 - } // L: 25 + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 19 + if (var1 != null) { // L: 20 + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 21 + var1 = new StructComposition(); // L: 22 + if (var2 != null) { // L: 23 + var1.decode(new Buffer(var2)); + } - @ObfuscatedName("kb") + var1.postDecode(); // L: 24 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 25 + return var1; // L: 26 + } + } + + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-489261528" + garbageValue = "-1937470798" ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - WorldMapRectangle.method4987(); // L: 11691 - if (class230.friendsChat != null) { // L: 11692 - class230.friendsChat.invalidateIgnoreds(); // L: 11693 + static void method3674() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + + while (var0.hasNext()) { // L: 62 + Message var1 = (Message)var0.next(); // L: 58 + var1.clearIsFromFriend(); // L: 60 } - } // L: 11695 + } // L: 63 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 4d30fead0e..c6c047349f 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("og") +@ObfuscatedName("ou") @Implements("ObjectNode") public class ObjectNode extends Node { @ObfuscatedName("v") diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index fef7389c00..1a27f3691f 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,89 +4,95 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bx") @Implements("ObjectSound") public final class ObjectSound extends Node { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("o") + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1300939823 + intValue = -1143373499 ) @Export("plane") int plane; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1842614453 + intValue = 196890987 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -813654201 + intValue = -1084424963 ) @Export("y") int y; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1223190233 + intValue = 993575825 ) @Export("maxX") int maxX; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1010153229 + intValue = -940444737 ) @Export("maxY") int maxY; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1389167959 + intValue = -1342895703 ) - int field813; - @ObfuscatedName("f") + int field818; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -728064327 + intValue = -1138356125 + ) + int field814; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1961686125 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Lau;" ) @Export("stream1") RawPcmStream stream1; @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgj;" ) @Export("obj") ObjectComposition obj; - @ObfuscatedName("k") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1621269019 + intValue = 712620851 ) - int field809; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1625171611 - ) - int field819; - @ObfuscatedName("c") + int field810; + @ObfuscatedName("w") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -670062811 + intValue = -1687637789 ) int field821; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Lau;" ) @Export("stream2") RawPcmStream stream2; @@ -98,10 +104,10 @@ public final class ObjectSound extends Node { ObjectSound() { } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "349322313" + garbageValue = "725537929" ) @Export("set") void set() { @@ -109,41 +115,64 @@ public final class ObjectSound extends Node { ObjectComposition var2 = this.obj.transform(); // L: 45 if (var2 != null) { // L: 46 this.soundEffectId = var2.ambientSoundId; // L: 47 - this.field813 = var2.int7 * 128; // L: 48 - this.field809 = var2.int5; // L: 49 - this.field819 = var2.int6; // L: 50 + this.field814 = var2.int7 * 128; // L: 48 + this.field818 = var2.int5; // L: 49 + this.field810 = var2.int6; // L: 50 this.soundEffectIds = var2.soundEffectIds; // L: 51 } else { this.soundEffectId = -1; // L: 54 - this.field813 = 0; // L: 55 - this.field809 = 0; // L: 56 - this.field819 = 0; // L: 57 + this.field814 = 0; // L: 55 + this.field818 = 0; // L: 56 + this.field810 = 0; // L: 57 this.soundEffectIds = null; // L: 58 } if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60 - WorldMapIcon_1.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 + StructComposition.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 this.stream1 = null; // L: 62 } } // L: 64 - @ObfuscatedName("li") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "32418508" + descriptor = "(IIIZIZB)V", + garbageValue = "20" ) - static String method1734(String var0) { - PlayerType[] var1 = HitSplatDefinition.PlayerType_values(); // L: 11931 + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { // L: 177 + int var6 = (var0 + var1) / 2; // L: 178 + int var7 = var0; // L: 179 + World var8 = DevicePcmPlayerProvider.World_worlds[var6]; // L: 180 + DevicePcmPlayerProvider.World_worlds[var6] = DevicePcmPlayerProvider.World_worlds[var1]; // L: 181 + DevicePcmPlayerProvider.World_worlds[var1] = var8; // L: 182 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11932 - PlayerType var3 = var1[var2]; // L: 11933 - if (var3.modIcon != -1 && var0.startsWith(class351.method6579(var3.modIcon))) { // L: 11935 11936 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11937 - break; + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + if (VerticalAlignment.method3538(DevicePcmPlayerProvider.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 + World var10 = DevicePcmPlayerProvider.World_worlds[var9]; // L: 185 + DevicePcmPlayerProvider.World_worlds[var9] = DevicePcmPlayerProvider.World_worlds[var7]; // L: 186 + DevicePcmPlayerProvider.World_worlds[var7++] = var10; // L: 187 + } } + + DevicePcmPlayerProvider.World_worlds[var1] = DevicePcmPlayerProvider.World_worlds[var7]; // L: 191 + DevicePcmPlayerProvider.World_worlds[var7] = var8; // L: 192 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 } - return var0; // L: 11944 - } + } // L: 196 + + @ObfuscatedName("ms") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1165685884" + ) + static void method1757() { + if (Client.oculusOrbState == 1) { // L: 12612 + Client.field759 = true; // L: 12613 + } + + } // L: 12615 } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index ff32379f2d..d4fd38b36f 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -3,113 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hd") +@ObfuscatedName("ip") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("hc") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + @ObfuscatedName("bs") + @ObfuscatedGetter( + intValue = 521485803 + ) + static int field2687; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2118219045 + intValue = 432924175 ) @Export("minTileX") int minTileX; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1278987595 + intValue = 870286189 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1725451551 + intValue = -1384680613 ) @Export("minTileY") int minTileY; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1053658137 + intValue = 307229679 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -552645515 + intValue = -2026987549 ) @Export("type") int type; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1118377853 + intValue = -1038398405 ) @Export("minX") int minX; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1442245953 + intValue = -1926841753 ) @Export("maxX") int maxX; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1253210515 + intValue = 933387719 ) @Export("minZ") int minZ; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 141469663 + intValue = 1713258203 ) @Export("maxZ") int maxZ; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 928393647 + intValue = 293086529 ) @Export("minY") int minY; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1686310297 + intValue = -324431291 ) @Export("maxY") int maxY; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1392704329 - ) - int field2453; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 163437119 - ) - int field2454; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -465176021 - ) - int field2455; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -821512955 + intValue = -1076390299 ) - int field2456; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1125361357 - ) - int field2460; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1349803663 - ) - int field2458; + int field2669; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1964398833 + intValue = -1300048983 ) - int field2459; + int field2681; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1268857779 + ) + int field2682; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 156478241 + ) + int field2683; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -213765683 + ) + int field2684; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -606308779 + ) + int field2685; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1936535027 + ) + int field2686; Occluder() { } // L: 23 diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java b/runescape-client/src/main/java/OtlTokenRequester.java similarity index 65% rename from runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java rename to runescape-client/src/main/java/OtlTokenRequester.java index 7e77d021a9..b462a86b4e 100644 --- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java +++ b/runescape-client/src/main/java/OtlTokenRequester.java @@ -1,10 +1,10 @@ -package com.jagex.oldscape.pub; - import java.net.URL; import java.util.concurrent.Future; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; @Implements("OtlTokenRequester") +@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenRequester") public interface OtlTokenRequester { Future request(URL var1); } diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java b/runescape-client/src/main/java/OtlTokenResponse.java similarity index 59% rename from runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java rename to runescape-client/src/main/java/OtlTokenResponse.java index 9524b6ba63..c9d8c31c0b 100644 --- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java +++ b/runescape-client/src/main/java/OtlTokenResponse.java @@ -1,8 +1,8 @@ -package com.jagex.oldscape.pub; - import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; @Implements("OtlTokenResponse") +@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenResponse") public interface OtlTokenResponse { boolean isSuccess(); diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 0b49ecb44e..f512218bd8 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,26 +4,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("py") +@ObfuscatedName("pz") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("o") - static final int[] field4611; + @ObfuscatedName("c") + static final int[] field4614; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lqo;" + descriptor = "Lqv;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1868700831 + intValue = -835561769 ) @Export("bitIndex") int bitIndex; static { - field4611 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 + field4614 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 } public PacketBuffer(int var1) { @@ -33,57 +33,57 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "1713833669" + garbageValue = "1339442514" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lqo;I)V", - garbageValue = "-2126062951" + descriptor = "(Lqv;I)V", + garbageValue = "1028615537" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1084453097" + garbageValue = "1238591858" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "232615530" + garbageValue = "115676548" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1986118707" + garbageValue = "15461355" ) - public boolean method7701() { - int var1 = super.array[super.offset] - this.isaacCipher.method8330() & 255; // L: 31 + public boolean method7622() { + int var1 = super.array[super.offset] - this.isaacCipher.method8224() & 255; // L: 31 return var1 >= 128; // L: 32 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "4276" + descriptor = "(I)I", + garbageValue = "-1913551705" ) @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); // L: 38 39 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "910051948" + descriptor = "([BIIB)V", + garbageValue = "60" ) - public void method7708(byte[] var1, int var2, int var3) { + public void method7624(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { // L: 43 var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } // L: 44 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1278230372" + garbageValue = "-1261988260" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1858547185" + descriptor = "(IB)I", + garbageValue = "4" ) @Export("readBits") public int readBits(int var1) { @@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer { int var4 = 0; // L: 53 for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field4611[var3]) << var1 - var3; // L: 56 + var4 += (super.array[var2++] & field4614[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field4611[var3]; + var4 += super.array[var2] & field4614[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4611[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4614[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1422892646" + garbageValue = "-1395113017" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "2032316800" + garbageValue = "-1194786841" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 2f22cf9bcb..f0f1762d6e 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jd") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Ljt;" + descriptor = "[Ljd;" ) @Export("PacketBufferNode_packetBufferNodes") - static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -482567323 + intValue = 294123919 ) @Export("PacketBufferNode_packetBufferNodeCount") - static int PacketBufferNode_packetBufferNodeCount; + public static int PacketBufferNode_packetBufferNodeCount; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljl;" ) @Export("clientPacket") - ClientPacket clientPacket; - @ObfuscatedName("o") + public ClientPacket clientPacket; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 408247845 + intValue = -147579925 ) @Export("clientPacketLength") - int clientPacketLength; - @ObfuscatedName("h") + public int clientPacketLength; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpz;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 997234155 + intValue = 843582305 ) @Export("index") public int index; @@ -49,18 +49,45 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; // L: 14 } - PacketBufferNode() { - } // L: 19 - - @ObfuscatedName("g") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1164727717" + garbageValue = "2142638680" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 58 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 59 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 45 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 46 } - } // L: 60 + } // L: 47 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1834860972" + ) + public static boolean method5187(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 241 242 + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(Lcz;I)Z", + garbageValue = "71882365" + ) + static boolean method5188(Player var0) { + if (Client.drawPlayerNames == 0) { // L: 4861 + return false; + } else if (GrandExchangeEvents.localPlayer == var0) { // L: 4862 + return class6.method36(); // L: 4873 + } else { + boolean var1 = NPCComposition.method3531() || Varcs.method2441() && var0.isFriend(); // L: 4863 + if (!var1) { // L: 4864 + boolean var2 = (Client.drawPlayerNames & 2) != 0; // L: 4867 + var1 = var2 && var0.isFriendsChatMember(); // L: 4869 + } + + return var1; // L: 4871 + } + } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 4f8bfd95dd..7c585f3982 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -1,113 +1,106 @@ import java.io.IOException; -import java.util.Arrays; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cl") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("nw") - @ObfuscatedSignature( - descriptor = "Lbp;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lny;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llk;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 750825519 + intValue = -669543133 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lqo;" + descriptor = "Lqv;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lpz;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1694781515 + intValue = 365925591 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("u") - boolean field1328; + @ObfuscatedName("q") + boolean field1317; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -11589615 + ) + int field1322; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1137458333 - ) - int field1326; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1022499315 + intValue = 1829594601 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - ServerPacket field1320; - @ObfuscatedName("c") + ServerPacket field1324; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - ServerPacket field1329; - @ObfuscatedName("j") + ServerPacket field1325; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - ServerPacket field1331; + ServerPacket field1313; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); // L: 15 - this.bufferSize = 0; + this.bufferSize = 0; // L: 16 this.buffer = new Buffer(5000); // L: 17 this.packetBuffer = new PacketBuffer(40000); // L: 19 this.serverPacket = null; // L: 20 - this.serverPacketLength = 0; // L: 21 - this.field1328 = true; // L: 22 - this.field1326 = 0; // L: 23 + this.serverPacketLength = 0; + this.field1317 = true; // L: 22 + this.field1322 = 0; // L: 23 this.pendingWrites = 0; // L: 24 } // L: 29 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "-114" ) @Export("clearBuffer") final void clearBuffer() { @@ -115,10 +108,10 @@ public class PacketWriter { this.bufferSize = 0; // L: 33 } // L: 34 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1824965765" + garbageValue = "-1641157190" ) @Export("flush") final void flush() throws IOException { @@ -143,10 +136,10 @@ public class PacketWriter { } // L: 52 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljt;B)V", - garbageValue = "121" + descriptor = "(Ljd;I)V", + garbageValue = "-1704102815" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -156,20 +149,20 @@ public class PacketWriter { this.bufferSize += var1.index; // L: 58 } // L: 59 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnj;B)V", - garbageValue = "33" + descriptor = "(Lny;I)V", + garbageValue = "1949084856" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; // L: 62 } // L: 63 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2133508090" + garbageValue = "-600547113" ) @Export("close") void close() { @@ -190,193 +183,40 @@ public class PacketWriter { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Lnj;", - garbageValue = "2" + descriptor = "(I)Lny;", + garbageValue = "1980129228" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([BZI)Ljava/lang/Object;", - garbageValue = "1183406666" - ) - public static Object method2511(byte[] var0, boolean var1) { - if (var0 == null) { // L: 7 - return null; - } else if (var0.length > 136) { // L: 8 - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 - var2.set(var0); // L: 11 - return var2; // L: 12 - } else { - return var0; // L: 16 - } - } - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-801712084" + descriptor = "(II)Z", + garbageValue = "948804767" ) - public static void method2485() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 159 - } // L: 160 - - @ObfuscatedName("ft") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - static void method2489() { - Client.mouseLastLastPressedTimeMillis = -1L; // L: 2354 - BuddyRankComparator.mouseRecorder.index = 0; // L: 2355 - Varps.hasFocus = true; // L: 2356 - Client.hadFocus = true; // L: 2357 - Client.field718 = -1L; // L: 2358 - class33.reflectionChecks = new IterableNodeDeque(); // L: 2360 - Client.packetWriter.clearBuffer(); // L: 2362 - Client.packetWriter.packetBuffer.offset = 0; // L: 2363 - Client.packetWriter.serverPacket = null; // L: 2364 - Client.packetWriter.field1320 = null; // L: 2365 - Client.packetWriter.field1329 = null; // L: 2366 - Client.packetWriter.field1331 = null; // L: 2367 - Client.packetWriter.serverPacketLength = 0; // L: 2368 - Client.packetWriter.field1326 = 0; // L: 2369 - Client.rebootTimer = 0; // L: 2370 - Client.logoutTimer = 0; // L: 2371 - Client.hintArrowType = 0; // L: 2372 - class268.method5228(); // L: 2373 - ItemComposition.method3764(0); // L: 2374 - NetCache.method5988(); // L: 2375 - Client.isItemSelected = 0; // L: 2376 - Client.isSpellSelected = false; // L: 2377 - Client.soundEffectCount = 0; // L: 2378 - Client.camAngleY = 0; // L: 2379 - Client.oculusOrbState = 0; // L: 2380 - class340.field4109 = null; // L: 2381 - Client.minimapState = 0; // L: 2382 - Client.field721 = -1; // L: 2383 - Client.destinationX = 0; // L: 2384 - Client.destinationY = 0; // L: 2385 - Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2386 - Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2387 - Client.npcCount = 0; // L: 2388 - Players.Players_count = 0; // L: 2390 - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2391 - Players.field1289[var0] = null; // L: 2392 - Players.field1285[var0] = class193.field2193; // L: 2393 - } - - for (var0 = 0; var0 < 2048; ++var0) { // L: 2396 - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 32768; ++var0) { // L: 2397 - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; // L: 2398 - Client.projectiles.clear(); // L: 2399 - Client.graphicsObjects.clear(); // L: 2400 - - for (var0 = 0; var0 < 4; ++var0) { // L: 2401 - for (int var4 = 0; var4 < 104; ++var4) { // L: 2402 - for (int var2 = 0; var2 < 104; ++var2) { // L: 2403 - Client.groundItems[var0][var4][var2] = null; // L: 2404 - } - } - } - - Client.pendingSpawns = new NodeDeque(); // L: 2408 - class155.friendSystem.clear(); // L: 2409 - - for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2410 - VarpDefinition var1 = SoundCache.VarpDefinition_get(var0); // L: 2411 - if (var1 != null) { // L: 2412 - Varps.Varps_temp[var0] = 0; // L: 2413 - Varps.Varps_main[var0] = 0; // L: 2414 - } - } - - JagexCache.varcs.clearTransient(); // L: 2417 - Client.followerIndex = -1; // L: 2418 - if (Client.rootInterface != -1) { // L: 2419 - WorldMapID.method5000(Client.rootInterface); - } - - for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2420 - class20.closeInterface(var3, true); // L: 2421 - } - - Client.rootInterface = -1; // L: 2423 - Client.interfaceParents = new NodeHashTable(8); // L: 2424 - Client.meslayerContinueWidget = null; // L: 2425 - class268.method5228(); // L: 2426 - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2427 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2428 - Client.playerMenuActions[var0] = null; // L: 2429 - Client.playerOptionsPriorities[var0] = false; // L: 2430 - } - - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2433 - Client.isLoading = true; // L: 2435 - - for (var0 = 0; var0 < 100; ++var0) { // L: 2436 - Client.field564[var0] = true; - } - - class17.method228(); // L: 2437 - class230.friendsChat = null; // L: 2438 - class134.guestClanSettings = null; // L: 2439 - Arrays.fill(Client.currentClanSettings, (Object)null); // L: 2440 - class83.guestClanChannel = null; // L: 2441 - Arrays.fill(Client.currentClanChannels, (Object)null); // L: 2442 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2443 - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - ReflectionCheck.grandExchangeEvents = null; // L: 2444 - } // L: 2445 - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(Lkn;B)Z", - garbageValue = "27" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 10275 - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10276 - int var2 = WorldMapAreaData.method5086(var0, var1); // L: 10277 - int var3 = var0.cs1ComparisonValues[var1]; // L: 10278 - if (var0.cs1Comparisons[var1] == 2) { // L: 10279 - if (var2 >= var3) { // L: 10280 - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 10282 - if (var2 <= var3) { // L: 10283 - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 10285 - if (var2 == var3) { // L: 10286 - return false; - } - } else if (var2 != var3) { // L: 10288 - return false; - } - } - - return true; // L: 10290 - } + public static boolean method2498(int var0) { + return (var0 >> 21 & 1) != 0; // L: 21 } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(Lky;IIII)V", + garbageValue = "-2050353968" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 12305 + if (var4 != null) { // L: 12306 + if (Client.minimapState < 3) { // L: 12307 + class14.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12308 + } + + } + } // L: 12309 } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 0c766a8a8a..2f7d984044 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -4,31 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gn") @Implements("ParamComposition") public class ParamComposition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("ParamDefinition_archive") - static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("o") + public static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("ParamDefinition_cached") - static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("h") + public static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + static IndexedSprite field1983; + @ObfuscatedName("i") @Export("type") char type; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 781852645 + intValue = 1031818341 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("defaultStr") public String defaultStr; @ObfuscatedName("n") @@ -43,74 +54,116 @@ public class ParamComposition extends DualNode { this.autoDisable = true; // L: 16 } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1418099375" + descriptor = "(B)V", + garbageValue = "32" ) @Export("postDecode") void postDecode() { - } // L: 35 + } // L: 31 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-41" + descriptor = "(Lpi;B)V", + garbageValue = "-31" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 == 0) { // L: 40 - return; // L: 43 + int var2 = var1.readUnsignedByte(); // L: 35 + if (var2 == 0) { // L: 36 + return; // L: 39 } - this.decodeNext(var1, var2); // L: 41 + this.decodeNext(var1, var2); // L: 37 } } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "-11" + descriptor = "(Lpi;II)V", + garbageValue = "-1270383692" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 46 - byte var4 = var1.readByte(); // L: 48 - int var5 = var4 & 255; // L: 50 - if (var5 == 0) { // L: 51 - throw new IllegalArgumentException("" + Integer.toString(var5, 16)); - } - - if (var5 >= 128 && var5 < 160) { // L: 52 - char var6 = class345.cp1252AsciiExtension[var5 - 128]; // L: 53 - if (var6 == 0) { // L: 54 - var6 = '?'; - } - - var5 = var6; // L: 55 - } - - char var3 = (char)var5; // L: 57 - this.type = var3; // L: 59 - } else if (var2 == 2) { // L: 61 + if (var2 == 1) { // L: 42 + this.type = class293.method5600(var1.readByte()); // L: 43 + } else if (var2 == 2) { // L: 45 this.defaultInt = var1.readInt(); - } else if (var2 == 4) { // L: 62 - this.autoDisable = false; - } else if (var2 == 5) { // L: 63 + } else if (var2 == 4) { + this.autoDisable = false; // L: 46 + } else if (var2 == 5) { // L: 47 this.defaultStr = var1.readStringCp1252NullTerminated(); } - } // L: 65 + } // L: 49 - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)Z", garbageValue = "0" ) @Export("isString") public boolean isString() { - return this.type == 's'; // L: 68 + return this.type == 's'; // L: 52 } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-665269599" + ) + public static boolean method3596(int var0) { + return (var0 >> 22 & 1) != 0; // L: 25 + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-83" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 10753 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10754 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10755 + } + + if (var1.length() > 9) { // L: 10757 + return " " + UserComparator9.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + UserComparator9.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + UserComparator9.colorStartTag(16776960) + var1 + ""; // L: 10758 10759 + } + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(Lky;IIS)V", + garbageValue = "180" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11753 + if (var0 != null && FriendLoginUpdate.method6686(var0) != null) { // L: 11754 + Client.clickedWidget = var0; // L: 11755 + Client.clickedWidgetParent = FriendLoginUpdate.method6686(var0); // L: 11756 + Client.widgetClickX = var1; // L: 11757 + Client.widgetClickY = var2; // L: 11758 + class124.widgetDragDuration = 0; // L: 11759 + Client.isDraggingWidget = false; // L: 11760 + int var3 = GameBuild.method5773(); // L: 11761 + if (var3 != -1) { // L: 11762 + Interpreter.tempMenuAction = new MenuAction(); // L: 11763 + Interpreter.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 11764 + Interpreter.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 11765 + Interpreter.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 11766 + Interpreter.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 11767 + Interpreter.tempMenuAction.action = Client.menuActions[var3]; // L: 11768 + } + + } + } + } // L: 11770 } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 2abab65f45..ca55a0e0b2 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,553 +1,558 @@ +import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("ay") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("up") - @ObfuscatedSignature( - descriptor = "Lnn;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("sg") + @ObfuscatedName("tf") @ObfuscatedGetter( - intValue = -1524812773 + intValue = -1674990359 ) - static int field302; + static int field294; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -100861485 + ) + public static int field268; @ObfuscatedName("n") @Export("PcmPlayer_stereo") protected static boolean PcmPlayer_stereo; - @ObfuscatedName("j") + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -876322285 + ) + static int field295; + @ObfuscatedName("ax") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "[Lqq;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("k") @Export("samples") protected int[] samples; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Laf;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1674689975 + intValue = 219086691 ) - int field289; - @ObfuscatedName("b") + int field292; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -146289790672909629L + longValue = 7132959178591486869L ) @Export("timeMs") long timeMs; - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2098648259 + intValue = -1707278451 ) @Export("capacity") int capacity; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 918986377 + ) + int field289; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1421867195 + ) + int field279; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 901701685 + longValue = 9027155764200073789L ) - int field282; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1678649401 - ) - int field286; - @ObfuscatedName("q") - @ObfuscatedGetter( - longValue = -962258044052042289L - ) - long field287; + long field280; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 674233675 + intValue = -742253307 ) - int field288; - @ObfuscatedName("z") + int field281; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 327498169 + intValue = -220533853 ) - int field285; + int field275; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1102402763 + intValue = -220706099 ) - int field294; - @ObfuscatedName("t") + int field283; + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -8423144863370094901L + longValue = -5317730937569531851L ) - long field291; - @ObfuscatedName("i") - boolean field292; - @ObfuscatedName("aw") + long field284; + @ObfuscatedName("h") + boolean field285; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1149709291 + intValue = -473229249 ) - int field298; - @ObfuscatedName("ar") + int field277; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "[Lal;" + descriptor = "[Laf;" ) - PcmStream[] field295; - @ObfuscatedName("ae") + PcmStream[] field272; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lal;" + descriptor = "[Laf;" ) - PcmStream[] field296; + PcmStream[] field290; protected PcmPlayer() { - this.field289 = 32; // L: 22 - this.timeMs = WorldMapSprite.method4989(); // L: 23 - this.field287 = 0L; // L: 27 - this.field288 = 0; // L: 28 - this.field285 = 0; // L: 29 - this.field294 = 0; // L: 30 - this.field291 = 0L; // L: 31 - this.field292 = true; // L: 32 - this.field298 = 0; // L: 38 - this.field295 = new PcmStream[8]; // L: 39 - this.field296 = new PcmStream[8]; // L: 40 + this.field292 = 32; // L: 22 + this.timeMs = class136.method2931(); // L: 23 + this.field280 = 0L; // L: 27 + this.field281 = 0; // L: 28 + this.field275 = 0; // L: 29 + this.field283 = 0; // L: 30 + this.field284 = 0L; // L: 31 + this.field285 = true; // L: 32 + this.field277 = 0; // L: 38 + this.field272 = new PcmStream[8]; // L: 39 + this.field290 = new PcmStream[8]; // L: 40 } // L: 42 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "44" + descriptor = "(I)V", + garbageValue = "-843995592" ) @Export("init") protected void init() throws Exception { - } // L: 284 + } // L: 280 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "5561" + descriptor = "(II)V", + garbageValue = "1651380399" ) @Export("open") protected void open(int var1) throws Exception { - } // L: 285 + } // L: 281 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "244839095" ) @Export("position") protected int position() throws Exception { - return this.capacity; // L: 288 + return this.capacity; // L: 284 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("write") protected void write() throws Exception { - } // L: 291 + } // L: 287 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1892762612" + garbageValue = "-1662003992" ) @Export("close") protected void close() { - } // L: 292 + } // L: 288 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-476108420" + garbageValue = "1137884684" ) @Export("discard") protected void discard() throws Exception { - } // L: 293 + } // L: 289 - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lal;I)V", - garbageValue = "646054771" + descriptor = "(Laf;I)V", + garbageValue = "-1433712556" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 83 - } // L: 84 + this.stream = var1; // L: 79 + } @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1960857341" + garbageValue = "-941854175" ) @Export("run") public final synchronized void run() { - if (this.samples != null) { // L: 87 - long var1 = WorldMapSprite.method4989(); // L: 88 + if (this.samples != null) { + long var1 = class136.method2931(); try { - if (this.field287 != 0L) { // L: 90 - if (var1 < this.field287) { // L: 91 + if (this.field280 != 0L) { + if (var1 < this.field280) { return; } - this.open(this.capacity); // L: 92 - this.field287 = 0L; // L: 93 - this.field292 = true; // L: 94 + this.open(this.capacity); + this.field280 = 0L; + this.field285 = true; } - int var3 = this.position(); // L: 96 - if (this.field294 - var3 > this.field288) { // L: 97 - this.field288 = this.field294 - var3; + int var3 = this.position(); + if (this.field283 - var3 > this.field281) { + this.field281 = this.field283 - var3; } - int var4 = this.field282 + this.field286; // L: 98 - if (var4 + 256 > 16384) { // L: 99 + int var4 = this.field279 + this.field289; + if (var4 + 256 > 16384) { var4 = 16128; } - if (var4 + 256 > this.capacity) { // L: 100 - this.capacity += 1024; // L: 101 - if (this.capacity > 16384) { // L: 102 + if (var4 + 256 > this.capacity) { + this.capacity += 1024; + if (this.capacity > 16384) { this.capacity = 16384; } - this.close(); // L: 103 - this.open(this.capacity); // L: 104 - var3 = 0; // L: 105 - this.field292 = true; // L: 106 - if (var4 + 256 > this.capacity) { // L: 107 - var4 = this.capacity - 256; // L: 108 - this.field286 = var4 - this.field282; // L: 109 + this.close(); + this.open(this.capacity); + var3 = 0; + this.field285 = true; // L: 102 + if (var4 + 256 > this.capacity) { // L: 103 + var4 = this.capacity - 256; // L: 104 + this.field279 = var4 - this.field289; } } - while (var3 < var4) { // L: 112 - this.fill(this.samples, 256); // L: 113 - this.write(); // L: 114 - var3 += 256; // L: 115 + while (var3 < var4) { + this.fill(this.samples, 256); + this.write(); + var3 += 256; } - if (var1 > this.field291) { // L: 117 - if (!this.field292) { // L: 118 - if (this.field288 == 0 && this.field285 == 0) { // L: 119 - this.close(); // L: 120 - this.field287 = var1 + 2000L; // L: 121 - return; // L: 122 + if (var1 > this.field284) { + if (!this.field285) { + if (this.field281 == 0 && this.field275 == 0) { + this.close(); + this.field280 = var1 + 2000L; // L: 117 + return; } - this.field286 = Math.min(this.field285, this.field288); // L: 124 - this.field285 = this.field288; // L: 125 + this.field279 = Math.min(this.field275, this.field281); // L: 120 + this.field275 = this.field281; // L: 121 } else { - this.field292 = false; // L: 127 + this.field285 = false; // L: 123 } - this.field288 = 0; // L: 128 - this.field291 = var1 + 2000L; // L: 129 + this.field281 = 0; // L: 124 + this.field284 = 2000L + var1; // L: 125 } - this.field294 = var3; // L: 131 - } catch (Exception var7) { // L: 133 - this.close(); // L: 134 - this.field287 = 2000L + var1; // L: 135 + this.field283 = var3; // L: 127 + } catch (Exception var7) { // L: 129 + this.close(); // L: 130 + this.field280 = 2000L + var1; // L: 131 } try { - if (var1 > this.timeMs + 500000L) { // L: 138 + if (var1 > 500000L + this.timeMs) { // L: 134 var1 = this.timeMs; } - while (var1 > this.timeMs + 5000L) { // L: 139 - this.skip(256); // L: 140 - this.timeMs += (long)(256000 / SecureRandomFuture.field949); // L: 141 + while (var1 > 5000L + this.timeMs) { // L: 135 + this.skip(256); // L: 136 + this.timeMs += (long)(256000 / field268); // L: 137 } - } catch (Exception var6) { // L: 144 - this.timeMs = var1; // L: 145 + } catch (Exception var6) { // L: 140 + this.timeMs = var1; // L: 141 } } + } // L: 143 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1721057511" + ) + public final void method690() { + this.field285 = true; // L: 146 } // L: 147 - @ObfuscatedName("e") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2105118710" - ) - public final void method722() { - this.field292 = true; // L: 150 - } // L: 151 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "323324362" + garbageValue = "1697875178" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field292 = true; // L: 154 + this.field285 = true; // L: 150 try { - this.discard(); // L: 156 - } catch (Exception var2) { // L: 158 - this.close(); // L: 159 - this.field287 = WorldMapSprite.method4989() + 2000L; // L: 160 + this.discard(); // L: 152 + } catch (Exception var2) { // L: 154 + this.close(); // L: 155 + this.field280 = class136.method2931() + 2000L; // L: 156 } - } // L: 162 + } // L: 158 - @ObfuscatedName("i") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "104" + garbageValue = "1" ) @Export("shutdown") public final synchronized void shutdown() { - if (VarpDefinition.soundSystem != null) { // L: 165 - boolean var1 = true; // L: 166 + if (class6.soundSystem != null) { // L: 161 + boolean var1 = true; // L: 162 - for (int var2 = 0; var2 < 2; ++var2) { // L: 167 - if (this == VarpDefinition.soundSystem.players[var2]) { // L: 168 - VarpDefinition.soundSystem.players[var2] = null; + for (int var2 = 0; var2 < 2; ++var2) { // L: 163 + if (this == class6.soundSystem.players[var2]) { + class6.soundSystem.players[var2] = null; // L: 164 } - if (VarpDefinition.soundSystem.players[var2] != null) { // L: 169 + if (class6.soundSystem.players[var2] != null) { // L: 165 var1 = false; } } - if (var1) { // L: 171 - class342.soundSystemExecutor.shutdownNow(); // L: 172 - class342.soundSystemExecutor = null; // L: 173 - VarpDefinition.soundSystem = null; // L: 174 + if (var1) { // L: 167 + WorldMapSection1.soundSystemExecutor.shutdownNow(); // L: 168 + WorldMapSection1.soundSystemExecutor = null; // L: 169 + class6.soundSystem = null; // L: 170 } } - this.close(); // L: 177 - this.samples = null; // L: 178 - } // L: 179 + this.close(); // L: 173 + this.samples = null; // L: 174 + } // L: 175 - @ObfuscatedName("ac") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1425453165" + descriptor = "(IS)V", + garbageValue = "2048" ) @Export("skip") final void skip(int var1) { - this.field298 -= var1; // L: 182 - if (this.field298 < 0) { - this.field298 = 0; // L: 183 + this.field277 -= var1; // L: 178 + if (this.field277 < 0) { + this.field277 = 0; // L: 179 } if (this.stream != null) { - this.stream.skip(var1); // L: 184 + this.stream.skip(var1); // L: 180 } - } // L: 185 + } // L: 181 - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 189 - if (PcmPlayer_stereo) { // L: 190 + int var3 = var2; // L: 185 + if (PcmPlayer_stereo) { // L: 186 var3 = var2 << 1; } - class350.clearIntArray(var1, 0, var3); // L: 191 - this.field298 -= var2; // L: 192 - if (this.stream != null && this.field298 <= 0) { // L: 193 - this.field298 += SecureRandomFuture.field949 >> 4; // L: 194 - class341.PcmStream_disable(this.stream); // L: 195 - this.method727(this.stream, this.stream.vmethod968()); // L: 196 - int var4 = 0; // L: 197 - int var5 = 255; // L: 198 + class350.clearIntArray(var1, 0, var3); // L: 187 + this.field277 -= var2; // L: 188 + if (this.stream != null && this.field277 <= 0) { // L: 189 + this.field277 += field268 >> 4; // L: 190 + class296.PcmStream_disable(this.stream); // L: 191 + this.method695(this.stream, this.stream.vmethod962()); // L: 192 + int var4 = 0; // L: 193 + int var5 = 255; // L: 194 int var6; PcmStream var10; - label109: - for (var6 = 7; var5 != 0; --var6) { // L: 199 + label108: + for (var6 = 7; var5 != 0; --var6) { // L: 195 int var7; int var8; - if (var6 < 0) { // L: 202 - var7 = var6 & 3; // L: 203 - var8 = -(var6 >> 2); // L: 204 + if (var6 < 0) { // L: 198 + var7 = var6 & 3; // L: 199 + var8 = -(var6 >> 2); // L: 200 } else { - var7 = var6; // L: 207 - var8 = 0; // L: 208 + var7 = var6; // L: 203 + var8 = 0; // L: 204 } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 210 212 - if ((var9 & 1) != 0) { // L: 215 - var5 &= ~(1 << var7); // L: 218 - var10 = null; // L: 219 - PcmStream var11 = this.field295[var7]; // L: 220 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 206 208 + if ((var9 & 1) != 0) { // L: 211 + var5 &= ~(1 << var7); // L: 214 + var10 = null; // L: 215 + PcmStream var11 = this.field272[var7]; // L: 216 - label103: + label102: while (true) { while (true) { - if (var11 == null) { // L: 221 - break label103; + if (var11 == null) { // L: 217 + break label102; } - AbstractSound var12 = var11.sound; // L: 222 - if (var12 != null && var12.position > var8) { // L: 223 - var5 |= 1 << var7; // L: 224 - var10 = var11; // L: 225 - var11 = var11.after; // L: 226 + AbstractSound var12 = var11.sound; // L: 218 + if (var12 != null && var12.position > var8) { // L: 219 + var5 |= 1 << var7; // L: 220 + var10 = var11; // L: 221 + var11 = var11.after; // L: 222 } else { - var11.active = true; // L: 229 - int var13 = var11.vmethod5476(); // L: 230 - var4 += var13; // L: 231 - if (var12 != null) { // L: 232 + var11.active = true; // L: 225 + int var13 = var11.vmethod5441(); // L: 226 + var4 += var13; // L: 227 + if (var12 != null) { // L: 228 var12.position += var13; } - if (var4 >= this.field289) { // L: 233 - break label109; + if (var4 >= this.field292) { // L: 229 + break label108; } - PcmStream var14 = var11.firstSubStream(); // L: 234 - if (var14 != null) { - for (int var15 = var11.field349; var14 != null; var14 = var11.nextSubStream()) { // L: 237 239 - this.method727(var14, var15 * var14.vmethod968() >> 8); // L: 238 + PcmStream var14 = var11.firstSubStream(); // L: 230 + if (var14 != null) { // L: 231 + for (int var15 = var11.field343; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235 + this.method695(var14, var15 * var14.vmethod962() >> 8); // L: 234 } } - PcmStream var18 = var11.after; // L: 242 - var11.after = null; // L: 243 - if (var10 == null) { // L: 244 - this.field295[var7] = var18; + PcmStream var18 = var11.after; // L: 238 + var11.after = null; // L: 239 + if (var10 == null) { // L: 240 + this.field272[var7] = var18; } else { - var10.after = var18; // L: 245 + var10.after = var18; // L: 241 } - if (var18 == null) { // L: 246 - this.field296[var7] = var10; + if (var18 == null) { // L: 242 + this.field290[var7] = var10; } - var11 = var18; // L: 247 + var11 = var18; // L: 243 } } } } - var7 += 4; // L: 211 + var7 += 4; // L: 207 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { // L: 251 - PcmStream var16 = this.field295[var6]; // L: 252 - PcmStream[] var17 = this.field295; // L: 253 - this.field296[var6] = null; // L: 255 + for (var6 = 0; var6 < 8; ++var6) { // L: 247 + PcmStream var16 = this.field272[var6]; // L: 248 + PcmStream[] var17 = this.field272; // L: 249 + this.field290[var6] = null; // L: 251 - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 256 257 260 - var10 = var16.after; // L: 258 - var16.after = null; // L: 259 + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 252 253 256 + var10 = var16.after; // L: 254 + var16.after = null; // L: 255 } } } - if (this.field298 < 0) { // L: 264 - this.field298 = 0; + if (this.field277 < 0) { // L: 260 + this.field277 = 0; } - if (this.stream != null) { // L: 265 - this.stream.fill(var1, 0, var2); + if (this.stream != null) { + this.stream.fill(var1, 0, var2); // L: 261 } - this.timeMs = WorldMapSprite.method4989(); // L: 266 - } // L: 267 + this.timeMs = class136.method2931(); // L: 262 + } // L: 263 - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lal;II)V", - garbageValue = "98012473" + descriptor = "(Laf;IS)V", + garbageValue = "195" ) - final void method727(PcmStream var1, int var2) { - int var3 = var2 >> 5; // L: 276 - PcmStream var4 = this.field296[var3]; // L: 277 - if (var4 == null) { // L: 278 - this.field295[var3] = var1; + final void method695(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 272 + PcmStream var4 = this.field290[var3]; // L: 273 + if (var4 == null) { // L: 274 + this.field272[var3] = var1; } else { - var4.after = var1; // L: 279 + var4.after = var1; // L: 275 } - this.field296[var3] = var1; // L: 280 - var1.field349 = var2; // L: 281 - } // L: 282 + this.field290[var3] = var1; // L: 276 + var1.field343 = var2; // L: 277 + } // L: 278 - @ObfuscatedName("n") - public static int method771(long var0) { - return (int)(var0 >>> 7 & 127L); // L: 69 - } - - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-291155965" + descriptor = "([BI)Lbd;", + garbageValue = "1634234442" ) - public static boolean method772(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field125[var0] : false; // L: 235 236 - } + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 80 + Buffer var2 = new Buffer(var0); // L: 81 + var2.offset = var2.array.length - 2; // L: 82 + int var3 = var2.readUnsignedShort(); // L: 83 + int var4 = var2.array.length - 2 - var3 - 12; // L: 84 + var2.offset = var4; // L: 85 + int var5 = var2.readInt(); // L: 86 + var1.localIntCount = var2.readUnsignedShort(); // L: 87 + var1.localStringCount = var2.readUnsignedShort(); // L: 88 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 89 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 90 + int var6 = var2.readUnsignedByte(); // L: 91 + int var7; + int var8; + if (var6 > 0) { // L: 92 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 93 - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "1622893485" - ) - static int method770(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { // L: 4639 - class295.Interpreter_intStackSize -= 5; // L: 4640 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4641 - return 1; // L: 4642 - } else if (var0 == 7204) { // L: 4644 - class295.Interpreter_intStackSize -= 6; // L: 4645 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4646 - return 1; // L: 4647 - } else if (var0 >= 7205 && var0 < 7209) { // L: 4649 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = -1; // L: 4650 - return 1; // L: 4651 - } else if (var0 == 7209) { // L: 4653 - class295.Interpreter_intStackSize -= 2; // L: 4654 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4655 - return 1; // L: 4656 - } else if (var0 >= 7210 && var0 < 7214) { // L: 4658 - --class295.Interpreter_intStackSize; // L: 4659 - return 1; // L: 4660 - } else if (var0 == 7214) { // L: 4662 - class295.Interpreter_intStackSize -= 2; // L: 4663 - return 1; // L: 4664 - } else { - return 2; // L: 4666 - } - } + for (var7 = 0; var7 < var6; ++var7) { // L: 94 + var8 = var2.readUnsignedShort(); // L: 95 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? class67.method1909(var8) : 1); // L: 96 + var1.switches[var7] = var9; // L: 97 - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(Lkn;III)V", - garbageValue = "-2138605701" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11149 - if (var0 != null && DevicePcmPlayerProvider.method381(var0) != null) { // L: 11150 - Client.clickedWidget = var0; // L: 11151 - Client.clickedWidgetParent = DevicePcmPlayerProvider.method381(var0); // L: 11152 - Client.widgetClickX = var1; // L: 11153 - Client.widgetClickY = var2; // L: 11154 - class136.widgetDragDuration = 0; // L: 11155 - Client.isDraggingWidget = false; // L: 11156 - int var3 = class168.method3324(); // L: 11157 - if (var3 != -1) { // L: 11158 - PacketWriter.tempMenuAction = new MenuAction(); // L: 11159 - PacketWriter.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 11160 - PacketWriter.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 11161 - PacketWriter.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 11162 - PacketWriter.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 11163 - PacketWriter.tempMenuAction.action = Client.menuActions[var3]; // L: 11164 + while (var8-- > 0) { // L: 98 + int var10 = var2.readInt(); // L: 99 + int var11 = var2.readInt(); // L: 100 + var9.put(new IntegerNode(var11), (long)var10); // L: 101 } - } } - } // L: 11166 + + var2.offset = 0; // L: 105 + var1.field954 = var2.readStringCp1252NullTerminatedOrNull(); // L: 106 + var1.opcodes = new int[var5]; // L: 107 + var1.intOperands = new int[var5]; // L: 108 + var1.stringOperands = new String[var5]; // L: 109 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 110 111 116 + var8 = var2.readUnsignedShort(); // L: 112 + if (var8 == 3) { // L: 113 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 114 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 115 + } + } + + return var1; // L: 118 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IB)I", + garbageValue = "42" + ) + public static int method746(CharSequence var0, int var1) { + return class263.method5178(var0, var1, true); // L: 71 + } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index c450520be3..e9b55bf291 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("al") +@ObfuscatedName("af") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lal;" - ) - @Export("after") - PcmStream after; - @ObfuscatedName("b") - int field349; @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("a") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lbe;" + descriptor = "Laf;" + ) + @Export("after") + PcmStream after; + @ObfuscatedName("t") + int field343; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lbm;" ) @Export("sound") AbstractSound sound; @@ -30,35 +30,35 @@ public abstract class PcmStream extends Node { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("f") - protected abstract int vmethod5476(); + @ObfuscatedName("l") + protected abstract int vmethod5441(); - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("aq") - int vmethod968() { + @ObfuscatedName("ag") + int vmethod962() { return 255; // L: 16 } - @ObfuscatedName("fa") + @ObfuscatedName("fs") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index aa19531489..3b22f6db25 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("aa") +@ObfuscatedName("al") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) - NodeDeque field254; - @ObfuscatedName("h") - int field255; - @ObfuscatedName("g") - int field256; + NodeDeque field244; + @ObfuscatedName("i") + int field246; + @ObfuscatedName("f") + int field243; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field254 = new NodeDeque(); // L: 10 - this.field255 = 0; // L: 11 - this.field256 = -1; // L: 12 + this.field244 = new NodeDeque(); // L: 10 + this.field246 = 0; // L: 11 + this.field243 = -1; // L: 12 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lal;)V" + descriptor = "(Laf;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lal;)V" + descriptor = "(Laf;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 - @ObfuscatedName("h") - void method641() { - if (this.field255 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field254.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field254.previous()) { // L: 24 - var1.field398 -= this.field255; // L: 25 + @ObfuscatedName("i") + void method617() { + if (this.field246 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field244.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field244.previous()) { // L: 24 + var1.field390 -= this.field246; // L: 25 } - this.field256 -= this.field255; // L: 27 - this.field255 = 0; // L: 28 + this.field243 -= this.field246; // L: 27 + this.field246 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Loz;Lai;)V" + descriptor = "(Loq;Lap;)V" ) - void method642(Node var1, PcmStreamMixerListener var2) { - while (this.field254.sentinel != var1 && ((PcmStreamMixerListener)var1).field398 <= var2.field398) { // L: 33 + void method618(Node var1, PcmStreamMixerListener var2) { + while (this.field244.sentinel != var1 && ((PcmStreamMixerListener)var1).field390 <= var2.field390) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field256 = ((PcmStreamMixerListener)this.field254.sentinel.previous).field398; // L: 35 + this.field243 = ((PcmStreamMixerListener)this.field244.sentinel.previous).field390; // L: 35 } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lai;)V" + descriptor = "(Lap;)V" ) - void method643(PcmStreamMixerListener var1) { + void method619(PcmStreamMixerListener var1) { var1.remove(); // L: 39 var1.remove2(); // L: 40 - Node var2 = this.field254.sentinel.previous; // L: 41 - if (var2 == this.field254.sentinel) { - this.field256 = -1; // L: 42 + Node var2 = this.field244.sentinel.previous; // L: 41 + if (var2 == this.field244.sentinel) { + this.field243 = -1; // L: 42 } else { - this.field256 = ((PcmStreamMixerListener)var2).field398; // L: 43 + this.field243 = ((PcmStreamMixerListener)var2).field390; // L: 43 } } // L: 44 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("f") - protected int vmethod5476() { + @ObfuscatedName("l") + protected int vmethod5441() { return 0; // L: 55 } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field256 < 0) { // L: 60 + if (this.field243 < 0) { // L: 60 this.updateSubStreams(var1, var2, var3); // L: 61 return; // L: 62 } - if (var3 + this.field255 < this.field256) { // L: 64 - this.field255 += var3; // L: 65 + if (var3 + this.field246 < this.field243) { // L: 64 + this.field246 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field256 - this.field255; // L: 69 + int var4 = this.field243 - this.field246; // L: 69 this.updateSubStreams(var1, var2, var4); // L: 70 var2 += var4; // L: 71 var3 -= var4; // L: 72 - this.field255 += var4; // L: 73 - this.method641(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field254.last(); // L: 75 + this.field246 += var4; // L: 73 + this.method617(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field244.last(); // L: 75 synchronized(var5) { // L: 76 int var7 = var5.update(); // L: 77 if (var7 < 0) { // L: 78 - var5.field398 = 0; // L: 79 - this.method643(var5); // L: 80 + var5.field390 = 0; // L: 79 + this.method619(var5); // L: 80 } else { - var5.field398 = var7; // L: 83 - this.method642(var5.previous, var5); // L: 84 + var5.field390 = var7; // L: 83 + this.method618(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field256 < 0) { // L: 99 + if (this.field243 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field255 + var1 < this.field256) { // L: 103 - this.field255 += var1; // L: 104 + if (this.field246 + var1 < this.field243) { // L: 103 + this.field246 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field256 - this.field255; // L: 108 + int var2 = this.field243 - this.field246; // L: 108 this.skipSubStreams(var2); // L: 109 var1 -= var2; // L: 110 - this.field255 += var2; // L: 111 - this.method641(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field254.last(); // L: 113 + this.field246 += var2; // L: 111 + this.method617(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field244.last(); // L: 113 synchronized(var3) { // L: 114 int var5 = var3.update(); // L: 115 if (var5 < 0) { // L: 116 - var3.field398 = 0; // L: 117 - this.method643(var3); // L: 118 + var3.field390 = 0; // L: 117 + this.method619(var3); // L: 118 } else { - var3.field398 = var5; // L: 121 - this.method642(var3.previous, var3); // L: 122 + var3.field390 = var5; // L: 121 + this.method618(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index b77be7cd20..2cee1b57b8 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("ai") +@ObfuscatedName("ap") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { @ObfuscatedName("v") - int field398; + int field390; @ObfuscatedName("v") @Export("remove2") abstract void remove2(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Laa;)I" + descriptor = "(Lal;)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 994bb18ffe..5956a5ebd0 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,103 +1,84 @@ -import java.lang.management.GarbageCollectorMXBean; +import java.applet.Applet; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("ck") +@ObfuscatedName("ct") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("uz") - @ObfuscatedGetter( - intValue = -19855095 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("b") - @Export("cacheParentPaths") - public static String[] cacheParentPaths; - @ObfuscatedName("ak") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "Lne;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -28260951 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; + @ObfuscatedName("ux") + @Export("foundItemIds") + static short[] foundItemIds; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -395030049 + intValue = 1984278839 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1083883841 + intValue = -685471761 ) @Export("type") int type; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 664401913 + intValue = -1470046835 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2084106709 + intValue = 241546961 ) @Export("y") int y; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 469927407 + intValue = 1849366507 ) @Export("objectId") int objectId; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 456466373 + intValue = 1969851359 ) - int field1117; - @ObfuscatedName("d") + int field1104; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -875007293 + intValue = -2130994383 ) - int field1119; - @ObfuscatedName("f") + int field1105; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 503773945 + intValue = -406866951 ) @Export("id") int id; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1610620631 + intValue = 1916353905 ) @Export("orientation") int orientation; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1901242165 + ) + int field1107; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -917284009 - ) - int field1122; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 270987311 + intValue = 1886053549 ) @Export("delay") int delay; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1980741835 + intValue = -758552801 ) @Export("hitpoints") int hitpoints; @@ -106,4 +87,86 @@ public final class PendingSpawn extends Node { this.delay = 0; // L: 16 this.hitpoints = -1; // L: 17 } // L: 19 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "1938115950" + ) + static boolean method2165(String var0, int var1, String var2) { + if (var1 == 0) { // L: 63 + try { + if (!class29.field175.startsWith("win")) { // L: 65 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 66 + throw new Exception(); + } else { + String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 67 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 68 + if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 69 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 71 + return true; // L: 72 + } + } catch (Throwable var8) { // L: 74 + return false; // L: 75 + } + } else if (var1 == 1) { // L: 78 + try { + Applet var7 = class29.field176; // L: 81 + Object[] var5 = new Object[]{(new URL(class29.field176.getCodeBase(), var0)).toString()}; // L: 82 + Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 85 + return var3 != null; // L: 88 + } catch (Throwable var9) { // L: 90 + return false; // L: 91 + } + } else if (var1 == 2) { // L: 94 + try { + class29.field176.getAppletContext().showDocument(new URL(class29.field176.getCodeBase(), var0), "_blank"); // L: 96 + return true; // L: 97 + } catch (Exception var10) { // L: 99 + return false; // L: 100 + } + } else if (var1 == 3) { // L: 103 + try { + class27.method383(class29.field176, "loggedout"); // L: 105 + } catch (Throwable var12) { // L: 107 + } + + try { + class29.field176.getAppletContext().showDocument(new URL(class29.field176.getCodeBase(), var0), "_top"); // L: 109 + return true; // L: 110 + } catch (Exception var11) { // L: 112 + return false; // L: 113 + } + } else { + throw new IllegalArgumentException(); // L: 116 + } + } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-617620981" + ) + static boolean method2166() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1458 + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1459 + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1460 + if (!var0.isLoaded()) { + return false; // L: 1461 + } + + ++Client.archiveLoadersDone; // L: 1462 + } + + return true; // L: 1464 + } else { + return true; // L: 1463 + } + } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 59c50d6874..b29e07e71a 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,202 +4,226 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ov") +@ObfuscatedName("oj") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 857425217 - ) - int field4433; - @ObfuscatedName("ae") - boolean field4431; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = -2119911943 - ) - int field4428; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = -712766327 - ) - int field4448; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = 2135911943 - ) - int field4430; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1474931891 + intValue = 359254147 ) - int field4443; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = -1685554017 - ) - int field4432; - @ObfuscatedName("ao") - boolean field4442; + int field4422; + @ObfuscatedName("al") + boolean field4423; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1843869685 + intValue = -1214181177 ) - int field4418; - @ObfuscatedName("aq") + int field4429; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 464330657 + intValue = 2123313943 ) - int field4435; - @ObfuscatedName("ah") + int field4425; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1641777413 + intValue = -293463653 ) - int field4436; - @ObfuscatedName("am") + int field4433; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 475952813 + intValue = -290319841 ) - int field4437; - @ObfuscatedName("al") - String field4438; - @ObfuscatedName("ak") - String field4439; - @ObfuscatedName("az") - String field4440; + int field4440; @ObfuscatedName("ag") - String field4441; + @ObfuscatedGetter( + intValue = 114996927 + ) + int field4428; + @ObfuscatedName("ah") + boolean field4426; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = 1292539811 + ) + int field4430; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = -598233409 + ) + int field4431; @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 381879925 + intValue = 2084134641 ) - int field4427; - @ObfuscatedName("ap") + int field4417; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -409359365 + intValue = 200679177 ) - int field4434; + int field4436; @ObfuscatedName("ai") + String field4434; + @ObfuscatedName("ax") + String field4435; + @ObfuscatedName("ar") + String field4444; + @ObfuscatedName("ap") + String field4437; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -317460353 + intValue = 800300679 ) - int field4444; - @ObfuscatedName("bk") + int field4420; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1030786911 + intValue = -562728499 ) - int field4445; - @ObfuscatedName("bz") - String field4426; + int field4439; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 2035566047 + ) + int field4446; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -995431815 + ) + int field4441; + @ObfuscatedName("bm") + String field4427; + @ObfuscatedName("br") + String field4443; + @ObfuscatedName("bo") + int[] field4442; @ObfuscatedName("bl") - String field4447; - @ObfuscatedName("be") - int[] field4446; - @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1178087619 + intValue = -123804323 ) - int field4449; - @ObfuscatedName("ba") - String field4450; + int field4424; + @ObfuscatedName("be") + String field4432; 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.field4446 = new int[3]; // L: 62 - this.field4433 = var1; // L: 67 - this.field4431 = var2; // L: 68 - this.field4428 = var3; // L: 69 - this.field4448 = var4; // L: 70 - this.field4430 = var5; // L: 71 - this.field4443 = var6; // L: 72 - this.field4432 = var7; // L: 73 - this.field4442 = var8; // L: 74 - this.field4418 = var9; // L: 75 - this.field4435 = var10; // L: 76 - this.field4436 = var11; // L: 77 - this.field4437 = var12; // L: 78 - this.field4438 = var13; // L: 79 - this.field4439 = var14; // L: 80 - this.field4440 = var15; // L: 81 - this.field4441 = var16; // L: 82 - this.field4427 = var17; // L: 83 - this.field4434 = var18; // L: 84 - this.field4444 = var19; // L: 85 - this.field4445 = var20; // L: 86 - this.field4426 = var21; // L: 87 - this.field4447 = var22; // L: 88 - this.field4446 = var23; // L: 89 - this.field4449 = var24; // L: 90 - this.field4450 = var25; // L: 91 + this.field4442 = new int[3]; // L: 62 + this.field4422 = var1; // L: 67 + this.field4423 = var2; // L: 68 + this.field4429 = var3; // L: 69 + this.field4425 = var4; // L: 70 + this.field4433 = var5; // L: 71 + this.field4440 = var6; // L: 72 + this.field4428 = var7; // L: 73 + this.field4426 = var8; // L: 74 + this.field4430 = var9; // L: 75 + this.field4431 = var10; // L: 76 + this.field4417 = var11; // L: 77 + this.field4436 = var12; // L: 78 + this.field4434 = var13; // L: 79 + this.field4435 = var14; // L: 80 + this.field4444 = var15; // L: 81 + this.field4437 = var16; // L: 82 + this.field4420 = var17; // L: 83 + this.field4439 = var18; // L: 84 + this.field4446 = var19; // L: 85 + this.field4441 = var20; // L: 86 + this.field4427 = var21; // L: 87 + this.field4443 = var22; // L: 88 + this.field4442 = var23; // L: 89 + this.field4424 = var24; // L: 90 + this.field4432 = var25; // L: 91 } // L: 92 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "1" + descriptor = "(Lpi;I)V", + garbageValue = "1752573389" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 - var1.writeByte(this.field4433); // L: 96 - var1.writeByte(this.field4431 ? 1 : 0); // L: 97 - var1.writeShort(this.field4428); // L: 98 - var1.writeByte(this.field4448); // L: 99 - var1.writeByte(this.field4430); // L: 100 - var1.writeByte(this.field4443); // L: 101 - var1.writeByte(this.field4432); // L: 102 - var1.writeByte(this.field4442 ? 1 : 0); // L: 103 - var1.writeShort(this.field4418); // L: 104 - var1.writeByte(this.field4435); // L: 105 - var1.writeMedium(this.field4436); // L: 106 - var1.writeShort(this.field4437); // L: 107 - var1.writeStringCp1252NullCircumfixed(this.field4438); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field4439); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field4440); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field4441); // L: 111 - var1.writeByte(this.field4434); // L: 112 - var1.writeShort(this.field4427); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field4426); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field4447); // L: 115 - var1.writeByte(this.field4444); // L: 116 - var1.writeByte(this.field4445); // L: 117 + var1.writeByte(this.field4422); // L: 96 + var1.writeByte(this.field4423 ? 1 : 0); // L: 97 + var1.writeShort(this.field4429); // L: 98 + var1.writeByte(this.field4425); // L: 99 + var1.writeByte(this.field4433); // L: 100 + var1.writeByte(this.field4440); // L: 101 + var1.writeByte(this.field4428); // L: 102 + var1.writeByte(this.field4426 ? 1 : 0); // L: 103 + var1.writeShort(this.field4430); // L: 104 + var1.writeByte(this.field4431); // L: 105 + var1.writeMedium(this.field4417); // L: 106 + var1.writeShort(this.field4436); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field4434); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field4435); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field4444); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field4437); // L: 111 + var1.writeByte(this.field4439); // L: 112 + var1.writeShort(this.field4420); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field4427); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field4443); // L: 115 + var1.writeByte(this.field4446); // L: 116 + var1.writeByte(this.field4441); // L: 117 - for (int var2 = 0; var2 < this.field4446.length; ++var2) { // L: 118 - var1.writeInt(this.field4446[var2]); + for (int var2 = 0; var2 < this.field4442.length; ++var2) { // L: 118 + var1.writeInt(this.field4442[var2]); } - var1.writeInt(this.field4449); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field4450); // L: 120 + var1.writeInt(this.field4424); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field4432); // L: 120 } // L: 121 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1632205942" + garbageValue = "1283677650" ) @Export("size") public int size() { byte var1 = 39; // L: 124 - String var4 = this.field4438; // L: 127 + String var4 = this.field4434; // L: 127 int var3 = var4.length() + 2; // L: 129 - int var23 = var1 + var3; // L: 131 - String var7 = this.field4439; // L: 134 + int var23 = var3 + var1; // L: 131 + String var7 = this.field4435; // L: 134 int var6 = var7.length() + 2; // L: 136 var23 += var6; // L: 138 - String var10 = this.field4440; // L: 141 + String var10 = this.field4444; // L: 141 int var9 = var10.length() + 2; // L: 143 var23 += var9; // L: 145 - String var13 = this.field4441; // L: 148 + String var13 = this.field4437; // L: 148 int var12 = var13.length() + 2; // L: 150 var23 += var12; // L: 152 - String var16 = this.field4426; // L: 155 + String var16 = this.field4427; // L: 155 int var15 = var16.length() + 2; // L: 157 var23 += var15; // L: 159 - String var19 = this.field4447; // L: 162 + String var19 = this.field4443; // L: 162 int var18 = var19.length() + 2; // L: 164 var23 += var18; // L: 166 - String var22 = this.field4450; // L: 169 + String var22 = this.field4432; // L: 169 int var21 = var22.length() + 2; // L: 171 var23 += var21; // L: 173 return var23; // L: 174 } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lbb;B)V", + garbageValue = "-99" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1823 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1824 + ClanSettings.method3033(var0.isMembersOnly()); // L: 1825 + } + + if (var0.properties != Client.worldProperties) { // L: 1827 + class260.method5174(class145.archive8, var0.properties); // L: 1828 + } + + class17.worldHost = var0.host; // L: 1830 + Client.worldId = var0.id; // L: 1831 + Client.worldProperties = var0.properties; // L: 1832 + SecureRandomFuture.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1833 + UserComparator9.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1834 + class329.currentPort = SecureRandomFuture.worldPort; // L: 1835 + } // L: 1836 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 1f9ed61a3b..ebe66a68b8 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("oy") +@ObfuscatedName("or") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Lov;", - garbageValue = "0" + descriptor = "(I)Loj;", + garbageValue = "2004856383" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 370e2d57b3..32e3d95498 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,172 +3,167 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cw") +@ObfuscatedName("cz") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("nk") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqb;" ) @Export("username") Username username; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lkp;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -200468809 + intValue = -340980975 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -360256483 + intValue = -2075940565 ) @Export("headIconPrayer") int headIconPrayer; @ObfuscatedName("n") @Export("actions") String[] actions; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -686455869 + intValue = 940198705 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -387721833 + intValue = -1876948275 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1136876601 + intValue = 1793810743 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1542135077 + intValue = 1130612929 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1164612895 + intValue = 38935459 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -559631655 + intValue = 249721451 ) - int field1084; - @ObfuscatedName("c") + int field1080; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1275397879 + intValue = -1209305495 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 383945299 + intValue = -1724112821 ) - int field1095; - @ObfuscatedName("p") + int field1082; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Liq;" ) @Export("model0") Model model0; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1705642801 + intValue = 593217569 ) @Export("minX") int minX; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1662300579 + intValue = -1371594921 ) @Export("minY") int minY; - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1765502875 + intValue = -1538239 ) @Export("maxX") int maxX; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1355026989 + intValue = -1112469711 ) @Export("maxY") int maxY; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -428995767 + intValue = -1892679033 ) @Export("team") int team; @ObfuscatedName("y") @Export("isHidden") boolean isHidden; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1050389241 + intValue = -181716259 ) @Export("plane") int plane; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -422585593 + intValue = -567529937 ) @Export("index") int index; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lni;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lni;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "Lni;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ax") - boolean field1109; - @ObfuscatedName("ay") + @ObfuscatedName("aq") + boolean field1070; + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 300036197 + intValue = -1041685371 ) @Export("tileX") int tileX; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1550758311 + intValue = -1747269173 ) @Export("tileY") int tileY; @@ -192,13 +187,13 @@ public final class Player extends Actor { this.isFriendTriBool = TriBool.TriBool_unknown; // L: 47 this.isInFriendsChat = TriBool.TriBool_unknown; // L: 48 this.isInClanChat = TriBool.TriBool_unknown; // L: 49 - this.field1109 = false; // L: 50 + this.field1070 = false; // L: 50 } // L: 54 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "57802936" + descriptor = "(Lpi;I)V", + garbageValue = "-1242087125" ) @Export("read") final void read(Buffer var1) { @@ -226,7 +221,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { // L: 76 - var8 = class67.ItemDefinition_get(var4[var5] - 512).team; // L: 77 + var8 = class19.ItemDefinition_get(var4[var5] - 512).team; // L: 77 if (var8 != 0) { // L: 78 this.team = var8; } @@ -234,15 +229,15 @@ public final class Player extends Actor { } } - int[] var24 = new int[5]; // L: 81 + int[] var11 = new int[5]; // L: 81 for (var6 = 0; var6 < 5; ++var6) { // L: 82 var7 = var1.readUnsignedByte(); // L: 83 - if (var7 < 0 || var7 >= class20.field102[var6].length) { // L: 84 + if (var7 < 0 || var7 >= class144.field1629[var6].length) { // L: 84 var7 = 0; } - var24[var6] = var7; // L: 85 + var11[var6] = var7; // L: 85 } super.idleSequence = var1.readUnsignedShort(); // L: 87 @@ -281,11 +276,11 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class83.loginType); // L: 102 + this.username = new Username(var1.readStringCp1252NullTerminated(), class122.loginType); // L: 102 this.clearIsFriend(); // L: 103 this.clearIsInFriendsChat(); // L: 104 - this.method2143(); // L: 105 - if (this == class19.localPlayer) { // L: 106 + this.method2121(); // L: 105 + if (this == GrandExchangeEvents.localPlayer) { // L: 106 RunException.localPlayerName = this.username.getName(); } @@ -296,286 +291,246 @@ public final class Player extends Actor { this.isHidden = false; } - class168[] var25 = null; // L: 111 - boolean var26 = false; // L: 112 + class168[] var12 = null; // L: 111 + boolean var13 = false; // L: 112 if (var1.offset < var1.array.length) { // L: 113 var8 = var1.readUnsignedShort(); // L: 114 - var26 = (var8 >> 15 & 1) == 1; // L: 115 + var13 = (var8 >> 15 & 1) == 1; // L: 115 if (var8 > 0 && var8 != 32768) { // L: 116 - var25 = new class168[12]; // L: 117 + var12 = new class168[12]; // L: 117 for (int var9 = 0; var9 < 12; ++var9) { // L: 118 int var10 = var8 >> 12 - var9 & 1; // L: 119 if (var10 == 1) { // L: 120 - int var14 = var4[var9] - 512; // L: 124 - int var15 = var1.readUnsignedByte(); // L: 126 - boolean var16 = (var15 & 1) != 0; // L: 127 - boolean var17 = (var15 & 2) != 0; // L: 128 - class168 var18 = new class168(var14); // L: 129 - int var19; - int[] var20; - boolean var21; - int var22; - short var23; - if (var16) { // L: 130 - var19 = var1.readUnsignedByte(); // L: 131 - var20 = new int[]{var19 & 15, var19 >> 4 & 15}; // L: 132 133 134 - var21 = var18.field1804 != null && var20.length == var18.field1804.length; // L: 135 - - for (var22 = 0; var22 < 2; ++var22) { // L: 136 - if (var20[var22] != 15) { // L: 137 - var23 = (short)var1.readUnsignedShort(); // L: 138 - if (var21) { // L: 139 - var18.field1804[var20[var22]] = var23; // L: 140 - } - } - } - } - - if (var17) { // L: 145 - var19 = var1.readUnsignedByte(); // L: 146 - var20 = new int[]{var19 & 15, var19 >> 4 & 15}; // L: 147 148 149 - var21 = var18.field1805 != null && var20.length == var18.field1805.length; // L: 150 - - for (var22 = 0; var22 < 2; ++var22) { // L: 151 - if (var20[var22] != 15) { // L: 152 - var23 = (short)var1.readUnsignedShort(); // L: 153 - if (var21) { // L: 154 - var18.field1805[var20[var22]] = var23; // L: 155 - } - } - } - } - - var25[var9] = var18; // L: 162 + var12[var9] = class349.method6509(var4[var9] - 512, var1); // L: 121 } } } } - if (this.appearance == null) { // L: 167 + if (this.appearance == null) { // L: 126 this.appearance = new PlayerComposition(); } - this.appearance.method5604(var4, var25, var26, var24, var2 == 1, var3); // L: 168 - } // L: 169 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" - ) - @Export("getModel") - protected final Model getModel() { - if (this.appearance == null) { // L: 232 - return null; - } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ItemContainer.SequenceDefinition_get(super.sequence) : null; // L: 233 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : ItemContainer.SequenceDefinition_get(super.movementSequence); // L: 234 - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 235 - if (var3 == null) { // L: 236 - return null; - } else { - var3.calculateBoundsCylinder(); // L: 237 - super.defaultHeight = var3.height; // L: 238 - Model var4; - Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 239 - var4 = class6.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 240 - if (var4 != null) { // L: 241 - var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 242 - var5 = new Model[]{var3, var4}; // L: 243 - var3 = new Model(var5, 2); // L: 244 - } - } - - if (!this.isUnanimated && this.model0 != null) { // L: 247 - if (Client.cycle >= this.animationCycleEnd) { // L: 248 - this.model0 = null; - } - - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 249 - var4 = this.model0; // L: 250 - var4.offsetBy(this.field1084 - super.x, this.tileHeight2 - this.tileHeight, this.field1095 - super.y); // L: 251 - if (super.orientation == 512) { // L: 252 - var4.rotateY90Ccw(); // L: 253 - var4.rotateY90Ccw(); // L: 254 - var4.rotateY90Ccw(); // L: 255 - } else if (super.orientation == 1024) { // L: 257 - var4.rotateY90Ccw(); // L: 258 - var4.rotateY90Ccw(); // L: 259 - } else if (super.orientation == 1536) { // L: 261 - var4.rotateY90Ccw(); - } - - var5 = new Model[]{var3, var4}; // L: 262 - var3 = new Model(var5, 2); // L: 263 - if (super.orientation == 512) { // L: 264 - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { // L: 265 - var4.rotateY90Ccw(); // L: 266 - var4.rotateY90Ccw(); // L: 267 - } else if (super.orientation == 1536) { // L: 269 - var4.rotateY90Ccw(); // L: 270 - var4.rotateY90Ccw(); // L: 271 - var4.rotateY90Ccw(); // L: 272 - } - - var4.offsetBy(super.x - this.field1084, this.tileHeight - this.tileHeight2, super.y - this.field1095); // L: 274 - } - } - - var3.isSingleTile = true; // L: 277 - if (super.field1189 != 0 && Client.cycle >= super.field1133 && Client.cycle < super.field1185) { // L: 278 - var3.overrideHue = super.field1146; // L: 279 - var3.overrideSaturation = super.field1187; // L: 280 - var3.overrideLuminance = super.field1188; // L: 281 - var3.overrideAmount = super.field1189; // L: 282 - } else { - var3.overrideAmount = 0; // L: 285 - } - - return var3; // L: 287 - } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1604625207" - ) - @Export("isFriend") - boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 172 - this.checkIsFriend(); // L: 173 - } - - return this.isFriendTriBool == TriBool.TriBool_true; // L: 175 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 179 - } // L: 180 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "849201143" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = class155.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 183 - } // L: 184 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1692885288" - ) - @Export("isFriendsChatMember") - boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 187 - this.updateIsInFriendsChat(); // L: 188 - } - - return this.isInFriendsChat == TriBool.TriBool_true; // L: 190 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2145347544" - ) - @Export("clearIsInFriendsChat") - void clearIsInFriendsChat() { - this.isInFriendsChat = TriBool.TriBool_unknown; // L: 194 - } // L: 195 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1562539797" - ) - @Export("updateIsInFriendsChat") - void updateIsInFriendsChat() { - this.isInFriendsChat = class230.friendsChat != null && class230.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 198 - } // L: 199 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "947633407" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - for (int var1 = 0; var1 < 3; ++var1) { // L: 202 - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2979(this.username.getName()) != -1 && var1 != 2) { // L: 203 204 - this.isInClanChat = TriBool.TriBool_true; // L: 205 - return; // L: 206 - } - } - - this.isInClanChat = TriBool.TriBool_false; // L: 210 - } // L: 211 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1330730743" - ) - void method2143() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 214 - } // L: 215 + this.appearance.method5570(var4, var12, var13, var11, var2 == 1, var3); // L: 127 + } // L: 128 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1825758047" + descriptor = "(B)Liq;", + garbageValue = "103" ) - @Export("isClanMember") - boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 218 - this.updateIsInClanChat(); // L: 219 + @Export("getModel") + protected final Model getModel() { + if (this.appearance == null) { // L: 191 + return null; + } else { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class163.SequenceDefinition_get(super.sequence) : null; // L: 192 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : class163.SequenceDefinition_get(super.movementSequence); // L: 193 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 194 + if (var3 == null) { // L: 195 + return null; + } else { + var3.calculateBoundsCylinder(); // L: 196 + super.defaultHeight = var3.height; // L: 197 + Model var4; + Model[] var5; + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 198 + var4 = ClientPreferences.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 199 + if (var4 != null) { // L: 200 + var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 201 + var5 = new Model[]{var3, var4}; // L: 202 + var3 = new Model(var5, 2); // L: 203 + } + } + + if (!this.isUnanimated && this.model0 != null) { // L: 206 + if (Client.cycle >= this.animationCycleEnd) { // L: 207 + this.model0 = null; + } + + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 208 + var4 = this.model0; // L: 209 + var4.offsetBy(this.field1080 - super.x, this.tileHeight2 - this.tileHeight, this.field1082 - super.y); // L: 210 + if (super.orientation == 512) { // L: 211 + var4.rotateY90Ccw(); // L: 212 + var4.rotateY90Ccw(); // L: 213 + var4.rotateY90Ccw(); // L: 214 + } else if (super.orientation == 1024) { // L: 216 + var4.rotateY90Ccw(); // L: 217 + var4.rotateY90Ccw(); // L: 218 + } else if (super.orientation == 1536) { // L: 220 + var4.rotateY90Ccw(); + } + + var5 = new Model[]{var3, var4}; // L: 221 + var3 = new Model(var5, 2); // L: 222 + if (super.orientation == 512) { // L: 223 + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { // L: 224 + var4.rotateY90Ccw(); // L: 225 + var4.rotateY90Ccw(); // L: 226 + } else if (super.orientation == 1536) { // L: 228 + var4.rotateY90Ccw(); // L: 229 + var4.rotateY90Ccw(); // L: 230 + var4.rotateY90Ccw(); // L: 231 + } + + var4.offsetBy(super.x - this.field1080, this.tileHeight - this.tileHeight2, super.y - this.field1082); // L: 233 + } + } + + var3.isSingleTile = true; // L: 236 + if (super.field1122 != 0 && Client.cycle >= super.field1167 && Client.cycle < super.field1168) { // L: 237 + var3.overrideHue = super.field1169; // L: 238 + var3.overrideSaturation = super.field1114; // L: 239 + var3.overrideLuminance = super.field1171; // L: 240 + var3.overrideAmount = super.field1122; // L: 241 + } else { + var3.overrideAmount = 0; // L: 244 + } + + return var3; // L: 246 + } + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2114149890" + ) + @Export("isFriend") + boolean isFriend() { + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 131 + this.checkIsFriend(); // L: 132 } - return this.isInClanChat == TriBool.TriBool_true; // L: 221 + return this.isFriendTriBool == TriBool.TriBool_true; // L: 134 } - @ObfuscatedName("j") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1904316565" + descriptor = "(I)V", + garbageValue = "-187822721" ) - @Export("transformedSize") - int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class9.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 225 226 228 + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138 + } // L: 139 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-111" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = Decimator.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142 + } // L: 143 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "28" + ) + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { + if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 146 + this.updateIsInFriendsChat(); // L: 147 + } + + return this.isInFriendsChat == TriBool.TriBool_true; // L: 149 } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "374589634" + ) + @Export("clearIsInFriendsChat") + void clearIsInFriendsChat() { + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 153 + } // L: 154 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "119" + ) + @Export("updateIsInFriendsChat") + void updateIsInFriendsChat() { + this.isInFriendsChat = ClientPacket.friendsChat != null && ClientPacket.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157 + } // L: 158 + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IILgv;I)V", - garbageValue = "-2026849446" + descriptor = "(I)V", + garbageValue = "-935029357" ) - final void method2144(int var1, int var2, class193 var3) { - if (super.sequence != -1 && ItemContainer.SequenceDefinition_get(super.sequence).field2171 == 1) { // L: 291 + @Export("updateIsInClanChat") + void updateIsInClanChat() { + for (int var1 = 0; var1 < 3; ++var1) { // L: 161 + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2955(this.username.getName()) != -1 && var1 != 2) { // L: 162 163 + this.isInClanChat = TriBool.TriBool_true; // L: 164 + return; // L: 165 + } + } + + this.isInClanChat = TriBool.TriBool_false; // L: 169 + } // L: 170 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1132300918" + ) + void method2121() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 173 + } // L: 174 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1003316934" + ) + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 177 + this.updateIsInClanChat(); // L: 178 + } + + return this.isInClanChat == TriBool.TriBool_true; // L: 180 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-119" + ) + @Export("transformedSize") + int transformedSize() { + return this.appearance != null && this.appearance.npcTransformId != -1 ? KeyHandler.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 184 185 187 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IILgm;I)V", + garbageValue = "626817443" + ) + final void method2125(int var1, int var2, class193 var3) { + if (super.sequence != -1 && class163.SequenceDefinition_get(super.sequence).field2158 == 1) { // L: 250 super.sequence = -1; } - super.field1160 = -1; // L: 292 - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 293 - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 294 - if (var3 == class193.field2191) { - GraphicsObject.method1860(this, var1, var2, class193.field2191); // L: 296 + super.field1121 = -1; // L: 251 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 252 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 253 + if (var3 == class193.field2187) { + class341.method6279(this, var1, var2, class193.field2187); // L: 255 } - this.method2149(var1, var2, var3); // L: 297 + this.method2127(var1, var2, var3); // L: 256 } else { this.resetPath(var1, var2); } @@ -583,53 +538,199 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 299 + } // L: 258 - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-330540951" + garbageValue = "1757316857" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 302 - super.field1134 = 0; // L: 303 - super.field1197 = 0; // L: 304 - super.pathX[0] = var1; // L: 305 - super.pathY[0] = var2; // L: 306 - int var3 = this.transformedSize(); // L: 307 - super.x = var3 * 64 + super.pathX[0] * 128; // L: 308 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 309 - } // L: 310 + super.pathLength = 0; // L: 261 + super.field1170 = 0; // L: 262 + super.field1179 = 0; // L: 263 + super.pathX[0] = var1; // L: 264 + super.pathY[0] = var2; // L: 265 + int var3 = this.transformedSize(); // L: 266 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 267 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 268 + } // L: 269 - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IILgv;B)V", - garbageValue = "-40" + descriptor = "(IILgm;B)V", + garbageValue = "71" ) - final void method2149(int var1, int var2, class193 var3) { - if (super.pathLength < 9) { // L: 313 + final void method2127(int var1, int var2, class193 var3) { + if (super.pathLength < 9) { // L: 272 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 314 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 315 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 316 - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 317 + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 273 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 274 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 275 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 276 } - super.pathX[0] = var1; // L: 319 - super.pathY[0] = var2; // L: 320 - super.pathTraversed[0] = var3; // L: 321 - } // L: 322 + super.pathX[0] = var1; // L: 278 + super.pathY[0] = var2; // L: 279 + super.pathTraversed[0] = var3; // L: 280 + } // L: 281 - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-450224469" + garbageValue = "-323504433" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 325 + return this.appearance != null; // L: 284 + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "1" + ) + static int method2112(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2892 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2893 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2894 + return 1; // L: 2895 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2897 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2898 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2899 + return 1; // L: 2900 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2902 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2903 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2904 + return 1; // L: 2905 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2907 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2908 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2909 + return 1; // L: 2910 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2912 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2913 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2914 + return 1; // L: 2915 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2917 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2918 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2919 + return 1; // L: 2920 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2922 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2923 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2924 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2925 + return 1; // L: 2926 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2928 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2929 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2930 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2931 + return 1; // L: 2932 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2934 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2935 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2936 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2937 + return 1; // L: 2938 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2940 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2941 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2942 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2943 + return 1; // L: 2944 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2946 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2947 + if (class83.grandExchangeEvents != null) { // L: 2948 + class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2949 + } + + return 1; // L: 2951 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2953 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2954 + if (class83.grandExchangeEvents != null) { // L: 2955 + class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2956 + } + + return 1; // L: 2958 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2960 + Interpreter.Interpreter_intStackSize -= 2; // L: 2961 + var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; // L: 2962 + boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2963 + if (class83.grandExchangeEvents != null) { // L: 2964 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2965 + class83.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2966 + } + + return 1; // L: 2968 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2970 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2971 + if (class83.grandExchangeEvents != null) { // L: 2972 + class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2973 + } + + return 1; // L: 2975 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2977 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2978 + if (class83.grandExchangeEvents != null) { // L: 2979 + class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2980 + } + + return 1; // L: 2982 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2984 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class83.grandExchangeEvents == null ? 0 : class83.grandExchangeEvents.events.size(); // L: 2985 + return 1; // L: 2986 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2988 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2989 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 2990 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; // L: 2991 + return 1; // L: 2992 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2994 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2995 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 2996 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2997 + return 1; // L: 2998 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3000 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3001 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3002 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3003 + return 1; // L: 3004 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3006 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3007 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3008 + long var5 = class136.method2931() - WorldMapID.field2388 - var4.age; // L: 3009 + int var7 = (int)(var5 / 3600000L); // L: 3010 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3011 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3012 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3013 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var10; // L: 3014 + return 1; // L: 3015 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3017 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3018 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3019 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3020 + return 1; // L: 3021 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3023 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3024 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3025 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3026 + return 1; // L: 3027 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3029 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3030 + var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3031 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3032 + return 1; // L: 3033 + } else { + return 2; // L: 3035 + } + } + } + } } } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index 41578db6e3..122424ca8c 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -4,51 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("kp") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("c") + @ObfuscatedName("q") + public static short[] field3304; + @ObfuscatedName("w") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("hk") + @ObfuscatedGetter( + intValue = -468225065 + ) + static int field3307; @ObfuscatedName("v") @Export("equipment") int[] equipment; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -395260877 + intValue = 1661729967 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 7721446935219214103L + longValue = -2450730779169477887L ) @Export("hash") long hash; @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -2621435945522732821L + longValue = -5318511275487729225L ) - long field3311; - @ObfuscatedName("d") + long field3301; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lff;" + descriptor = "[Lfj;" ) - class168[] field3312; - @ObfuscatedName("f") - boolean field3313; + class168[] field3302; + @ObfuscatedName("l") + boolean field3306; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 @@ -56,24 +63,24 @@ public class PlayerComposition { } public PlayerComposition() { - this.field3313 = false; // L: 21 + this.field3306 = false; // L: 21 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([I[Lff;Z[IZII)V", - garbageValue = "1774075458" + descriptor = "([I[Lfj;Z[IZII)V", + garbageValue = "-299741271" ) - public void method5604(int[] var1, class168[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field3312 = var2; // L: 30 - this.field3313 = var3; // L: 31 + public void method5570(int[] var1, class168[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field3302 = var2; // L: 30 + this.field3306 = var3; // L: 31 this.update(var1, var4, var5, var6); // L: 32 } // L: 33 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([I[IZII)V", - garbageValue = "1014278237" + garbageValue = "-1061020993" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -82,7 +89,7 @@ public class PlayerComposition { for (int var5 = 0; var5 < 7; ++var5) { // L: 38 for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 39 - KitDefinition var7 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var6); // L: 40 + KitDefinition var7 = WorldMapLabel.KitDefinition_get(var6); // L: 40 if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { // L: 41 var1[equipmentIndices[var5]] = var6 + 256; // L: 42 break; // L: 43 @@ -98,10 +105,10 @@ public class PlayerComposition { this.setHash(); // L: 52 } // L: 53 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "1696348567" + garbageValue = "771015122" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -119,12 +126,12 @@ public class PlayerComposition { } } else { ++var3; // L: 66 - if (var3 >= KitDefinition.KitDefinition_fileCount) { - var3 = 0; // L: 67 + if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67 + var3 = 0; } } - var4 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var3); // L: 69 + var4 = WorldMapLabel.KitDefinition_get(var3); // L: 69 } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 70 this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 @@ -133,320 +140,540 @@ public class PlayerComposition { } } // L: 74 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "-42" + descriptor = "(IZI)V", + garbageValue = "-730659334" ) - public void method5610(int var1, boolean var2) { + public void method5594(int var1, boolean var2) { int var3 = this.bodyColors[var1]; // L: 77 + boolean var4; if (!var2) { // L: 78 do { --var3; // L: 80 if (var3 < 0) { // L: 81 - var3 = class20.field102[var1].length - 1; // L: 82 + var3 = class144.field1629[var1].length - 1; // L: 82 } - } while(!Language.method6135(var1, var3)); // L: 84 + + if (var1 == 4 && var3 >= 8) { // L: 86 + var4 = false; // L: 87 + } else { + var4 = true; // L: 90 + } + } while(!var4); // L: 92 } else { do { - ++var3; // L: 89 - if (var3 >= class20.field102[var1].length) { // L: 90 + ++var3; // L: 97 + if (var3 >= class144.field1629[var1].length) { // L: 98 var3 = 0; } - } while(!Language.method6135(var1, var3)); // L: 91 + + if (var1 == 4 && var3 >= 8) { // L: 101 + var4 = false; // L: 102 + } else { + var4 = true; // L: 105 + } + } while(!var4); // L: 107 } - this.bodyColors[var1] = var3; // L: 94 - this.setHash(); // L: 95 - } // L: 96 + this.bodyColors[var1] = var3; // L: 110 + this.setHash(); // L: 111 + } // L: 112 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1464762664" + descriptor = "(ZB)V", + garbageValue = "23" ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { // L: 99 - this.update((int[])null, this.bodyColors, var1, -1); // L: 100 + if (this.isFemale != var1) { // L: 115 + this.update((int[])null, this.bodyColors, var1, -1); // L: 116 } - } // L: 101 + } // L: 117 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-186862071" + descriptor = "(Lpi;B)V", + garbageValue = "103" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); // L: 104 + var1.writeByte(this.isFemale ? 1 : 0); // L: 120 int var2; - for (var2 = 0; var2 < 7; ++var2) { // L: 105 - int var3 = this.equipment[equipmentIndices[var2]]; // L: 106 - if (var3 == 0) { // L: 107 + for (var2 = 0; var2 < 7; ++var2) { // L: 121 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 122 + if (var3 == 0) { // L: 123 var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); // L: 108 + var1.writeByte(var3 - 256); // L: 124 } } - for (var2 = 0; var2 < 5; ++var2) { // L: 110 + for (var2 = 0; var2 < 5; ++var2) { // L: 126 var1.writeByte(this.bodyColors[var2]); } - } // L: 111 + } // L: 127 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1419838377" + garbageValue = "720689587" ) @Export("setHash") void setHash() { - long var1 = this.hash; // L: 114 - int var3 = this.equipment[5]; // L: 115 - int var4 = this.equipment[9]; // L: 116 - this.equipment[5] = var4; // L: 117 - this.equipment[9] = var3; // L: 118 - this.hash = 0L; // L: 119 + long var1 = this.hash; // L: 130 + int var3 = this.equipment[5]; // L: 131 + int var4 = this.equipment[9]; // L: 132 + this.equipment[5] = var4; // L: 133 + this.equipment[9] = var3; // L: 134 + this.hash = 0L; // L: 135 int var5; - for (var5 = 0; var5 < 12; ++var5) { // L: 120 - this.hash <<= 4; // L: 121 - if (this.equipment[var5] >= 256) { // L: 122 + for (var5 = 0; var5 < 12; ++var5) { // L: 136 + this.hash <<= 4; // L: 137 + if (this.equipment[var5] >= 256) { // L: 138 this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { // L: 124 + if (this.equipment[0] >= 256) { // L: 140 this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { // L: 125 + if (this.equipment[1] >= 256) { // L: 141 this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { // L: 126 - this.hash <<= 3; // L: 127 - this.hash += (long)this.bodyColors[var5]; // L: 128 + for (var5 = 0; var5 < 5; ++var5) { // L: 142 + this.hash <<= 3; // L: 143 + this.hash += (long)this.bodyColors[var5]; // L: 144 } - this.hash <<= 1; // L: 130 - this.hash += (long)(this.isFemale ? 1 : 0); // L: 131 - this.equipment[5] = var3; // L: 132 - this.equipment[9] = var4; // L: 133 - if (0L != var1 && this.hash != var1 || this.field3313) { // L: 134 + this.hash <<= 1; // L: 146 + this.hash += (long)(this.isFemale ? 1 : 0); // L: 147 + this.equipment[5] = var3; // L: 148 + this.equipment[9] = var4; // L: 149 + if (0L != var1 && var1 != this.hash || this.field3306) { // L: 150 PlayerAppearance_cachedModels.remove(var1); } - } // L: 135 + } // L: 151 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgg;ILgg;II)Lhx;", - garbageValue = "755524889" + descriptor = "(Lgw;ILgw;II)Liq;", + garbageValue = "2065643699" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { // L: 138 - return class9.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 139 + if (this.npcTransformId != -1) { // L: 154 + return KeyHandler.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155 } else { - long var5 = this.hash; // L: 141 - int[] var7 = this.equipment; // L: 142 - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 143 - var7 = new int[12]; // L: 144 + long var5 = this.hash; // L: 157 + int[] var7 = this.equipment; // L: 158 + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 159 + var7 = new int[12]; // L: 160 - for (int var8 = 0; var8 < 12; ++var8) { // L: 145 + for (int var8 = 0; var8 < 12; ++var8) { // L: 161 var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { // L: 146 - var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 147 - var7[5] = var1.shield; // L: 148 + if (var1.shield >= 0) { // L: 162 + var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163 + var7[5] = var1.shield; // L: 164 } - if (var1.weapon >= 0) { // L: 150 - var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 151 - var7[3] = var1.weapon; // L: 152 + if (var1.weapon >= 0) { // L: 166 + var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167 + var7[3] = var1.weapon; // L: 168 } } - Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 155 - if (var18 == null) { // L: 156 - boolean var9 = false; // L: 157 + Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 171 + if (var18 == null) { // L: 172 + boolean var9 = false; // L: 173 int var11; - for (int var10 = 0; var10 < 12; ++var10) { // L: 158 - var11 = var7[var10]; // L: 159 - if (var11 >= 256 && var11 < 512 && !GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var11 - 256).ready()) { // L: 160 161 + for (int var10 = 0; var10 < 12; ++var10) { // L: 174 + var11 = var7[var10]; // L: 175 + if (var11 >= 256 && var11 < 512 && !WorldMapLabel.KitDefinition_get(var11 - 256).ready()) { // L: 176 177 var9 = true; } - if (var11 >= 512 && !class67.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 163 164 + if (var11 >= 512 && !class19.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180 var9 = true; } } - if (var9) { // L: 167 - if (this.field3311 != -1L) { // L: 168 - var18 = (Model)PlayerAppearance_cachedModels.get(this.field3311); + if (var9) { // L: 183 + if (this.field3301 != -1L) { // L: 184 + var18 = (Model)PlayerAppearance_cachedModels.get(this.field3301); } - if (var18 == null) { // L: 169 + if (var18 == null) { // L: 185 return null; } } - if (var18 == null) { // L: 171 - ModelData[] var19 = new ModelData[12]; // L: 172 - var11 = 0; // L: 173 + if (var18 == null) { // L: 187 + ModelData[] var19 = new ModelData[12]; // L: 188 + var11 = 0; // L: 189 int var13; - for (int var12 = 0; var12 < 12; ++var12) { // L: 174 - var13 = var7[var12]; // L: 175 - if (var13 >= 256 && var13 < 512) { // L: 176 - ModelData var14 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var13 - 256).getModelData(); // L: 177 - if (var14 != null) { // L: 178 + for (int var12 = 0; var12 < 12; ++var12) { // L: 190 + var13 = var7[var12]; // L: 191 + if (var13 >= 256 && var13 < 512) { // L: 192 + ModelData var14 = WorldMapLabel.KitDefinition_get(var13 - 256).getModelData(); // L: 193 + if (var14 != null) { // L: 194 var19[var11++] = var14; } } - if (var13 >= 512) { // L: 180 - ItemComposition var22 = class67.ItemDefinition_get(var13 - 512); // L: 181 - ModelData var15 = var22.method3693(this.isFemale); // L: 182 - if (var15 != null) { // L: 183 - if (this.field3312 != null) { // L: 184 - class168 var16 = this.field3312[var12]; // L: 185 - if (var16 != null) { // L: 186 + if (var13 >= 512) { // L: 196 + ItemComposition var22 = class19.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method3719(this.isFemale); + if (var15 != null) { + if (this.field3302 != null) { + class168 var16 = this.field3302[var12]; + if (var16 != null) { int var17; - if (var16.field1804 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1804.length) { // L: 187 - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 188 - var15.recolor(var22.recolorTo[var17], var16.field1804[var17]); // L: 189 + if (var16.field1791 != null && var22.recolorFrom != null && var16.field1791.length == var22.recolorTo.length) { + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { + var15.recolor(var22.recolorTo[var17], var16.field1791[var17]); // L: 205 } } - if (var16.field1805 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1805.length) { // L: 192 - for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 193 - var15.retexture(var22.retextureTo[var17], var16.field1805[var17]); // L: 194 + if (var16.field1790 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1790.length) { + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { + var15.retexture(var22.retextureTo[var17], var16.field1790[var17]); } } } } - var19[var11++] = var15; // L: 199 + var19[var11++] = var15; } } } - ModelData var20 = new ModelData(var19, var11); // L: 203 + ModelData var20 = new ModelData(var19, var11); - for (var13 = 0; var13 < 5; ++var13) { // L: 204 - if (this.bodyColors[var13] < class20.field102[var13].length) { // L: 205 - var20.recolor(TileItem.field1281[var13], class20.field102[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { + if (this.bodyColors[var13] < class144.field1629[var13].length) { + var20.recolor(field3304[var13], class144.field1629[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < class160.field1747[var13].length) { // L: 206 - var20.recolor(VerticalAlignment.field1950[var13], class160.field1747[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < WorldMapRectangle.field2356[var13].length) { // L: 222 + var20.recolor(WorldMapIcon_0.field2300[var13], WorldMapRectangle.field2356[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); // L: 208 - PlayerAppearance_cachedModels.put(var18, var5); // L: 209 - this.field3311 = var5; // L: 210 + var18 = var20.toModel(64, 850, -30, -50, -30); + PlayerAppearance_cachedModels.put(var18, var5); + this.field3301 = var5; } } - if (var1 == null && var3 == null) { // L: 214 + if (var1 == null && var3 == null) { return var18; } else { Model var21; - if (var1 != null && var3 != null) { // L: 215 + if (var1 != null && var3 != null) { var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { // L: 216 + } else if (var1 != null) { var21 = var1.transformActorModel(var18, var2); } else { - var21 = var3.transformActorModel(var18, var4); // L: 217 + var21 = var3.transformActorModel(var18, var4); // L: 233 } - return var21; // L: 218 + return var21; } } } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Lgt;", - garbageValue = "1206861129" + descriptor = "(I)Lhc;", + garbageValue = "-801308505" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { // L: 222 - return class9.getNpcDefinition(this.npcTransformId).getModelData(); // L: 223 + if (this.npcTransformId != -1) { // L: 238 + return KeyHandler.getNpcDefinition(this.npcTransformId).getModelData(); } else { - boolean var1 = false; // L: 225 + boolean var1 = false; int var3; - for (int var2 = 0; var2 < 12; ++var2) { // L: 226 - var3 = this.equipment[var2]; // L: 227 - if (var3 >= 256 && var3 < 512 && !GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var3 - 256).method3397()) { // L: 228 229 + for (int var2 = 0; var2 < 12; ++var2) { // L: 242 + var3 = this.equipment[var2]; + if (var3 >= 256 && var3 < 512 && !WorldMapLabel.KitDefinition_get(var3 - 256).method3447()) { var1 = true; } - if (var3 >= 512 && !class67.ItemDefinition_get(var3 - 512).method3748(this.isFemale)) { // L: 231 232 + if (var3 >= 512 && !class19.ItemDefinition_get(var3 - 512).method3723(this.isFemale)) { // L: 247 248 var1 = true; } } - if (var1) { // L: 235 + if (var1) { // L: 251 return null; } else { - ModelData[] var7 = new ModelData[12]; // L: 236 - var3 = 0; // L: 237 + ModelData[] var7 = new ModelData[12]; + var3 = 0; // L: 253 int var5; - for (int var4 = 0; var4 < 12; ++var4) { // L: 238 - var5 = this.equipment[var4]; // L: 239 + for (int var4 = 0; var4 < 12; ++var4) { + var5 = this.equipment[var4]; ModelData var6; - if (var5 >= 256 && var5 < 512) { // L: 240 - var6 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 241 - if (var6 != null) { // L: 242 + if (var5 >= 256 && var5 < 512) { + var6 = WorldMapLabel.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + if (var6 != null) { var7[var3++] = var6; } } - if (var5 >= 512) { // L: 244 - var6 = class67.ItemDefinition_get(var5 - 512).method3730(this.isFemale); // L: 245 - if (var6 != null) { // L: 246 + if (var5 >= 512) { + var6 = class19.ItemDefinition_get(var5 - 512).method3718(this.isFemale); // L: 261 + if (var6 != null) { var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); // L: 249 + ModelData var8 = new ModelData(var7, var3); // L: 265 - for (var5 = 0; var5 < 5; ++var5) { // L: 250 - if (this.bodyColors[var5] < class20.field102[var5].length) { // L: 251 - var8.recolor(TileItem.field1281[var5], class20.field102[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { + if (this.bodyColors[var5] < class144.field1629[var5].length) { + var8.recolor(field3304[var5], class144.field1629[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < class160.field1747[var5].length) { // L: 252 - var8.recolor(VerticalAlignment.field1950[var5], class160.field1747[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < WorldMapRectangle.field2356[var5].length) { + var8.recolor(WorldMapIcon_0.field2300[var5], WorldMapRectangle.field2356[var5][this.bodyColors[var5]]); } } - return var8; // L: 254 + return var8; // L: 270 } } } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1711666229" + garbageValue = "1675843128" ) @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 + class9.getNpcDefinition(this.npcTransformId).id; // L: 258 259 + 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 + KeyHandler.getNpcDefinition(this.npcTransformId).id; // L: 274 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lpz;II)V", + garbageValue = "1476146212" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 197 + if (var2) { // L: 198 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); // L: 199 + Player var4 = Client.players[var1]; // L: 200 + if (var3 == 0) { // L: 201 + if (var2) { // L: 202 + var4.field1070 = false; // L: 203 + } else if (Client.localPlayerIndex == var1) { // L: 206 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (GrandExchangeOfferOwnWorldComparator.baseX + var4.pathX[0] >> 13 << 14) + (VarcInt.baseY + var4.pathY[0] >> 13); // L: 207 + if (var4.field1121 != -1) { // L: 208 + Players.Players_orientations[var1] = var4.field1121; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 209 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 210 + Client.players[var1] = null; // L: 211 + if (var0.readBits(1) != 0) { // L: 212 + class175.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 215 + var5 = var0.readBits(3); // L: 216 + var6 = var4.pathX[0]; // L: 217 + var7 = var4.pathY[0]; // L: 218 + if (var5 == 0) { // L: 219 + --var6; // L: 220 + --var7; // L: 221 + } else if (var5 == 1) { // L: 223 + --var7; + } else if (var5 == 2) { // L: 224 + ++var6; // L: 225 + --var7; // L: 226 + } else if (var5 == 3) { // L: 228 + --var6; + } else if (var5 == 4) { // L: 229 + ++var6; + } else if (var5 == 5) { // L: 230 + --var6; // L: 231 + ++var7; // L: 232 + } else if (var5 == 6) { // L: 234 + ++var7; + } else if (var5 == 7) { // L: 235 + ++var6; // L: 236 + ++var7; // L: 237 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 239 + var4.resetPath(var6, var7); // L: 240 + var4.field1070 = false; // L: 241 + } else if (var2) { // L: 243 + var4.field1070 = true; // L: 244 + var4.tileX = var6; // L: 245 + var4.tileY = var7; // L: 246 + } else { + var4.field1070 = false; // L: 249 + var4.method2125(var6, var7, Players.field1286[var1]); // L: 250 + } + + } else if (var3 == 2) { // L: 254 + var5 = var0.readBits(4); // L: 255 + var6 = var4.pathX[0]; // L: 256 + var7 = var4.pathY[0]; // L: 257 + if (var5 == 0) { // L: 258 + var6 -= 2; // L: 259 + var7 -= 2; // L: 260 + } else if (var5 == 1) { // L: 262 + --var6; // L: 263 + var7 -= 2; // L: 264 + } else if (var5 == 2) { // L: 266 + var7 -= 2; + } else if (var5 == 3) { // L: 267 + ++var6; // L: 268 + var7 -= 2; // L: 269 + } else if (var5 == 4) { // L: 271 + var6 += 2; // L: 272 + var7 -= 2; // L: 273 + } else if (var5 == 5) { // L: 275 + var6 -= 2; // L: 276 + --var7; // L: 277 + } else if (var5 == 6) { // L: 279 + var6 += 2; // L: 280 + --var7; // L: 281 + } else if (var5 == 7) { // L: 283 + var6 -= 2; + } else if (var5 == 8) { // L: 284 + var6 += 2; + } else if (var5 == 9) { // L: 285 + var6 -= 2; // L: 286 + ++var7; // L: 287 + } else if (var5 == 10) { // L: 289 + var6 += 2; // L: 290 + ++var7; // L: 291 + } else if (var5 == 11) { // L: 293 + var6 -= 2; // L: 294 + var7 += 2; // L: 295 + } else if (var5 == 12) { // L: 297 + --var6; // L: 298 + var7 += 2; // L: 299 + } else if (var5 == 13) { // L: 301 + var7 += 2; + } else if (var5 == 14) { // L: 302 + ++var6; // L: 303 + var7 += 2; // L: 304 + } else if (var5 == 15) { // L: 306 + var6 += 2; // L: 307 + var7 += 2; // L: 308 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 310 + var4.resetPath(var6, var7); // L: 311 + var4.field1070 = false; // L: 312 + } else if (var2) { // L: 314 + var4.field1070 = true; // L: 315 + var4.tileX = var6; // L: 316 + var4.tileY = var7; // L: 317 + } else { + var4.field1070 = false; // L: 320 + var4.method2125(var6, var7, Players.field1286[var1]); // L: 321 + } + + } else { + var5 = var0.readBits(1); // L: 325 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 326 + var6 = var0.readBits(12); // L: 327 + var7 = var6 >> 10; // L: 328 + var8 = var6 >> 5 & 31; // L: 329 + if (var8 > 15) { // L: 330 + var8 -= 32; + } + + var9 = var6 & 31; // L: 331 + if (var9 > 15) { // L: 332 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 333 + var11 = var9 + var4.pathY[0]; // L: 334 + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 335 + if (var2) { // L: 339 + var4.field1070 = true; // L: 340 + var4.tileX = var10; // L: 341 + var4.tileY = var11; // L: 342 + } else { + var4.field1070 = false; // L: 345 + var4.method2125(var10, var11, Players.field1286[var1]); // L: 346 + } + } else { + var4.resetPath(var10, var11); // L: 336 + var4.field1070 = false; // L: 337 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 348 + if (Client.localPlayerIndex == var1) { // L: 349 + class18.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 352 + var7 = var6 >> 28; // L: 353 + var8 = var6 >> 14 & 16383; // L: 354 + var9 = var6 & 16383; // L: 355 + var10 = (var8 + GrandExchangeOfferOwnWorldComparator.baseX + var4.pathX[0] & 16383) - GrandExchangeOfferOwnWorldComparator.baseX; // L: 356 + var11 = (var9 + VarcInt.baseY + var4.pathY[0] & 16383) - VarcInt.baseY; // L: 357 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 358 + var4.resetPath(var10, var11); // L: 359 + var4.field1070 = false; // L: 360 + } else if (var2) { // L: 362 + var4.field1070 = true; // L: 363 + var4.tileX = var10; // L: 364 + var4.tileY = var11; // L: 365 + } else { + var4.field1070 = false; // L: 368 + var4.method2125(var10, var11, Players.field1286[var1]); // L: 369 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 371 + if (Client.localPlayerIndex == var1) { // L: 372 + class18.Client_plane = var4.plane; + } + + } + } + } + } // L: 204 213 252 323 350 373 } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 3b2d383679..72615ad0fe 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -3,105 +3,425 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kj") +@ObfuscatedName("ka") @Implements("PlayerType") public enum PlayerType implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) - field3919(6, 22, false, false, true), - @ObfuscatedName("f") + field3923(6, 22, false, false, true), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) - field3926(7, 41, false, false, true), - @ObfuscatedName("u") + field3927(7, 41, false, false, true), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lka;" ) - field3931(8, 42, false, false, true); + field3920(8, 42, false, false, true); - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1546749787 + intValue = 1109984117 ) @Export("id") final int id; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1126517569 + intValue = 571102393 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { this.id = var3; // L: 26 - this.modIcon = var4; // L: 27 - this.isPrivileged = var6; // L: 28 - this.isUser = var7; // L: 29 - } // L: 30 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 34 + this.modIcon = var4; + this.isPrivileged = var6; + this.isUser = var7; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[Lqs;", - garbageValue = "-1527934024" + descriptor = "(B)I", + garbageValue = "16" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4695, FillMode.field4698, FillMode.SOLID}; // L: 15 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 33 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llo;I)I", + garbageValue = "-380323275" + ) + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); // L: 11 + int var4 = var1.length(); // L: 12 + int var5 = 0; // L: 13 + int var6 = 0; // L: 14 + byte var7 = 0; // L: 15 + byte var8 = 0; // L: 16 + + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; + } + + if (var6 - var8 >= var4) { // L: 20 + return 1; + } + + char var9; + if (var7 != 0) { // L: 23 + var9 = (char)var7; // L: 24 + boolean var14 = false; // L: 25 + } else { + var9 = var0.charAt(var5++); // L: 27 + } + + char var10; + if (var8 != 0) { // L: 28 + var10 = (char)var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } + + byte var11; + if (var9 == 198) { // L: 35 + var11 = 69; // L: 36 + } else if (var9 == 230) { // L: 39 + var11 = 101; // L: 40 + } else if (var9 == 223) { // L: 43 + var11 = 115; // L: 44 + } else if (var9 == 338) { // L: 47 + var11 = 69; // L: 48 + } else if (var9 == 339) { // L: 51 + var11 = 101; // L: 52 + } else { + var11 = 0; // L: 55 + } + + var7 = var11; // L: 57 + byte var12; + if (var10 == 198) { // L: 60 + var12 = 69; // L: 61 + } else if (var10 == 230) { // L: 64 + var12 = 101; // L: 65 + } else if (var10 == 223) { // L: 68 + var12 = 115; // L: 69 + } else if (var10 == 338) { // L: 72 + var12 = 69; // L: 73 + } else if (var10 == 339) { // L: 76 + var12 = 101; // L: 77 + } else { + var12 = 0; // L: 80 + } + + var8 = var12; // L: 82 + var9 = class291.standardizeChar(var9, var2); // L: 83 + var10 = class291.standardizeChar(var10, var2); // L: 84 + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85 + var9 = Character.toLowerCase(var9); // L: 86 + var10 = Character.toLowerCase(var10); // L: 87 + if (var10 != var9) { // L: 88 + return SecureRandomCallable.lowercaseChar(var9, var2) - SecureRandomCallable.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); // L: 91 + + int var17; + char var20; + for (var17 = 0; var17 < var16; ++var17) { // L: 92 + if (var2 == Language.Language_FR) { // L: 93 + var5 = var3 - 1 - var17; // L: 94 + var6 = var4 - 1 - var17; // L: 95 + } else { + var6 = var17; // L: 97 + var5 = var17; + } + + char var18 = var0.charAt(var5); // L: 98 + var20 = var1.charAt(var6); // L: 99 + if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { // L: 100 + var18 = Character.toLowerCase(var18); // L: 101 + var20 = Character.toLowerCase(var20); // L: 102 + if (var18 != var20) { + return SecureRandomCallable.lowercaseChar(var18, var2) - SecureRandomCallable.lowercaseChar(var20, var2); // L: 103 + } + } + } + + var17 = var3 - var4; // L: 106 + if (var17 != 0) { // L: 107 + return var17; + } else { + for (int var19 = 0; var19 < var16; ++var19) { // L: 108 + var20 = var0.charAt(var19); // L: 109 + char var13 = var1.charAt(var19); // L: 110 + if (var13 != var20) { // L: 111 + return SecureRandomCallable.lowercaseChar(var20, var2) - SecureRandomCallable.lowercaseChar(var13, var2); + } + } + + return 0; // L: 113 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1428968028" + ) + static int method5803(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1882 + Interpreter.Interpreter_intStackSize -= 3; // L: 1883 + Actor.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); // L: 1884 + return 1; // L: 1885 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1887 + SoundCache.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1888 + return 1; // L: 1889 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1891 + Interpreter.Interpreter_intStackSize -= 2; // L: 1892 + Players.method2419(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1893 + return 1; // L: 1894 + } else { + class83 var3; + class82 var4; + int var5; + int var6; + String var7; + if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1896 + if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2008 + return var0 == 3211 ? 1 : 2; // L: 2117 2118 2120 + } else { + var3 = class83.field1064; // L: 2009 + var4 = class82.field1055; // L: 2010 + boolean var8 = false; // L: 2011 + if (var0 == 3214) { // L: 2012 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2013 + var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 2014 + if (var3 == null) { // L: 2015 + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2016 + } + } + + if (var0 == 3215) { // L: 2019 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2020 + var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 2021 + if (var4 == null) { // L: 2022 + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2023 + } + } + + if (var0 == 3210) { // L: 2026 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2027 + var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 2028 + if (var3 == null) { // L: 2029 + var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 2030 + if (var4 == null) { // L: 2031 + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2032 + } + } + } else if (var0 == 3182) { // L: 2036 + var3 = class83.field1065; // L: 2037 + } else if (var0 == 3204) { // L: 2039 + var4 = class82.field1059; // L: 2040 + } else if (var0 == 3206) { // L: 2042 + var4 = class82.field1057; // L: 2043 + } else if (var0 == 3208) { // L: 2045 + var4 = class82.field1056; // L: 2046 + } + + if (var4 == class82.field1055) { // L: 2048 + switch(var3.field1060) { // L: 2049 + case 1: + var5 = class131.clientPreferences.method2317() ? 1 : 0; // L: 2057 + break; // L: 2058 + case 2: + var5 = class131.clientPreferences.method2279() ? 1 : 0; // L: 2067 + break; // L: 2068 + case 3: + var5 = class131.clientPreferences.method2236() ? 1 : 0; // L: 2052 + break; + case 4: + var5 = class131.clientPreferences.method2238(); // L: 2062 + break; // L: 2063 + case 5: + var5 = VarbitComposition.method3578(); // L: 2072 + break; // L: 2073 + default: + var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2077 + throw new RuntimeException(var7); // L: 2078 + } + } else { + switch(var4.field1054) { // L: 2083 + case 1: + var5 = class131.clientPreferences.method2263() ? 1 : 0; // L: 2092 + break; // L: 2093 + case 2: + var6 = class131.clientPreferences.method2321(); // L: 2108 + var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2109 + break; + case 3: + var6 = class131.clientPreferences.method2243(); // L: 2102 + var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2103 + break; // L: 2104 + case 4: + var6 = class131.clientPreferences.method2270(); // L: 2086 + var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2087 + break; // L: 2088 + default: + var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2097 + throw new RuntimeException(var7); // L: 2098 + } + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; // L: 2114 + return 1; // L: 2115 + } + } else { + var3 = class83.field1064; // L: 1897 + var4 = class82.field1055; // L: 1898 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1899 + if (var0 == 3212) { // L: 1900 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1901 + var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 1902 + if (var3 == null) { // L: 1903 + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1904 + } + } + + if (var0 == 3213) { // L: 1907 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1908 + var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 1909 + if (var4 == null) { // L: 1910 + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1911 + } + } + + if (var0 == 3209) { // L: 1914 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1915 + var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 1916 + if (var3 == null) { // L: 1917 + var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 1918 + if (var4 == null) { // L: 1919 + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1920 + } + } + } else if (var0 == 3181) { // L: 1924 + var3 = class83.field1065; // L: 1925 + } else if (var0 == 3203) { // L: 1927 + var4 = class82.field1059; // L: 1928 + } else if (var0 == 3205) { // L: 1930 + var4 = class82.field1057; // L: 1931 + } else if (var0 == 3207) { // L: 1933 + var4 = class82.field1056; // L: 1934 + } + + if (var4 == class82.field1055) { // L: 1936 + switch(var3.field1060) { // L: 1937 + case 1: + class131.clientPreferences.method2230(var5 == 1); // L: 1961 + break; // L: 1962 + case 2: + class131.clientPreferences.method2237(var5 == 1); // L: 1946 + break; // L: 1947 + case 3: + class131.clientPreferences.method2234(var5 == 1); // L: 1966 + break; // L: 1967 + case 4: + if (var5 < 0) { // L: 1940 + var5 = 0; + } + + class131.clientPreferences.method2260(var5); // L: 1941 + break; + case 5: + class113.method2650(var5); // L: 1951 + break; // L: 1952 + default: + var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1956 + throw new RuntimeException(var7); // L: 1957 + } + } else { + switch(var4.field1054) { // L: 1972 + case 1: + class131.clientPreferences.method2246(var5 == 1); // L: 1980 + break; // L: 1981 + case 2: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1992 + var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1993 + class1.method11(var6); // L: 1994 + break; // L: 1995 + case 3: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1985 + var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1986 + class126.method2824(var6); // L: 1987 + break; // L: 1988 + case 4: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1999 + var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 2000 + class127.method2830(var6); // L: 2001 + break; // L: 2002 + default: + var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 1975 + throw new RuntimeException(var7); // L: 1976 + } + } + + return 1; // L: 2006 + } + } } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index a9134ba476..a7227239aa 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,67 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cg") @Implements("Players") public class Players { - @ObfuscatedName("h") - static byte[] field1288; - @ObfuscatedName("g") + @ObfuscatedName("i") + static byte[] field1283; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "[Lgm;" ) - static class193[] field1285; - @ObfuscatedName("l") + static class193[] field1286; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lpd;" + descriptor = "[Lpi;" ) - static Buffer[] field1289; + static Buffer[] field1276; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1063456779 + intValue = 1248043757 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1214047537 + intValue = -1950904155 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1240441597 + intValue = -2045827781 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) - static Buffer field1299; + static Buffer field1273; + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive5") + static Archive archive5; static { - field1288 = new byte[2048]; // L: 18 - field1285 = new class193[2048]; // L: 19 - field1289 = new Buffer[2048]; // L: 20 + field1283 = new byte[2048]; // L: 18 + field1286 = new class193[2048]; // L: 19 + field1276 = new Buffer[2048]; // L: 20 Players_count = 0; // L: 21 Players_indices = new int[2048]; // L: 22 Players_emptyIdxCount = 0; // L: 23 @@ -74,27 +80,71 @@ public class Players { Players_targetIndices = new int[2048]; // L: 27 Players_pendingUpdateCount = 0; // L: 28 Players_pendingUpdateIndices = new int[2048]; // L: 29 - field1299 = new Buffer(new byte[5000]); + field1273 = new Buffer(new byte[5000]); // L: 30 } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1554757323" + descriptor = "(IB)I", + garbageValue = "124" ) - static void method2419() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 - if (var0.stream1 != null) { // L: 31 - WorldMapIcon_1.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 - var0.stream1 = null; // L: 33 - } + public static int method2420(int var0) { + return var0 >> 17 & 7; // L: 13 + } - if (var0.stream2 != null) { // L: 35 - WorldMapIcon_1.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 - var0.stream2 = null; // L: 37 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-54" + ) + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; // L: 63 + int[] var3 = new int[4]; // L: 64 + var2[0] = var0; // L: 65 + var3[0] = var1; // L: 66 + int var4 = 1; // L: 67 + + for (int var5 = 0; var5 < 4; ++var5) { // L: 68 + if (World.World_sortOption1[var5] != var0) { // L: 69 + var2[var4] = World.World_sortOption1[var5]; // L: 70 + var3[var4] = World.World_sortOption2[var5]; // L: 71 + ++var4; // L: 72 } } - ObjectSound.objectSounds.clear(); // L: 40 - } // L: 41 + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + class127.sortWorlds(DevicePcmPlayerProvider.World_worlds, 0, DevicePcmPlayerProvider.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1709005821" + ) + static void method2421() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 240 + if (class131.clientPreferences.method2247() != null) { // L: 241 + Login.Login_username = class131.clientPreferences.method2247(); // L: 242 + Client.Login_isUsernameRemembered = true; // L: 243 + } else { + Client.Login_isUsernameRemembered = false; // L: 245 + } + + } + } // L: 246 + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "2053593928" + ) + static void method2419(int var0, int var1) { + if (class131.clientPreferences.method2321() != 0 && var0 != -1) { // L: 3622 + class18.method266(Message.archive11, var0, 0, class131.clientPreferences.method2321(), false); // L: 3623 + Client.field746 = true; // L: 3624 + } + + } // L: 3626 } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 8be187e54a..5269101bab 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qv") +@ObfuscatedName("qa") @Implements("PrivateChatMode") public class PrivateChatMode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqa;" ) - static final PrivateChatMode field4740; - @ObfuscatedName("o") + static final PrivateChatMode field4741; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqa;" ) - public static final PrivateChatMode field4738; - @ObfuscatedName("h") + public static final PrivateChatMode field4739; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqa;" ) - static final PrivateChatMode field4739; - @ObfuscatedName("g") + static final PrivateChatMode field4738; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1675526131 + intValue = -1733713795 ) - public final int field4737; + public final int field4740; static { - field4740 = new PrivateChatMode(0); // L: 5 - field4738 = new PrivateChatMode(1); // L: 6 - field4739 = new PrivateChatMode(2); + field4741 = new PrivateChatMode(0); // L: 5 + field4739 = new PrivateChatMode(1); // L: 6 + field4738 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field4737 = var1; // L: 15 - } // L: 16 + this.field4740 = var1; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index c6f467601c..b3c3d420b8 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -3,140 +3,131 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bs") +@ObfuscatedName("by") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - static Bounds field946; - @ObfuscatedName("ok") - @ObfuscatedGetter( - intValue = 1774721187 - ) - static int field944; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 635126401 + intValue = 1442012707 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1804600121 + intValue = 895014891 ) @Export("plane") int plane; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -865645861 + intValue = -420653117 ) @Export("sourceX") int sourceX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 823151717 + intValue = -1496061701 ) @Export("sourceY") int sourceY; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1640532067 + intValue = 1469136561 ) @Export("sourceZ") int sourceZ; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1908333049 + intValue = -1839040857 ) @Export("endHeight") int endHeight; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1093018891 + intValue = 1959449499 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 129177565 + intValue = -1003905831 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1426433187 + intValue = -466516667 ) @Export("slope") int slope; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1732852593 + intValue = 1789079227 ) @Export("startHeight") int startHeight; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -552309999 + intValue = 1371380693 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("isMoving") boolean isMoving; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("x") double x; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("y") double y; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("z") double z; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("speedX") double speedX; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("speedY") double speedY; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("speed") double speed; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("speedZ") double speedZ; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 747032263 + intValue = -1968761335 ) @Export("yaw") int yaw; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1515393455 + intValue = 1799408283 ) @Export("pitch") int pitch; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lgw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1010884921 + intValue = -957445753 ) @Export("frame") int frame; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 637494227 + intValue = 75771285 ) @Export("frameCycle") int frameCycle; @@ -157,9 +148,9 @@ public final class Projectile extends Renderable { this.targetIndex = var10; // L: 45 this.endHeight = var11; // L: 46 this.isMoving = false; // L: 47 - int var12 = class6.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + int var12 = ClientPreferences.SpotAnimationDefinition_get(this.id).sequence; // L: 48 if (var12 != -1) { // L: 49 - this.sequenceDefinition = ItemContainer.SequenceDefinition_get(var12); + this.sequenceDefinition = class163.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; // L: 50 } @@ -168,8 +159,8 @@ public final class Projectile extends Renderable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1216965669" + descriptor = "(IIIIB)V", + garbageValue = "5" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -177,33 +168,33 @@ public final class Projectile extends Renderable { if (!this.isMoving) { // L: 54 var5 = (double)(var1 - this.sourceX); // L: 55 double var7 = (double)(var2 - this.sourceY); // L: 56 - double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 - this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; // L: 58 - this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59 + double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57 + this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; // L: 58 + this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; // L: 59 this.z = (double)this.sourceZ; // L: 60 } var5 = (double)(this.cycleEnd + 1 - var4); // L: 62 this.speedX = ((double)var1 - this.x) / var5; // L: 63 this.speedY = ((double)var2 - this.y) / var5; // L: 64 - this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); // L: 65 + this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65 if (!this.isMoving) { // L: 66 this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); // L: 67 + this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67 } // L: 68 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" + descriptor = "(B)Liq;", + garbageValue = "103" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class6.SpotAnimationDefinition_get(this.id); // L: 101 - Model var2 = var1.getModel(this.frame); // L: 102 - if (var2 == null) { // L: 103 + SpotAnimationDefinition var1 = ClientPreferences.SpotAnimationDefinition_get(this.id); + Model var2 = var1.getModel(this.frame); + if (var2 == null) { return null; } else { var2.rotateZ(this.pitch); // L: 104 @@ -211,65 +202,596 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "104" + descriptor = "(II)V", + garbageValue = "385748138" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; // L: 71 - this.x += (double)var1 * this.speedX; // L: 72 - this.y += (double)var1 * this.speedY; // L: 73 - this.z += (double)var1 * this.speedZ + (double)var1 * (double)var1 * 0.5D * this.accelerationZ; // L: 74 - this.speedZ += (double)var1 * this.accelerationZ; // L: 75 - this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76 - this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77 - if (this.sequenceDefinition != null) { // L: 78 - if (!this.sequenceDefinition.isCachedModelIdSet()) { // L: 79 - this.frameCycle += var1; // L: 80 + this.isMoving = true; + this.x += this.speedX * (double)var1; + this.y += this.speedY * (double)var1; // L: 73 + this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; + this.speedZ += this.accelerationZ * (double)var1; + this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; + this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; + if (this.sequenceDefinition != null) { + if (!this.sequenceDefinition.isCachedModelIdSet()) { + this.frameCycle += var1; while (true) { do { do { - if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 81 - return; // L: 98 + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { + return; } this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 82 ++this.frame; // L: 83 - } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 84 + } while(this.frame < this.sequenceDefinition.frameIds.length); - this.frame -= this.sequenceDefinition.frameCount; // L: 85 - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 86 + this.frame -= this.sequenceDefinition.frameCount; + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); this.frame = 0; } } else { this.frame += var1; // L: 91 - int var2 = this.sequenceDefinition.method3827(); // L: 92 - if (this.frame >= var2) { // L: 93 - this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94 + int var2 = this.sequenceDefinition.method3844(); // L: 92 + if (this.frame >= var2) { + this.frame = var2 - this.sequenceDefinition.frameCount; } } } } - @ObfuscatedName("hw") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-27" + descriptor = "(IIB)V", + garbageValue = "-17" ) - static final void method1957() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7361 7362 7368 - if (var0.hitpoints == -1) { // L: 7363 - var0.delay = 0; // L: 7364 - WorldMapRegion.method4795(var0); // L: 7365 - } else { - var0.remove(); // L: 7367 + static void method1975(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); + if (var4 != null) { + NetCache.NetCache_pendingWritesQueue.addLast(var4); + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lpz;II)V", + garbageValue = "168694674" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + int var3 = 0; // L: 74 + var0.importIndex(); // L: 75 + + byte[] var10000; + int var4; + int var6; + int var7; + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 + var7 = Players.Players_indices[var4]; // L: 77 + if ((Players.field1283[var7] & 1) == 0) { // L: 78 + if (var3 > 0) { // L: 79 + --var3; // L: 80 + var10000 = Players.field1283; // L: 81 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 84 + if (var6 == 0) { // L: 85 + var3 = LoginPacket.method5195(var0); // L: 86 + var10000 = Players.field1283; // L: 87 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + PlayerComposition.readPlayerUpdate(var0, var7); // L: 90 + } + } } } - } // L: 7370 + var0.exportIndex(); // L: 93 + if (var3 != 0) { // L: 94 + throw new RuntimeException(); // L: 95 + } else { + var0.importIndex(); // L: 97 + + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 + var7 = Players.Players_indices[var4]; // L: 99 + if ((Players.field1283[var7] & 1) != 0) { // L: 100 + if (var3 > 0) { // L: 101 + --var3; // L: 102 + var10000 = Players.field1283; // L: 103 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 106 + if (var6 == 0) { // L: 107 + var3 = LoginPacket.method5195(var0); // L: 108 + var10000 = Players.field1283; // L: 109 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + PlayerComposition.readPlayerUpdate(var0, var7); // L: 112 + } + } + } + } + + var0.exportIndex(); // L: 115 + if (var3 != 0) { // L: 116 + throw new RuntimeException(); // L: 117 + } else { + var0.importIndex(); // L: 119 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 + var7 = Players.Players_emptyIndices[var4]; // L: 121 + if ((Players.field1283[var7] & 1) != 0) { // L: 122 + if (var3 > 0) { // L: 123 + --var3; // L: 124 + var10000 = Players.field1283; // L: 125 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 128 + if (var6 == 0) { // L: 129 + var3 = LoginPacket.method5195(var0); // L: 130 + var10000 = Players.field1283; // L: 131 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (class175.updateExternalPlayer(var0, var7)) { // L: 134 + var10000 = Players.field1283; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 137 + if (var3 != 0) { // L: 138 + throw new RuntimeException(); // L: 139 + } else { + var0.importIndex(); // L: 141 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 + var7 = Players.Players_emptyIndices[var4]; // L: 143 + if ((Players.field1283[var7] & 1) == 0) { // L: 144 + if (var3 > 0) { // L: 145 + --var3; // L: 146 + var10000 = Players.field1283; // L: 147 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 150 + if (var6 == 0) { // L: 151 + var3 = LoginPacket.method5195(var0); // L: 152 + var10000 = Players.field1283; // L: 153 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (class175.updateExternalPlayer(var0, var7)) { // L: 156 + var10000 = Players.field1283; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 159 + if (var3 != 0) { // L: 160 + throw new RuntimeException(); // L: 161 + } else { + Players.Players_count = 0; // L: 163 + Players.Players_emptyIdxCount = 0; // L: 164 + + Player var5; + for (var4 = 1; var4 < 2048; ++var4) { // L: 165 + var10000 = Players.field1283; // L: 166 + var10000[var4] = (byte)(var10000[var4] >> 1); + var5 = Client.players[var4]; // L: 167 + if (var5 != null) { // L: 168 + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 + } + } + + for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173 + var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174 + var5 = Client.players[var4]; // L: 175 + var6 = var0.readUnsignedByte(); // L: 176 + if ((var6 & 64) != 0) { // L: 177 + var6 += var0.readUnsignedByte() << 8; + } + + Login.method1932(var0, var4, var5, var6); // L: 178 + } + + if (var0.offset - var2 != var1) { // L: 181 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 182 + } + } + } + } + } + } // L: 184 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-574030857" + ) + static int method1976(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1470 + var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1471 + Actor.addGameMessage(0, "", var7); // L: 1472 + return 1; // L: 1473 + } else if (var0 == ScriptOpcodes.ANIM) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1476 + GrandExchangeOfferOwnWorldComparator.performPlayerAnimation(GrandExchangeEvents.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1477 + return 1; // L: 1478 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field842) { // L: 1481 + Interpreter.field841 = true; // L: 1482 + } + + return 1; // L: 1484 + } else { + int var15; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1487 + var15 = 0; // L: 1488 + if (class300.isNumber(var7)) { // L: 1489 + var15 = class19.method288(var7); + } + + PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 1491 + var13.packetBuffer.writeInt(var15); // L: 1492 + Client.packetWriter.addNode(var13); // L: 1493 + return 1; // L: 1494 + } else { + PacketBufferNode var11; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1497 + var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 1499 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501 + Client.packetWriter.addNode(var11); // L: 1502 + return 1; // L: 1503 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1506 + var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 1508 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510 + Client.packetWriter.addNode(var11); // L: 1511 + return 1; // L: 1512 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1515 + var4 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1516 + MidiPcmStream.method5366(var10, var4); // L: 1517 + return 1; // L: 1518 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 3; // L: 1521 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1522 + var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1523 + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1524 + Widget var14 = class127.getWidget(var9); // L: 1525 + ParamComposition.clickWidget(var14, var10, var15); // L: 1526 + return 1; // L: 1527 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1530 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1531 + var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1532 + Widget var12 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1533 + ParamComposition.clickWidget(var12, var10, var15); // L: 1534 + return 1; // L: 1535 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + GameBuild.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1538 + return 1; // L: 1539 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2263() ? 1 : 0; // L: 1542 + return 1; // L: 1543 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + class131.clientPreferences.method2246(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1546 + return 1; // L: 1547 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1550 + boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1551 + class391.openURL(var7, var8, false); // L: 1552 + return 1; // L: 1553 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1556 + var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 1558 + var11.packetBuffer.writeShort(var10); // L: 1559 + Client.packetWriter.addNode(var11); // L: 1560 + return 1; // L: 1561 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1564 + class122.Interpreter_stringStackSize -= 2; // L: 1565 + var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 1566 + String var5 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 1567 + if (var4.length() > 500) { // L: 1568 + return 1; + } else if (var5.length() > 500) { // L: 1569 + return 1; + } else { + PacketBufferNode var6 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2926, Client.packetWriter.isaacCipher); // L: 1570 + var6.packetBuffer.writeShort(1 + class425.stringCp1252NullTerminatedByteSize(var4) + class425.stringCp1252NullTerminatedByteSize(var5)); // L: 1571 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1572 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1573 + var6.packetBuffer.method7703(var10); // L: 1574 + Client.packetWriter.addNode(var6); // L: 1575 + return 1; // L: 1576 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1579 + return 1; // L: 1580 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1583 + return 1; // L: 1584 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1587 + return 1; // L: 1588 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1591 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1592 + } + + return 1; // L: 1593 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1596 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1597 + } + + return 1; // L: 1598 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1601 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1602 + } + + return 1; // L: 1603 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1606 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1607 + } + + return 1; // L: 1608 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1611 + return 1; // L: 1612 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1615 + return 1; // L: 1616 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1619 + return 1; // L: 1620 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1623 + return 1; // L: 1624 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = User.getTapToDrop() ? 1 : 0; // L: 1627 + return 1; // L: 1628 + } else if (var0 == 3129) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1631 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1632 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1633 + return 1; // L: 1634 + } else if (var0 == 3130) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1637 + return 1; // L: 1638 + } else if (var0 == 3131) { + --Interpreter.Interpreter_intStackSize; // L: 1641 + return 1; // L: 1642 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth; // L: 1645 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class321.canvasHeight; // L: 1646 + return 1; // L: 1647 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --Interpreter.Interpreter_intStackSize; // L: 1650 + return 1; // L: 1651 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1654 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1657 + return 1; // L: 1658 + } else if (var0 == 3136) { + Client.field668 = 3; // L: 1661 + Client.field628 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1662 + return 1; // L: 1663 + } else if (var0 == 3137) { + Client.field668 = 2; // L: 1666 + Client.field628 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1667 + return 1; // L: 1668 + } else if (var0 == 3138) { + Client.field668 = 0; // L: 1671 + return 1; // L: 1672 + } else if (var0 == 3139) { + Client.field668 = 1; // L: 1675 + return 1; // L: 1676 + } else if (var0 == 3140) { + Client.field668 = 3; // L: 1679 + Client.field628 = var2 ? WorldMapID.scriptDotWidget.id * 1389111653 * 785571949 : Interpreter.scriptActiveWidget.id * 1389111653 * 785571949; // L: 1680 + return 1; // L: 1681 + } else { + boolean var3; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1684 + class131.clientPreferences.method2230(var3); // L: 1685 + return 1; // L: 1686 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2317() ? 1 : 0; // L: 1689 + return 1; // L: 1690 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1693 + Client.Login_isUsernameRemembered = var3; // L: 1694 + if (!var3) { // L: 1695 + class131.clientPreferences.method2286(""); // L: 1696 + } + + return 1; // L: 1698 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701 + return 1; // L: 1702 + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; // L: 1705 + } else if (var0 == 3146) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1708 + class131.clientPreferences.method2237(!var3); // L: 1709 + return 1; // L: 1710 + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2279() ? 0 : 1; // L: 1713 + return 1; // L: 1714 + } else if (var0 == 3148) { + return 1; // L: 1717 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1720 + return 1; // L: 1721 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1724 + return 1; // L: 1725 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1728 + return 1; // L: 1729 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1732 + return 1; // L: 1733 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736 + return 1; // L: 1737 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class166.method3342(); // L: 1740 + return 1; // L: 1741 + } else if (var0 == 3155) { + --class122.Interpreter_stringStackSize; // L: 1744 + return 1; // L: 1745 + } else if (var0 == 3156) { + return 1; // L: 1748 + } else if (var0 == 3157) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1751 + return 1; // L: 1752 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1755 + return 1; // L: 1756 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1759 + return 1; // L: 1760 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1763 + return 1; // L: 1764 + } else if (var0 == 3161) { + --Interpreter.Interpreter_intStackSize; // L: 1767 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1768 + return 1; // L: 1769 + } else if (var0 == 3162) { + --Interpreter.Interpreter_intStackSize; // L: 1772 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1773 + return 1; // L: 1774 + } else if (var0 == 3163) { + --class122.Interpreter_stringStackSize; // L: 1777 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1778 + return 1; // L: 1779 + } else if (var0 == 3164) { + --Interpreter.Interpreter_intStackSize; // L: 1782 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1783 + return 1; // L: 1784 + } else if (var0 == 3165) { + --Interpreter.Interpreter_intStackSize; // L: 1787 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1788 + return 1; // L: 1789 + } else if (var0 == 3166) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1792 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1793 + return 1; // L: 1794 + } else if (var0 == 3167) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1797 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1798 + return 1; // L: 1799 + } else if (var0 == 3168) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1802 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1803 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1804 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1805 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1806 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1807 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1808 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1809 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1810 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1811 + return 1; // L: 1812 + } else if (var0 == 3169) { + return 1; // L: 1815 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1818 + return 1; // L: 1819 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1822 + return 1; // L: 1823 + } else if (var0 == 3172) { + --Interpreter.Interpreter_intStackSize; // L: 1826 + return 1; // L: 1827 + } else if (var0 == 3173) { + --Interpreter.Interpreter_intStackSize; // L: 1830 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1831 + return 1; // L: 1832 + } else if (var0 == 3174) { + --Interpreter.Interpreter_intStackSize; // L: 1835 + return 1; // L: 1836 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1839 + return 1; // L: 1840 + } else if (var0 == 3176) { + return 1; // L: 1843 + } else if (var0 == 3177) { + return 1; // L: 1846 + } else if (var0 == 3178) { + --class122.Interpreter_stringStackSize; // L: 1849 + return 1; // L: 1850 + } else if (var0 == 3179) { + return 1; // L: 1853 + } else if (var0 == 3180) { + --class122.Interpreter_stringStackSize; // L: 1856 + return 1; // L: 1857 + } else if (var0 == 3181) { + class113.method2650(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1860 + return 1; // L: 1861 + } else if (var0 == 3182) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarbitComposition.method3578(); // L: 1864 + return 1; // L: 1865 + } else if (var0 != 3183 && var0 != 3184) { + if (var0 == 3187) { + class122.Interpreter_stringStackSize -= 2; // L: 1872 + return 1; // L: 1873 + } else { + return var0 == 3188 ? 1 : 2; // L: 1876 1878 + } + } else { + --Interpreter.Interpreter_intStackSize; // L: 1868 + return 1; // L: 1869 + } + } + } + } + } + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-875242540" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 11171 + } // L: 11172 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index af5b444936..ccb6c897ee 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("at") +@ObfuscatedName("ak") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("v") @Export("component") Component component; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("image") Image image; @@ -38,64 +38,64 @@ public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1909552115" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "13" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1725746556" + descriptor = "(IIS)V", + garbageValue = "131" ) @Export("drawFull") public final void drawFull(int var1, int var2) { - this.drawFull0(this.component.getGraphics(), var1, var2); // L: 40 - } // L: 41 + this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 + } // L: 40 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1732987846" + garbageValue = "-1598391098" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 45 - } // L: 46 + this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 + } // L: 44 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIB)V", - garbageValue = "6" + descriptor = "(Ljava/awt/Graphics;III)V", + garbageValue = "-1968025029" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { - var1.drawImage(this.image, var2, var3, this.component); // L: 50 - } catch (Exception var5) { // L: 52 - this.component.repaint(); // L: 53 + var1.drawImage(this.image, var2, var3, this.component); // L: 48 + } catch (Exception var5) { // L: 50 + this.component.repaint(); // L: 51 } - } // L: 55 + } // L: 53 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "1065132924" + garbageValue = "-1773855404" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { - Shape var6 = var1.getClip(); // L: 59 - var1.clipRect(var2, var3, var4, var5); // L: 60 - var1.drawImage(this.image, 0, 0, this.component); // L: 61 - var1.setClip(var6); // L: 62 - } catch (Exception var7) { // L: 64 - this.component.repaint(); // L: 65 + Shape var6 = var1.getClip(); // L: 57 + var1.clipRect(var2, var3, var4, var5); // L: 58 + var1.drawImage(this.image, 0, 0, this.component); // L: 59 + var1.setClip(var6); // L: 60 + } catch (Exception var7) { // L: 62 + this.component.repaint(); // L: 63 } - } // L: 67 + } // L: 65 } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 4db47e0ba6..f2f526f1f8 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("qm") +@ObfuscatedName("ql") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("at") + @ObfuscatedName("ak") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("dg") + @ObfuscatedName("ds") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("dj") + @ObfuscatedName("dc") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 } // L: 30 - @ObfuscatedName("dk") + @ObfuscatedName("dm") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("dw") + @ObfuscatedName("dv") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("ds") + @ObfuscatedName("da") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("dc") + @ObfuscatedName("di") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("dy") + @ObfuscatedName("dt") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("di") + @ObfuscatedName("df") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 @@ -225,8 +225,8 @@ public class Rasterizer2D extends DualNode { var14 = var12 + var6 * Rasterizer2D_width; // L: 127 - for (var15 = var12; var15 <= var13; ++var15) { // L: 128 - Rasterizer2D_pixels[var14++] = var3; + for (var15 = var12; var15 <= var13; ++var15) { + Rasterizer2D_pixels[var14++] = var3; // L: 128 } ++var6; // L: 129 @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("dz") + @ObfuscatedName("dk") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } // L: 139 207 - @ObfuscatedName("do") + @ObfuscatedName("du") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("dv") + @ObfuscatedName("dz") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } // L: 253 - @ObfuscatedName("dx") + @ObfuscatedName("do") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { // L: 256 @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("du") + @ObfuscatedName("dw") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { // L: 285 @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("da") + @ObfuscatedName("dl") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("dr") + @ObfuscatedName("dn") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("dp") + @ObfuscatedName("db") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390 @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("df") + @ObfuscatedName("dh") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("db") + @ObfuscatedName("dq") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } // L: 431 - @ObfuscatedName("dt") + @ObfuscatedName("dy") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("dl") + @ObfuscatedName("ec") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("eu") + @ObfuscatedName("es") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } // L: 475 480 524 - @ObfuscatedName("ee") + @ObfuscatedName("el") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } // L: 529 - @ObfuscatedName("em") + @ObfuscatedName("ej") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index d400aa175b..591feb82b2 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("hb") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("v") - static boolean field2334; - @ObfuscatedName("o") - static boolean field2323; - @ObfuscatedName("h") + static boolean field2562; + @ObfuscatedName("c") + static boolean field2558; + @ObfuscatedName("i") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("g") - public static boolean field2325; - @ObfuscatedName("l") + @ObfuscatedName("f") + public static boolean field2553; + @ObfuscatedName("b") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; @ObfuscatedName("y") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Liw;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; @ObfuscatedName("e") - static int[] field2345; - @ObfuscatedName("t") - static int[] field2346; - @ObfuscatedName("i") + static int[] field2573; + @ObfuscatedName("z") + static int[] field2571; + @ObfuscatedName("h") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2334 = false; // L: 8 - field2323 = false; // L: 9 + field2562 = false; // L: 8 + field2558 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field2325 = true; // L: 11 + field2553 = true; // L: 11 Rasterizer3D_alpha = 0; // L: 12 Rasterizer3D_zoom = 512; // L: 19 Rasterizer3D_rowOffsets = new int[1024]; // L: 28 Rasterizer3D_colorPalette = new int[65536]; // L: 29 - field2345 = new int[512]; // L: 31 - field2346 = new int[2048]; // L: 32 + field2573 = new int[512]; // L: 31 + field2571 = new int[2048]; // L: 32 Rasterizer3D_sine = new int[2048]; // L: 33 Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field2345[var0] = 32768 / var0; // L: 38 + field2573[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field2346[var0] = 65536 / var0; // L: 41 + field2571[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -104,14 +104,14 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 } // L: 55 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; // L: 58 Rasterizer3D_clipHeight = var3 - var1; // L: 59 Rasterizer3D_method3(); // L: 60 if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 - Rasterizer3D_rowOffsets = new int[Login.method1894(Rasterizer3D_clipHeight)]; + Rasterizer3D_rowOffsets = new int[class67.method1909(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 @@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 67 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 @@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 } // L: 76 - @ObfuscatedName("g") - public static final void method3997(int var0, int var1) { + @ObfuscatedName("f") + public static final void method4631(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 @@ -147,9 +147,9 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 } // L: 88 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lht;)V" + descriptor = "(Liw;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { @@ -162,7 +162,7 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 } // L: 96 - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; // L: 99 @@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 140 - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 @@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @ObfuscatedName("u") - public static void method4024(int var0, int var1, int var2) { - field2334 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + @ObfuscatedName("q") + public static void method4673(int var0, int var1, int var2) { + field2562 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 } // L: 157 - @ObfuscatedName("r") - static final void method4003(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("o") + static final void method4613(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = var4 - var3; // L: 160 int var10 = var1 - var0; // L: 161 int var11 = var5 - var3; // L: 162 @@ -767,16 +767,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("k") - static final void method4084(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) { - var6 = method4005(var6, var9, var10, var11, var12); // L: 544 - var7 = method4005(var7, var9, var10, var11, var12); // L: 545 - var8 = method4005(var8, var9, var10, var11, var12); // L: 546 - method4003(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547 + @ObfuscatedName("r") + static final void method4614(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) { + var6 = method4615(var6, var9, var10, var11, var12); // L: 544 + var7 = method4615(var7, var9, var10, var11, var12); // L: 545 + var8 = method4615(var8, var9, var10, var11, var12); // L: 546 + method4613(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547 } // L: 548 - @ObfuscatedName("x") - static int method4005(int var0, byte var1, byte var2, byte var3, byte var4) { + @ObfuscatedName("p") + static int method4615(int var0, byte var1, byte var2, byte var3, byte var4) { int var5 = var0 >> 10 & 63; // L: 551 int var6 = var0 >> 7 & 7; // L: 552 int var7 = var0 & 127; // L: 553 @@ -796,10 +796,10 @@ public class Rasterizer3D extends Rasterizer2D { return (var5 << 10 | var6 << 7 | var7) & 65535; // L: 564 } - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (field2334) { // L: 568 + if (field2562) { // L: 568 if (var5 > Rasterizer3D_clipWidth) { // L: 569 var5 = Rasterizer3D_clipWidth; } @@ -816,7 +816,7 @@ public class Rasterizer3D extends Rasterizer2D { int var9; int var10; int var11; - if (field2325) { // L: 575 + if (field2553) { // L: 575 var3 = var5 - var4 >> 2; // L: 576 var7 <<= 2; // L: 577 if (Rasterizer3D_alpha == 0) { // L: 578 @@ -906,8 +906,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 629 652 - @ObfuscatedName("j") - public static final void method4007(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("k") + public static final void method4617(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; // L: 657 if (var0 != var1) { // L: 658 var7 = (var4 - var3 << 14) / (var1 - var0); // L: 659 @@ -1362,17 +1362,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("p") - static final void method4008(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) { - int var11 = method4005(var6, var7, var8, var9, var10); // L: 981 + @ObfuscatedName("d") + static final void method4618(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) { + int var11 = method4615(var6, var7, var8, var9, var10); // L: 981 var6 = Rasterizer3D_colorPalette[var11]; // L: 982 - method4007(var0, var1, var2, var3, var4, var5, var6); // L: 983 + method4617(var0, var1, var2, var3, var4, var5, var6); // L: 983 } // L: 984 - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2334) { // L: 987 + if (field2562) { // L: 987 if (var5 > Rasterizer3D_clipWidth) { // L: 988 var5 = Rasterizer3D_clipWidth; } @@ -1464,16 +1464,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("b") - static final void method4010(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 method4620(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1041 int var20; if (var19 == null) { // L: 1042 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1043 - method4003(var0, var1, var2, var3, var4, var5, method4014(var20, var6), method4014(var20, var7), method4014(var20, var8)); // L: 1044 + method4613(var0, var1, var2, var3, var4, var5, method4648(var20, var6), method4648(var20, var7), method4648(var20, var8)); // L: 1044 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1047 - field2323 = Rasterizer3D_textureLoader.vmethod4505(var18); // L: 1048 + field2558 = Rasterizer3D_textureLoader.vmethod5096(var18); // L: 1048 var20 = var4 - var3; // L: 1049 int var21 = var1 - var0; // L: 1050 int var22 = var5 - var3; // L: 1051 @@ -2085,10 +2085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1045 - @ObfuscatedName("w") + @ObfuscatedName("t") @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 (field2334) { // L: 1523 + if (field2562) { // L: 1523 if (var6 > Rasterizer3D_clipWidth) { // L: 1524 var6 = Rasterizer3D_clipWidth; } @@ -2152,7 +2152,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1568 var8 <<= 3; // L: 1569 var15 = var7 >> 8; // L: 1570 - if (field2323) { // L: 1571 + if (field2558) { // L: 1571 if (var17 > 0) { // L: 1572 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1574 @@ -2347,7 +2347,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1743 var8 <<= 3; // L: 1744 var15 = var7 >> 8; // L: 1745 - if (field2323) { // L: 1746 + if (field2558) { // L: 1746 if (var17 > 0) { // L: 1747 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1749 @@ -2506,17 +2506,17 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1881 - @ObfuscatedName("a") + @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); // L: 1884 int var20; if (var19 == null) { // L: 1885 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1886 - method4003(var0, var1, var2, var3, var4, var5, method4014(var20, var6), method4014(var20, var7), method4014(var20, var8)); // L: 1887 + method4613(var0, var1, var2, var3, var4, var5, method4648(var20, var6), method4648(var20, var7), method4648(var20, var8)); // L: 1887 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1890 - field2323 = Rasterizer3D_textureLoader.vmethod4505(var18); // L: 1891 + field2558 = Rasterizer3D_textureLoader.vmethod5096(var18); // L: 1891 var20 = var4 - var3; // L: 1892 int var21 = var1 - var0; // L: 1893 int var22 = var5 - var3; // L: 1894 @@ -2588,41 +2588,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1942 var35 += var37 * var41; // L: 1943 var38 += var40 * var41; // L: 1944 - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1945 - var2 -= var1; // L: 1946 - var1 -= var0; // L: 1947 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1948 - - while (true) { - --var1; // L: 1949 - if (var1 < 0) { - while (true) { - --var2; // L: 1959 - if (var2 < 0) { - return; // L: 1969 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1960 - var5 += var28; // L: 1961 - var4 += var27; // L: 1962 - var6 += var31; // L: 1963 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1964 - var32 += var34; // L: 1965 - var35 += var37; // L: 1966 - var38 += var40; // L: 1967 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1950 - var5 += var28; // L: 1951 - var3 += var26; // L: 1952 - var6 += var31; // L: 1953 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1954 - var32 += var34; // L: 1955 - var35 += var37; // L: 1956 - var38 += var40; // L: 1957 - } - } else { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1945 var2 -= var1; // L: 1972 var1 -= var0; // L: 1973 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1974 @@ -2656,6 +2622,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1982 var38 += var40; // L: 1983 } + } else { + var2 -= var1; // L: 1946 + var1 -= var0; // L: 1947 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1948 + + while (true) { + --var1; // L: 1949 + if (var1 < 0) { + while (true) { + --var2; // L: 1959 + if (var2 < 0) { + return; // L: 1969 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1960 + var5 += var28; // L: 1961 + var4 += var27; // L: 1962 + var6 += var31; // L: 1963 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1964 + var32 += var34; // L: 1965 + var35 += var37; // L: 1966 + var38 += var40; // L: 1967 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1950 + var5 += var28; // L: 1951 + var3 += var26; // L: 1952 + var6 += var31; // L: 1953 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1954 + var32 += var34; // L: 1955 + var35 += var37; // L: 1956 + var38 += var40; // L: 1957 + } } } else { var4 = var3 <<= 14; // L: 1999 @@ -3128,10 +3128,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1888 - @ObfuscatedName("m") + @ObfuscatedName("x") @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 (field2334) { // L: 2366 + if (field2562) { // L: 2366 if (var6 > Rasterizer3D_clipWidth) { // L: 2367 var6 = Rasterizer3D_clipWidth; } @@ -3184,7 +3184,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2408 var8 <<= 3; // L: 2409 var15 = var7 >> 8; // L: 2410 - if (field2323) { // L: 2412 + if (field2558) { // L: 2412 if (var17 > 0) { // L: 2413 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2415 @@ -3327,7 +3327,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2545 var8 <<= 3; // L: 2546 var15 = var7 >> 8; // L: 2547 - if (field2323) { // L: 2549 + if (field2558) { // L: 2549 if (var17 > 0) { // L: 2550 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2552 @@ -3444,8 +3444,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 2648 - @ObfuscatedName("q") - static final int method4014(int var0, int var1) { + @ObfuscatedName("a") + static final int method4648(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 2651 if (var1 < 2) { // L: 2652 var1 = 2; @@ -3457,32 +3457,32 @@ public class Rasterizer3D extends Rasterizer2D { } @ObfuscatedName("y") - static final int method4080(int var0, int var1, int var2, int var3) { + static final int method4626(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2658 } - @ObfuscatedName("z") - static final int method3993(int var0, int var1, int var2, int var3) { + @ObfuscatedName("j") + static final int method4663(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2662 } @ObfuscatedName("e") - static final int method4017(int var0, int var1, int var2, int var3) { + static final int method4627(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; // L: 2666 } - @ObfuscatedName("t") - static final int method4018(int var0, int var1, int var2, int var3) { + @ObfuscatedName("z") + static final int method4628(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; // L: 2670 } - @ObfuscatedName("i") - static final int method4019(int var0, int var1, int var2, int var3) { + @ObfuscatedName("h") + static final int method4656(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2674 } - @ObfuscatedName("ac") - static final int method4020(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ae") + static final int method4630(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2678 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 655314d9e6..8ef7aa1205 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("am") +@ObfuscatedName("au") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { @ObfuscatedName("v") - int field338; - @ObfuscatedName("o") + int field329; + @ObfuscatedName("c") + int field328; + @ObfuscatedName("i") int field335; - @ObfuscatedName("h") - int field334; - @ObfuscatedName("g") - int field339; - @ObfuscatedName("l") - int field337; - @ObfuscatedName("n") - int field347; - @ObfuscatedName("d") - int field340; @ObfuscatedName("f") + int field330; + @ObfuscatedName("b") + int field331; + @ObfuscatedName("n") + int field336; + @ObfuscatedName("s") + int field333; + @ObfuscatedName("l") @Export("numLoops") int numLoops; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("start") int start; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("k") - boolean field344; - @ObfuscatedName("x") - int field345; - @ObfuscatedName("c") - int field346; - @ObfuscatedName("j") - int field336; + @ObfuscatedName("r") + boolean field337; @ObfuscatedName("p") - int field348; + int field338; + @ObfuscatedName("k") + int field339; + @ObfuscatedName("d") + int field340; + @ObfuscatedName("m") + int field327; @ObfuscatedSignature( - descriptor = "(Laj;III)V" + descriptor = "(Lat;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; // L: 51 this.start = var1.start; // L: 52 this.end = var1.end; // L: 53 - this.field344 = var1.field266; // L: 54 - this.field335 = var2; // L: 55 - this.field334 = var3; // L: 56 - this.field339 = var4; // L: 57 - this.field338 = 0; // L: 58 + this.field337 = var1.field254; // L: 54 + this.field328 = var2; // L: 55 + this.field335 = var3; // L: 56 + this.field330 = var4; // L: 57 + this.field329 = 0; // L: 58 this.method816(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Laj;II)V" + descriptor = "(Lat;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; // L: 39 this.start = var1.start; // L: 40 this.end = var1.end; // L: 41 - this.field344 = var1.field266; // L: 42 - this.field335 = var2; // L: 43 - this.field334 = var3; // L: 44 - this.field339 = 8192; // L: 45 - this.field338 = 0; // L: 46 + this.field337 = var1.field254; // L: 42 + this.field328 = var2; // L: 43 + this.field335 = var3; // L: 44 + this.field330 = 8192; // L: 45 + this.field329 = 0; // L: 46 this.method816(); // L: 47 } // L: 48 - @ObfuscatedName("l") + @ObfuscatedName("b") void method816() { - this.field337 = this.field334; // L: 73 - this.field347 = method884(this.field334, this.field339); // L: 74 - this.field340 = method812(this.field334, this.field339); // L: 75 + this.field331 = this.field335; // L: 73 + this.field336 = method955(this.field335, this.field330); // L: 74 + this.field333 = method832(this.field335, this.field330); // L: 75 } // L: 76 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lal;" + descriptor = "()Laf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } - @ObfuscatedName("f") - protected int vmethod5476() { - return this.field334 == 0 && this.field345 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("l") + protected int vmethod5441() { + return this.field335 == 0 && this.field338 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field334 == 0 && this.field345 == 0) { // L: 213 + if (this.field335 == 0 && this.field338 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; // L: 223 var3 += var2; // L: 224 - if (this.field338 < 0) { // L: 225 - if (this.field335 <= 0) { // L: 226 - this.method825(); // L: 228 + if (this.field329 < 0) { // L: 225 + if (this.field328 <= 0) { // L: 226 + this.method801(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field338 = 0; + this.field329 = 0; } - if (this.field338 >= var7) { // L: 233 - if (this.field335 >= 0) { // L: 234 - this.method825(); // L: 236 + if (this.field329 >= var7) { // L: 233 + if (this.field328 >= 0) { // L: 234 + this.method801(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field338 = var7 - 1; + this.field329 = var7 - 1; } if (this.numLoops < 0) { // L: 241 - if (this.field344) { // L: 242 - if (this.field335 < 0) { // L: 243 - var9 = this.method882(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field338 >= var5) { // L: 245 + if (this.field337) { // L: 242 + if (this.field328 < 0) { // L: 243 + var9 = this.method947(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field329 >= var5) { // L: 245 return; } - this.field338 = var5 + var5 - 1 - this.field338; // L: 246 - this.field335 = -this.field335; // L: 247 + this.field329 = var5 + var5 - 1 - this.field329; // L: 246 + this.field328 = -this.field328; // L: 247 } while (true) { - var9 = this.method905(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field338 < var6) { // L: 251 + var9 = this.method814(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field329 < var6) { // L: 251 return; } - this.field338 = var6 + var6 - 1 - this.field338; // L: 252 - this.field335 = -this.field335; // L: 253 - var9 = this.method882(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field338 >= var5) { // L: 255 + this.field329 = var6 + var6 - 1 - this.field329; // L: 252 + this.field328 = -this.field328; // L: 253 + var9 = this.method947(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field329 >= var5) { // L: 255 return; } - this.field338 = var5 + var5 - 1 - this.field338; // L: 256 - this.field335 = -this.field335; // L: 257 + this.field329 = var5 + var5 - 1 - this.field329; // L: 256 + this.field328 = -this.field328; // L: 257 } - } else if (this.field335 < 0) { // L: 260 + } else if (this.field328 < 0) { // L: 260 while (true) { - var9 = this.method882(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field338 >= var5) { // L: 263 + var9 = this.method947(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field329 >= var5) { // L: 263 return; } - this.field338 = var6 - 1 - (var6 - 1 - this.field338) % var8; // L: 264 + this.field329 = var6 - 1 - (var6 - 1 - this.field329) % var8; // L: 264 } } else { while (true) { - var9 = this.method905(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field338 < var6) { // L: 270 + var9 = this.method814(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field329 < var6) { // L: 270 return; } - this.field338 = var5 + (this.field338 - var5) % var8; // L: 271 + this.field329 = var5 + (this.field329 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 - if (this.field344) { // L: 276 + if (this.field337) { // L: 276 label127: { - if (this.field335 < 0) { // L: 277 - var9 = this.method882(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field338 >= var5) { // L: 279 + if (this.field328 < 0) { // L: 277 + var9 = this.method947(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field329 >= var5) { // L: 279 return; } - this.field338 = var5 + var5 - 1 - this.field338; // L: 280 - this.field335 = -this.field335; // L: 281 + this.field329 = var5 + var5 - 1 - this.field329; // L: 280 + this.field328 = -this.field328; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method905(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field338 < var6) { // L: 286 + var9 = this.method814(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field329 < var6) { // L: 286 return; } - this.field338 = var6 + var6 - 1 - this.field338; // L: 287 - this.field335 = -this.field335; // L: 288 + this.field329 = var6 + var6 - 1 - this.field329; // L: 287 + this.field328 = -this.field328; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method882(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field338 >= var5) { // L: 291 + var9 = this.method947(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field329 >= var5) { // L: 291 return; } - this.field338 = var5 + var5 - 1 - this.field338; // L: 292 - this.field335 = -this.field335; // L: 293 + this.field329 = var5 + var5 - 1 - this.field329; // L: 292 + this.field328 = -this.field328; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field335 < 0) { // L: 297 + if (this.field328 < 0) { // L: 297 while (true) { - var9 = this.method882(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field338 >= var5) { // L: 300 + var9 = this.method947(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field329 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field338) / var8; // L: 301 + var10 = (var6 - 1 - this.field329) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field338 += var8 * this.numLoops; // L: 303 + this.field329 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field338 += var8 * var10; // L: 307 + this.field329 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method905(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field338 < var6) { // L: 314 + var9 = this.method814(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field329 < var6) { // L: 314 return; } - var10 = (this.field338 - var5) / var8; // L: 315 + var10 = (this.field329 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field338 -= var8 * this.numLoops; // L: 317 + this.field329 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field338 -= var8 * var10; // L: 321 + this.field329 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - if (this.field335 < 0) { // L: 326 - this.method882(var1, var9, 0, var3, 0); // L: 327 - if (this.field338 < 0) { // L: 328 - this.field338 = -1; // L: 329 - this.method825(); // L: 330 + if (this.field328 < 0) { // L: 326 + this.method947(var1, var9, 0, var3, 0); // L: 327 + if (this.field329 < 0) { // L: 328 + this.field329 = -1; // L: 329 + this.method801(); // L: 330 this.remove(); // L: 331 } } else { - this.method905(var1, var9, var7, var3, 0); // L: 335 - if (this.field338 >= var7) { // L: 336 - this.field338 = var7; // L: 337 - this.method825(); // L: 338 + this.method814(var1, var9, var7, var3, 0); // L: 335 + if (this.field329 >= var7) { // L: 336 + this.field329 = var7; // L: 337 + this.method801(); // L: 338 this.remove(); // L: 339 } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("skip") public synchronized void skip(int var1) { - if (this.field345 > 0) { // L: 345 - if (var1 >= this.field345) { // L: 346 - if (this.field334 == Integer.MIN_VALUE) { // L: 347 - this.field334 = 0; // L: 348 - this.field340 = 0; // L: 349 - this.field347 = 0; // L: 350 - this.field337 = 0; // L: 351 + if (this.field338 > 0) { // L: 345 + if (var1 >= this.field338) { // L: 346 + if (this.field335 == Integer.MIN_VALUE) { // L: 347 + this.field335 = 0; // L: 348 + this.field333 = 0; // L: 349 + this.field336 = 0; // L: 350 + this.field331 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field345; // L: 353 + var1 = this.field338; // L: 353 } - this.field345 = 0; // L: 355 + this.field338 = 0; // L: 355 this.method816(); // L: 356 } else { - this.field337 += this.field346 * var1; // L: 359 - this.field347 += this.field336 * var1; // L: 360 - this.field340 += this.field348 * var1; // L: 361 - this.field345 -= var1; // L: 362 + this.field331 += this.field339 * var1; // L: 359 + this.field336 += this.field340 * var1; // L: 360 + this.field333 += this.field327 * var1; // L: 361 + this.field338 -= var1; // L: 362 } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field338 < 0) { // L: 371 - if (this.field335 <= 0) { // L: 372 - this.method825(); // L: 374 + if (this.field329 < 0) { // L: 371 + if (this.field328 <= 0) { // L: 372 + this.method801(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field338 = 0; + this.field329 = 0; } - if (this.field338 >= var5) { // L: 379 - if (this.field335 >= 0) { // L: 380 - this.method825(); // L: 382 + if (this.field329 >= var5) { // L: 379 + if (this.field328 >= 0) { // L: 380 + this.method801(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field338 = var5 - 1; + this.field329 = var5 - 1; } - this.field338 += this.field335 * var1; // L: 387 + this.field329 += this.field328 * var1; // L: 387 if (this.numLoops < 0) { // L: 388 - if (!this.field344) { // L: 389 - if (this.field335 < 0) { // L: 404 - if (this.field338 >= var3) { // L: 405 + if (!this.field337) { // L: 389 + if (this.field328 < 0) { // L: 404 + if (this.field329 >= var3) { // L: 405 return; } - this.field338 = var4 - 1 - (var4 - 1 - this.field338) % var6; // L: 406 + this.field329 = var4 - 1 - (var4 - 1 - this.field329) % var6; // L: 406 } else { - if (this.field338 < var4) { // L: 409 + if (this.field329 < var4) { // L: 409 return; } - this.field338 = var3 + (this.field338 - var3) % var6; // L: 410 + this.field329 = var3 + (this.field329 - var3) % var6; // L: 410 } } else { - if (this.field335 < 0) { // L: 390 - if (this.field338 >= var3) { // L: 391 + if (this.field328 < 0) { // L: 390 + if (this.field329 >= var3) { // L: 391 return; } - this.field338 = var3 + var3 - 1 - this.field338; // L: 392 - this.field335 = -this.field335; // L: 393 + this.field329 = var3 + var3 - 1 - this.field329; // L: 392 + this.field328 = -this.field328; // L: 393 } - while (this.field338 >= var4) { // L: 396 - this.field338 = var4 + var4 - 1 - this.field338; // L: 397 - this.field335 = -this.field335; // L: 398 - if (this.field338 >= var3) { // L: 399 + while (this.field329 >= var4) { // L: 396 + this.field329 = var4 + var4 - 1 - this.field329; // L: 397 + this.field328 = -this.field328; // L: 398 + if (this.field329 >= var3) { // L: 399 return; } - this.field338 = var3 + var3 - 1 - this.field338; // L: 400 - this.field335 = -this.field335; // L: 401 + this.field329 = var3 + var3 - 1 - this.field329; // L: 400 + this.field328 = -this.field328; // L: 401 } } } else { if (this.numLoops > 0) { // L: 414 - if (this.field344) { // L: 415 + if (this.field337) { // L: 415 label129: { - if (this.field335 < 0) { // L: 416 - if (this.field338 >= var3) { // L: 417 + if (this.field328 < 0) { // L: 416 + if (this.field329 >= var3) { // L: 417 return; } - this.field338 = var3 + var3 - 1 - this.field338; // L: 418 - this.field335 = -this.field335; // L: 419 + this.field329 = var3 + var3 - 1 - this.field329; // L: 418 + this.field328 = -this.field328; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field338 < var4) { // L: 423 + if (this.field329 < var4) { // L: 423 return; } - this.field338 = var4 + var4 - 1 - this.field338; // L: 424 - this.field335 = -this.field335; // L: 425 + this.field329 = var4 + var4 - 1 - this.field329; // L: 424 + this.field328 = -this.field328; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field338 >= var3) { // L: 427 + if (this.field329 >= var3) { // L: 427 return; } - this.field338 = var3 + var3 - 1 - this.field338; // L: 428 - this.field335 = -this.field335; // L: 429 + this.field329 = var3 + var3 - 1 - this.field329; // L: 428 + this.field328 = -this.field328; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field335 < 0) { // L: 433 - if (this.field338 >= var3) { // L: 434 + if (this.field328 < 0) { // L: 433 + if (this.field329 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field338) / var6; // L: 435 + var7 = (var4 - 1 - this.field329) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field338 += var6 * this.numLoops; // L: 437 + this.field329 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field338 += var6 * var7; // L: 441 + this.field329 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field338 < var4) { // L: 445 + if (this.field329 < var4) { // L: 445 return; } - var7 = (this.field338 - var3) / var6; // L: 446 + var7 = (this.field329 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field338 -= var6 * this.numLoops; // L: 448 + this.field329 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field338 -= var6 * var7; // L: 452 + this.field329 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field335 < 0) { // L: 457 - if (this.field338 < 0) { // L: 458 - this.field338 = -1; // L: 459 - this.method825(); // L: 460 + if (this.field328 < 0) { // L: 457 + if (this.field329 < 0) { // L: 458 + this.field329 = -1; // L: 459 + this.method801(); // L: 460 this.remove(); // L: 461 } - } else if (this.field338 >= var5) { // L: 465 - this.field338 = var5; // L: 466 - this.method825(); // L: 467 + } else if (this.field329 >= var5) { // L: 465 + this.field329 = var5; // L: 466 + this.method801(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("x") - public synchronized void method818(int var1) { - this.method820(var1 << 6, this.method822()); // L: 83 + @ObfuscatedName("p") + public synchronized void method929(int var1) { + this.method921(var1 << 6, this.method798()); // L: 83 } // L: 84 - @ObfuscatedName("c") - synchronized void method819(int var1) { - this.method820(var1, this.method822()); // L: 87 + @ObfuscatedName("w") + synchronized void method942(int var1) { + this.method921(var1, this.method798()); // L: 87 } // L: 88 - @ObfuscatedName("j") - synchronized void method820(int var1, int var2) { - this.field334 = var1; // L: 91 - this.field339 = var2; // L: 92 - this.field345 = 0; // L: 93 + @ObfuscatedName("k") + synchronized void method921(int var1, int var2) { + this.field335 = var1; // L: 91 + this.field330 = var2; // L: 92 + this.field338 = 0; // L: 93 this.method816(); // L: 94 } // L: 95 - @ObfuscatedName("p") - public synchronized int method865() { - return this.field334 == Integer.MIN_VALUE ? 0 : this.field334; // L: 98 + @ObfuscatedName("d") + public synchronized int method797() { + return this.field335 == Integer.MIN_VALUE ? 0 : this.field335; // L: 98 } - @ObfuscatedName("s") - public synchronized int method822() { - return this.field339 < 0 ? -1 : this.field339; // L: 102 + @ObfuscatedName("m") + public synchronized int method798() { + return this.field330 < 0 ? -1 : this.field330; // L: 102 } - @ObfuscatedName("b") - public synchronized void method897(int var1) { + @ObfuscatedName("u") + public synchronized void method799(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -507,326 +507,257 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field338 = var1; // L: 109 + this.field329 = var1; // L: 109 } // L: 110 - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method824() { - this.field335 = (this.field335 ^ this.field335 >> 31) + (this.field335 >>> 31); // L: 113 - this.field335 = -this.field335; // L: 114 + public synchronized void method800() { + this.field328 = (this.field328 ^ this.field328 >> 31) + (this.field328 >>> 31); // L: 113 + this.field328 = -this.field328; // L: 114 } // L: 115 - @ObfuscatedName("a") - void method825() { - if (this.field345 != 0) { // L: 118 - if (this.field334 == Integer.MIN_VALUE) { - this.field334 = 0; // L: 119 + @ObfuscatedName("g") + void method801() { + if (this.field338 != 0) { // L: 118 + if (this.field335 == Integer.MIN_VALUE) { + this.field335 = 0; // L: 119 } - this.field345 = 0; // L: 120 + this.field338 = 0; // L: 120 this.method816(); // L: 121 } } // L: 123 - @ObfuscatedName("m") - public synchronized void method826(int var1, int var2) { - this.method841(var1, var2, this.method822()); // L: 126 + @ObfuscatedName("x") + public synchronized void method802(int var1, int var2) { + this.method880(var1, var2, this.method798()); // L: 126 } // L: 127 - @ObfuscatedName("q") - public synchronized void method841(int var1, int var2, int var3) { + @ObfuscatedName("a") + public synchronized void method880(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method820(var2, var3); // L: 131 + this.method921(var2, var3); // L: 131 } else { - int var4 = method884(var2, var3); // L: 134 - int var5 = method812(var2, var3); // L: 135 - if (var4 == this.field347 && var5 == this.field340) { // L: 136 - this.field345 = 0; // L: 137 + int var4 = method955(var2, var3); // L: 134 + int var5 = method832(var2, var3); // L: 135 + if (var4 == this.field336 && var5 == this.field333) { // L: 136 + this.field338 = 0; // L: 137 } else { - int var6 = var2 - this.field337; // L: 140 - if (this.field337 - var2 > var6) { // L: 141 - var6 = this.field337 - var2; + int var6 = var2 - this.field331; // L: 140 + if (this.field331 - var2 > var6) { // L: 141 + var6 = this.field331 - var2; } - if (var4 - this.field347 > var6) { // L: 142 - var6 = var4 - this.field347; + if (var4 - this.field336 > var6) { // L: 142 + var6 = var4 - this.field336; } - if (this.field347 - var4 > var6) { // L: 143 - var6 = this.field347 - var4; + if (this.field336 - var4 > var6) { // L: 143 + var6 = this.field336 - var4; } - if (var5 - this.field340 > var6) { - var6 = var5 - this.field340; // L: 144 + if (var5 - this.field333 > var6) { + var6 = var5 - this.field333; // L: 144 } - if (this.field340 - var5 > var6) { // L: 145 - var6 = this.field340 - var5; + if (this.field333 - var5 > var6) { // L: 145 + var6 = this.field333 - var5; } if (var1 > var6) { // L: 146 var1 = var6; } - this.field345 = var1; // L: 147 - this.field334 = var2; // L: 148 - this.field339 = var3; // L: 149 - this.field346 = (var2 - this.field337) / var1; // L: 150 - this.field336 = (var4 - this.field347) / var1; // L: 151 - this.field348 = (var5 - this.field340) / var1; // L: 152 + this.field338 = var1; // L: 147 + this.field335 = var2; // L: 148 + this.field330 = var3; // L: 149 + this.field339 = (var2 - this.field331) / var1; // L: 150 + this.field340 = (var4 - this.field336) / var1; // L: 151 + this.field327 = (var5 - this.field333) / var1; // L: 152 } } } // L: 132 138 153 @ObfuscatedName("y") - public synchronized void method828(int var1) { + public synchronized void method882(int var1) { if (var1 == 0) { // L: 156 - this.method819(0); // L: 157 + this.method942(0); // L: 157 this.remove(); // L: 158 - } else if (this.field347 == 0 && this.field340 == 0) { // L: 161 - this.field345 = 0; // L: 162 - this.field334 = 0; // L: 163 - this.field337 = 0; // L: 164 + } else if (this.field336 == 0 && this.field333 == 0) { // L: 161 + this.field338 = 0; // L: 162 + this.field335 = 0; // L: 163 + this.field331 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field337; // L: 168 - if (this.field337 > var2) { // L: 169 - var2 = this.field337; + int var2 = -this.field331; // L: 168 + if (this.field331 > var2) { // L: 169 + var2 = this.field331; } - if (-this.field347 > var2) { // L: 170 - var2 = -this.field347; + if (-this.field336 > var2) { // L: 170 + var2 = -this.field336; } - if (this.field347 > var2) { // L: 171 - var2 = this.field347; + if (this.field336 > var2) { // L: 171 + var2 = this.field336; } - if (-this.field340 > var2) { // L: 172 - var2 = -this.field340; + if (-this.field333 > var2) { // L: 172 + var2 = -this.field333; } - if (this.field340 > var2) { // L: 173 - var2 = this.field340; + if (this.field333 > var2) { // L: 173 + var2 = this.field333; } if (var1 > var2) { // L: 174 var1 = var2; } - this.field345 = var1; // L: 175 - this.field334 = Integer.MIN_VALUE; // L: 176 - this.field346 = -this.field337 / var1; // L: 177 - this.field336 = -this.field347 / var1; // L: 178 - this.field348 = -this.field340 / var1; // L: 179 + this.field338 = var1; // L: 175 + this.field335 = Integer.MIN_VALUE; // L: 176 + this.field339 = -this.field331 / var1; // L: 177 + this.field340 = -this.field336 / var1; // L: 178 + this.field327 = -this.field333 / var1; // L: 179 } } // L: 159 166 180 - @ObfuscatedName("z") - public synchronized void method843(int var1) { - if (this.field335 < 0) { // L: 183 - this.field335 = -var1; + @ObfuscatedName("j") + public synchronized void method896(int var1) { + if (this.field328 < 0) { // L: 183 + this.field328 = -var1; } else { - this.field335 = var1; // L: 184 + this.field328 = var1; // L: 184 } } // L: 185 - @ObfuscatedName("e") - public synchronized int method838() { - return this.field335 < 0 ? -this.field335 : this.field335; // L: 188 - } - - @ObfuscatedName("ae") - public boolean method831() { - return this.field338 < 0 || this.field338 >= ((RawSound)super.sound).samples.length << 8; // L: 192 - } - - @ObfuscatedName("ab") - public boolean method832() { - return this.field345 != 0; // L: 196 - } - @ObfuscatedName("aj") - int method905(int[] var1, int var2, int var3, int var4, int var5) { + public synchronized int method866() { + return this.field328 < 0 ? -this.field328 : this.field328; // L: 188 + } + + @ObfuscatedName("al") + public boolean method830() { + return this.field329 < 0 || this.field329 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + } + + @ObfuscatedName("at") + public boolean method808() { + return this.field338 != 0; // L: 196 + } + + @ObfuscatedName("an") + int method814(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field345 > 0) { // L: 474 - int var6 = var2 + this.field345; // L: 475 + if (this.field338 > 0) { // L: 474 + int var6 = var2 + this.field338; // L: 475 if (var6 > var4) { // L: 476 var6 = var4; } - this.field345 += var2; // L: 477 - if (this.field335 == 256 && (this.field338 & 255) == 0) { // L: 478 + this.field338 += var2; // L: 477 + if (this.field328 == 256 && (this.field329 & 255) == 0) { // L: 478 if (PcmPlayer.PcmPlayer_stereo) { // L: 479 - var2 = method850(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this); + var2 = method826(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this); } else { - var2 = method962(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this); // L: 480 + var2 = method874(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this); // L: 480 } } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 - var2 = method854(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this, this.field335, var5); + var2 = method951(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this, this.field328, var5); } else { - var2 = method821(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this, this.field335, var5); // L: 484 + var2 = method831(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this, this.field328, var5); // L: 484 } - this.field345 -= var2; // L: 486 - if (this.field345 != 0) { // L: 487 + this.field338 -= var2; // L: 486 + if (this.field338 != 0) { // L: 487 return var2; } - if (!this.method840()) { // L: 488 + if (!this.method956()) { // L: 488 continue; } return var4; } - if (this.field335 == 256 && (this.field338 & 255) == 0) { // L: 490 + if (this.field328 == 256 && (this.field329 & 255) == 0) { // L: 490 if (PcmPlayer.PcmPlayer_stereo) { // L: 491 - return method842(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this); + return method818(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this); } - return method879(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this); // L: 492 + return method817(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this); // L: 492 } if (PcmPlayer.PcmPlayer_stereo) { // L: 495 - return method846(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this, this.field335, var5); + return method822(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this, this.field328, var5); } - return method845(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this, this.field335, var5); // L: 496 + return method889(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this, this.field328, var5); // L: 496 } } - @ObfuscatedName("as") - int method882(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ay") + int method947(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field345 > 0) { // L: 501 - int var6 = var2 + this.field345; // L: 502 + if (this.field338 > 0) { // L: 501 + int var6 = var2 + this.field338; // L: 502 if (var6 > var4) { // L: 503 var6 = var4; } - this.field345 += var2; // L: 504 - if (this.field335 == -256 && (this.field338 & 255) == 0) { // L: 505 + this.field338 += var2; // L: 504 + if (this.field328 == -256 && (this.field329 & 255) == 0) { // L: 505 if (PcmPlayer.PcmPlayer_stereo) { // L: 506 - var2 = method954(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this); + var2 = method828(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this); } else { - var2 = method851(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this); // L: 507 + var2 = method827(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this); // L: 507 } } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 - var2 = method856(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this, this.field335, var5); + var2 = method858(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this, this.field328, var5); } else { - var2 = method912(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this, this.field335, var5); // L: 511 + var2 = method919(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this, this.field328, var5); // L: 511 } - this.field345 -= var2; // L: 513 - if (this.field345 != 0) { // L: 514 + this.field338 -= var2; // L: 513 + if (this.field338 != 0) { // L: 514 return var2; } - if (!this.method840()) { // L: 515 + if (!this.method956()) { // L: 515 continue; } return var4; } - if (this.field335 == -256 && (this.field338 & 255) == 0) { // L: 517 + if (this.field328 == -256 && (this.field329 & 255) == 0) { // L: 517 if (PcmPlayer.PcmPlayer_stereo) { // L: 518 - return method844(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this); + return method820(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this); } - return method866(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this); // L: 519 + return method819(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this); // L: 519 } if (PcmPlayer.PcmPlayer_stereo) { // L: 522 - return method848(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this, this.field335, var5); + return method824(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this, this.field328, var5); } - return method847(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this, this.field335, var5); // L: 523 + return method823(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this, this.field328, var5); // L: 523 } } - @ObfuscatedName("ao") - boolean method840() { - int var1 = this.field334; // L: 528 - int var2; - int var3; - if (var1 == Integer.MIN_VALUE) { // L: 531 - var3 = 0; // L: 532 - var2 = 0; // L: 533 - var1 = 0; // L: 534 - } else { - var2 = method884(var1, this.field339); // L: 537 - var3 = method812(var1, this.field339); // L: 538 - } - - if (var1 == this.field337 && var2 == this.field347 && var3 == this.field340) { // L: 540 - if (this.field334 == Integer.MIN_VALUE) { // L: 570 - this.field334 = 0; // L: 571 - this.field340 = 0; // L: 572 - this.field347 = 0; // L: 573 - this.field337 = 0; // L: 574 - this.remove(); // L: 575 - return true; // L: 576 - } else { - this.method816(); // L: 578 - return false; // L: 579 - } - } else { - if (this.field337 < var1) { // L: 541 - this.field346 = 1; // L: 542 - this.field345 = var1 - this.field337; // L: 543 - } else if (this.field337 > var1) { // L: 545 - this.field346 = -1; // L: 546 - this.field345 = this.field337 - var1; // L: 547 - } else { - this.field346 = 0; // L: 549 - } - - if (this.field347 < var2) { // L: 550 - this.field336 = 1; // L: 551 - if (this.field345 == 0 || this.field345 > var2 - this.field347) { // L: 552 - this.field345 = var2 - this.field347; - } - } else if (this.field347 > var2) { // L: 554 - this.field336 = -1; // L: 555 - if (this.field345 == 0 || this.field345 > this.field347 - var2) { // L: 556 - this.field345 = this.field347 - var2; - } - } else { - this.field336 = 0; // L: 558 - } - - if (this.field340 < var3) { // L: 559 - this.field348 = 1; // L: 560 - if (this.field345 == 0 || this.field345 > var3 - this.field340) { // L: 561 - this.field345 = var3 - this.field340; - } - } else if (this.field340 > var3) { // L: 563 - this.field348 = -1; // L: 564 - if (this.field345 == 0 || this.field345 > this.field340 - var3) { // L: 565 - this.field345 = this.field340 - var3; - } - } else { - this.field348 = 0; // L: 567 - } - - return false; // L: 568 - } - } - - @ObfuscatedName("aq") - int vmethod968() { - int var1 = this.field337 * 3 >> 6; // L: 31 + @ObfuscatedName("ag") + int vmethod962() { + int var1 = this.field331 * 3 >> 6; // L: 31 var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field338 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field329 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 } @@ -834,38 +765,107 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; // L: 35 } + @ObfuscatedName("ah") + boolean method956() { + int var1 = this.field335; // L: 528 + int var2; + int var3; + if (var1 == Integer.MIN_VALUE) { // L: 531 + var3 = 0; // L: 532 + var2 = 0; // L: 533 + var1 = 0; // L: 534 + } else { + var2 = method955(var1, this.field330); // L: 537 + var3 = method832(var1, this.field330); // L: 538 + } + + if (var1 == this.field331 && var2 == this.field336 && var3 == this.field333) { // L: 540 + if (this.field335 == Integer.MIN_VALUE) { // L: 570 + this.field335 = 0; // L: 571 + this.field333 = 0; // L: 572 + this.field336 = 0; // L: 573 + this.field331 = 0; // L: 574 + this.remove(); // L: 575 + return true; // L: 576 + } else { + this.method816(); // L: 578 + return false; // L: 579 + } + } else { + if (this.field331 < var1) { // L: 541 + this.field339 = 1; // L: 542 + this.field338 = var1 - this.field331; // L: 543 + } else if (this.field331 > var1) { // L: 545 + this.field339 = -1; // L: 546 + this.field338 = this.field331 - var1; // L: 547 + } else { + this.field339 = 0; // L: 549 + } + + if (this.field336 < var2) { // L: 550 + this.field340 = 1; // L: 551 + if (this.field338 == 0 || this.field338 > var2 - this.field336) { // L: 552 + this.field338 = var2 - this.field336; + } + } else if (this.field336 > var2) { // L: 554 + this.field340 = -1; // L: 555 + if (this.field338 == 0 || this.field338 > this.field336 - var2) { // L: 556 + this.field338 = this.field336 - var2; + } + } else { + this.field340 = 0; // L: 558 + } + + if (this.field333 < var3) { // L: 559 + this.field327 = 1; // L: 560 + if (this.field338 == 0 || this.field338 > var3 - this.field333) { // L: 561 + this.field338 = var3 - this.field333; + } + } else if (this.field333 > var3) { // L: 563 + this.field327 = -1; // L: 564 + if (this.field338 == 0 || this.field338 > this.field333 - var3) { // L: 565 + this.field338 = this.field333 - var3; + } + } else { + this.field327 = 0; // L: 567 + } + + return false; // L: 568 + } + } + @ObfuscatedName("v") - static int method884(int var0, int var1) { + static int method955(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("o") - static int method812(int var0, int var1) { + @ObfuscatedName("c") + static int method832(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Laj;II)Lam;" + descriptor = "(Lat;II)Lau;" ) @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)(SecureRandomFuture.field949 * 100)), var2 << 6) : null; // L: 63 64 + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field268 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Laj;III)Lam;" + descriptor = "(Lat;III)Lau;" ) - public static RawPcmStream method924(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method791(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69 } - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILam;)I" + descriptor = "([B[IIIIIIILau;)I" ) - static int method879(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method817(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 583 var7 >>= 8; // L: 584 var4 <<= 2; // L: 585 @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field338 = var2 << 8; // L: 598 + var8.field329 = var2 << 8; // L: 598 return var3; // L: 599 } - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILam;)I" + descriptor = "(I[B[IIIIIIIILau;)I" ) - static int method842(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method818(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 603 var9 >>= 8; // L: 604 var5 <<= 2; // L: 605 @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field338 = var3 << 8; // L: 631 + var10.field329 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILam;)I" + descriptor = "([B[IIIIIIILau;)I" ) - static int method866(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method819(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 636 var7 >>= 8; // L: 637 var4 <<= 2; // L: 638 @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field338 = var2 << 8; // L: 651 + var8.field329 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("am") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILam;)I" + descriptor = "(I[B[IIIIIIIILau;)I" ) - static int method844(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method820(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 656 var9 >>= 8; // L: 657 var5 <<= 2; // L: 658 @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field338 = var3 << 8; // L: 684 + var10.field329 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("al") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIILau;II)I" ) - static int method845(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 method889(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 var7 = var8; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field338 = var4; // L: 703 + var10.field329 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("ak") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIIILau;II)I" ) - static int method846(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 method822(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 var8 = var9; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field338 = var4; // L: 729 + var11.field329 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("az") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIILau;II)I" ) - static int method847(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 method823(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734 var7 = var8; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field338 = var4; // L: 748 + var10.field329 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIIILau;II)I" ) - static int method848(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 method824(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 var8 = var9; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field338 = var4; // L: 773 + var11.field329 = var4; // L: 773 return var5 >> 1; // L: 774 } - @ObfuscatedName("af") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILam;)I" + descriptor = "([B[IIIIIIIILau;)I" ) - static int method962(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method874(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 778 var8 >>= 8; // L: 779 var4 <<= 2; // L: 780 @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field347 += var9.field336 * (var6 - var3); // L: 783 - var9.field340 += var9.field348 * (var6 - var3); // L: 784 + var9.field336 += var9.field340 * (var6 - var3); // L: 783 + var9.field333 += var9.field327 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field337 = var4 >> 2; // L: 801 - var9.field338 = var2 << 8; // L: 802 + var9.field331 = var4 >> 2; // L: 801 + var9.field329 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILam;)I" + descriptor = "(I[B[IIIIIIIIIILau;)I" ) - static int method850(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 method826(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 807 var11 >>= 8; // L: 808 var5 <<= 2; // L: 809 @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field337 += var12.field346 * (var9 - var4); // L: 814 + var12.field331 += var12.field339 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field347 = var5 >> 2; // L: 848 - var12.field340 = var6 >> 2; // L: 849 - var12.field338 = var3 << 8; // L: 850 + var12.field336 = var5 >> 2; // L: 848 + var12.field333 = var6 >> 2; // L: 849 + var12.field329 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILam;)I" + descriptor = "([B[IIIIIIIILau;)I" ) - static int method851(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method827(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 855 var8 >>= 8; // L: 856 var4 <<= 2; // L: 857 @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field347 += var9.field336 * (var6 - var3); // L: 860 - var9.field340 += var9.field348 * (var6 - var3); // L: 861 + var9.field336 += var9.field340 * (var6 - var3); // L: 860 + var9.field333 += var9.field327 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field337 = var4 >> 2; // L: 878 - var9.field338 = var2 << 8; // L: 879 + var9.field331 = var4 >> 2; // L: 878 + var9.field329 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("bk") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILam;)I" + descriptor = "(I[B[IIIIIIIIIILau;)I" ) - static int method954(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 method828(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 884 var11 >>= 8; // L: 885 var5 <<= 2; // L: 886 @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field337 += var12.field346 * (var9 - var4); // L: 891 + var12.field331 += var12.field339 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field347 = var5 >> 2; // L: 925 - var12.field340 = var6 >> 2; // L: 926 - var12.field338 = var3 << 8; // L: 927 + var12.field336 = var5 >> 2; // L: 925 + var12.field333 = var6 >> 2; // L: 926 + var12.field329 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("bz") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIIILau;II)I" ) - static int method821(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field347 -= var11.field336 * var5; // L: 932 - var11.field340 -= var11.field348 * var5; // L: 933 + static int method831(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.field336 -= var11.field340 * var5; // L: 932 + var11.field333 -= var11.field327 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field347 += var11.field336 * var5; // L: 950 - var11.field340 += var11.field348 * var5; // L: 951 - var11.field337 = var6; // L: 952 - var11.field338 = var4; // L: 953 + var11.field336 += var11.field340 * var5; // L: 950 + var11.field333 += var11.field327 * var5; // L: 951 + var11.field331 = var6; // L: 952 + var11.field329 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bl") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIIIIILau;II)I" ) - static int method854(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.field337 -= var5 * var13.field346; // L: 958 + static int method951(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field331 -= var5 * var13.field339; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 984 - var13.field337 += var13.field346 * var5; // L: 985 - var13.field347 = var6; // L: 986 - var13.field340 = var7; // L: 987 - var13.field338 = var4; // L: 988 + var13.field331 += var13.field339 * var5; // L: 985 + var13.field336 = var6; // L: 986 + var13.field333 = var7; // L: 987 + var13.field329 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("be") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIIILau;II)I" ) - static int method912(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.field347 -= var11.field336 * var5; // L: 993 - var11.field340 -= var11.field348 * var5; // L: 994 + static int method919(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.field336 -= var11.field340 * var5; // L: 993 + var11.field333 -= var11.field327 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field347 += var11.field336 * var5; // L: 1011 - var11.field340 += var11.field348 * var5; // L: 1012 - var11.field337 = var6; // L: 1013 - var11.field338 = var4; // L: 1014 + var11.field336 += var11.field340 * var5; // L: 1011 + var11.field333 += var11.field327 * var5; // L: 1012 + var11.field331 = var6; // L: 1013 + var11.field329 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("bt") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILam;II)I" + descriptor = "(II[B[IIIIIIIIIILau;II)I" ) - static int method856(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.field337 -= var5 * var13.field346; // L: 1019 + static int method858(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.field331 -= var5 * var13.field339; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 1044 - var13.field337 += var13.field346 * var5; // L: 1045 - var13.field347 = var6; // L: 1046 - var13.field340 = var7; // L: 1047 - var13.field338 = var4; // L: 1048 + var13.field331 += var13.field339 * var5; // L: 1045 + var13.field336 = var6; // L: 1046 + var13.field333 = var7; // L: 1047 + var13.field329 = var4; // L: 1048 return var5; // L: 1049 } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 464e0b6e9e..77ba88e758 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("aj") +@ObfuscatedName("at") @Implements("RawSound") public class RawSound extends AbstractSound { @ObfuscatedName("v") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("samples") public byte[] samples; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("start") public int start; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("end") int end; - @ObfuscatedName("l") - public boolean field266; + @ObfuscatedName("b") + public boolean field254; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field266 = var5; // L: 24 + this.field254 = var5; // L: 24 } // L: 25 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lbk;)Laj;" + descriptor = "(Las;)Lat;" ) @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 ddbf1165c0..1590f853a3 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -1,5 +1,3 @@ -import java.io.File; -import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; import net.runelite.mapping.Export; @@ -8,124 +6,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("bo") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("ub") + @ObfuscatedName("pl") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Lpj;" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("tx") - @ObfuscatedGetter( - intValue = -1200671157 - ) - static int field250; - @ObfuscatedName("y") - @Export("operatingSystemName") - public static String operatingSystemName; - @ObfuscatedName("ej") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive20") - static Archive archive20; + @Export("HitSplatDefinition_cachedSprites") + static class426 HitSplatDefinition_cachedSprites; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 408894777 + intValue = 1002546903 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -416838537 + intValue = -1236852851 ) @Export("size") int size; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("operations") int[] operations; - @ObfuscatedName("g") - @Export("creationErrors") - int[] creationErrors; - @ObfuscatedName("l") - @Export("fields") - Field[] fields; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("d") + @ObfuscatedName("b") + @Export("creationErrors") + int[] creationErrors; + @ObfuscatedName("n") + @Export("fields") + Field[] fields; + @ObfuscatedName("s") @Export("methods") Method[] methods; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } // L: 17 - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lpr;", - garbageValue = "-28" + descriptor = "(II)Z", + garbageValue = "950633701" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(VertexNormal.cacheDir, "preferences" + var0 + ".dat"); // L: 164 - if (var3.exists()) { // L: 165 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 167 - return var10; // L: 168 - } catch (IOException var9) { // L: 170 + public static boolean method1079(int var0) { + return (var0 >> 29 & 1) != 0; // L: 33 + } + + @ObfuscatedName("fr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1315350901" + ) + static void method1080() { + Client.packetWriter.clearBuffer(); // L: 2726 + Client.packetWriter.packetBuffer.offset = 0; // L: 2727 + Client.packetWriter.serverPacket = null; // L: 2728 + Client.packetWriter.field1324 = null; // L: 2729 + Client.packetWriter.field1325 = null; // L: 2730 + Client.packetWriter.field1313 = null; // L: 2731 + Client.packetWriter.serverPacketLength = 0; // L: 2732 + Client.packetWriter.field1322 = 0; // L: 2733 + Client.rebootTimer = 0; // L: 2734 + Client.menuOptionsCount = 0; // L: 2736 + Client.isMenuOpen = false; // L: 2737 + Client.minimapState = 0; // L: 2739 + Client.destinationX = 0; // L: 2740 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2741 + Client.players[var0] = null; + } + + GrandExchangeEvents.localPlayer = null; // L: 2742 + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2743 + NPC var1 = Client.npcs[var0]; // L: 2744 + if (var1 != null) { // L: 2745 + var1.targetIndex = -1; // L: 2746 + var1.false0 = false; // L: 2747 } } - String var4 = ""; // L: 172 - if (SecureRandomFuture.cacheGamebuild == 33) { // L: 173 - var4 = "_rc"; - } else if (SecureRandomFuture.cacheGamebuild == 34) { // L: 174 - var4 = "_wip"; + UserComparator10.method2622(); // L: 2750 + Decimator.updateGameState(30); // L: 2751 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2752 + Client.field715[var0] = true; } - File var5 = new File(class230.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 175 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 176 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 178 - return var6; // L: 179 - } catch (IOException var8) { // L: 181 - } - } + PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 2755 + var2.packetBuffer.writeByte(Client.getWindowedMode()); // L: 2756 + var2.packetBuffer.writeShort(InvDefinition.canvasWidth); // L: 2757 + var2.packetBuffer.writeShort(class321.canvasHeight); // L: 2758 + Client.packetWriter.addNode(var2); // L: 2759 + } // L: 2761 - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 184 - return var6; // L: 185 - } catch (IOException var7) { // L: 187 - throw new RuntimeException(); // L: 188 - } - } - - @ObfuscatedName("ge") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1964601703" + descriptor = "(IIIILqi;Lki;I)V", + garbageValue = "1940791589" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 3920 - } - - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "16916013" - ) - static String method637(int var0) { - if (var0 < 0) { // L: 9236 - return ""; + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; // L: 12312 + if (var6 > 4225 && var6 < 90000) { // L: 12313 + int var7 = Client.camAngleY & 2047; // L: 12314 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12315 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12316 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12317 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12318 + double var12 = Math.atan2((double)var10, (double)var11); // L: 12319 + int var14 = var5.width / 2 - 25; // L: 12320 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12321 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12322 + byte var17 = 20; // L: 12323 + Canvas.redHintArrowSprite.method8105(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12324 } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9237 9238 + drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12326 } - } + + } // L: 12327 + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(IIIILqi;Lki;I)V", + garbageValue = "812723929" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 12330 + int var6 = Client.camAngleY & 2047; // L: 12331 + int var7 = var3 * var3 + var2 * var2; // L: 12332 + if (var7 <= 6400) { // L: 12333 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12334 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12335 + int var10 = var3 * var8 + var9 * var2 >> 16; // L: 12336 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12337 + if (var7 > 2500) { + var4.method8103(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 12338 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12339 + } + + } + } + } // L: 12340 } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index a31b5403f9..687db685bf 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -1,15 +1,17 @@ +import java.awt.Component; +import java.util.Arrays; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("ix") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("ci") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -1209798745 + intValue = -268241925 ) @Export("height") public int height; @@ -18,17 +20,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" + descriptor = "(B)Liq;", + garbageValue = "103" ) @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("cv") + @ObfuscatedName("co") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); // L: 11 @@ -39,506 +41,215 @@ public abstract class Renderable extends DualNode { } // L: 16 - @ObfuscatedName("x") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lgs;[Lgf;I)V", - garbageValue = "16777215" + descriptor = "(Lln;Lln;Lln;Lln;I)V", + garbageValue = "2037776497" ) - static final void method4310(Scene var0, CollisionMap[] var1) { + public static void method4917(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + Widget.Widget_archive = var0; // L: 220 + class162.Widget_modelsArchive = var1; // L: 221 + SoundCache.Widget_spritesArchive = var2; // L: 222 + class17.Widget_fontsArchive = var3; // L: 223 + Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; // L: 224 + WorldMapSectionType.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; // L: 225 + } // L: 226 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "39" + ) + static void method4928(Component var0) { + var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 155 + var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 156 + KeyHandler.field128 = -1; // L: 157 + } // L: 158 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1452098348" + ) + public static void method4926(int var0, int var1) { + VarbitComposition var2 = UserComparator6.method2643(var0); // L: 33 + int var3 = var2.baseVar; // L: 34 + int var4 = var2.startBit; // L: 35 + int var5 = var2.endBit; // L: 36 + int var6 = Varps.Varps_masks[var5 - var4]; // L: 37 + if (var1 < 0 || var1 > var6) { // L: 38 + var1 = 0; + } + + var6 <<= var4; // L: 39 + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 + } // L: 41 + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1929107749" + ) + static void method4925() { + Client.mouseLastLastPressedTimeMillis = -1L; // L: 2613 + class120.mouseRecorder.index = 0; // L: 2614 + Varcs.hasFocus = true; // L: 2615 + Client.hadFocus = true; // L: 2616 + Client.field585 = -1L; // L: 2617 + UrlRequest.method2564(); // L: 2618 + Client.packetWriter.clearBuffer(); // L: 2619 + Client.packetWriter.packetBuffer.offset = 0; // L: 2620 + Client.packetWriter.serverPacket = null; // L: 2621 + Client.packetWriter.field1324 = null; // L: 2622 + Client.packetWriter.field1325 = null; // L: 2623 + Client.packetWriter.field1313 = null; // L: 2624 + Client.packetWriter.serverPacketLength = 0; // L: 2625 + Client.packetWriter.field1322 = 0; // L: 2626 + Client.rebootTimer = 0; // L: 2627 + Client.logoutTimer = 0; // L: 2628 + Client.hintArrowType = 0; // L: 2629 + Client.menuOptionsCount = 0; // L: 2631 + Client.isMenuOpen = false; // L: 2632 + ClientPacket.method5176(0); // L: 2634 + Actor.method2177(); // L: 2635 + Client.isItemSelected = 0; // L: 2636 + Client.isSpellSelected = false; // L: 2637 + Client.soundEffectCount = 0; // L: 2638 + Client.camAngleY = 0; // L: 2639 + Client.oculusOrbState = 0; // L: 2640 + VarcInt.field1841 = null; // L: 2641 + Client.minimapState = 0; // L: 2642 + Client.field714 = -1; // L: 2643 + Client.destinationX = 0; // L: 2644 + Client.destinationY = 0; // L: 2645 + Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2646 + Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2647 + Client.npcCount = 0; // L: 2648 + Players.Players_count = 0; // L: 2650 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2651 + Players.field1276[var0] = null; // L: 2652 + Players.field1286[var0] = class193.field2185; // L: 2653 + } + + for (var0 = 0; var0 < 2048; ++var0) { // L: 2656 + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { // L: 2657 + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; // L: 2658 + Client.projectiles.clear(); // L: 2659 + Client.graphicsObjects.clear(); // L: 2660 + int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { // L: 628 - for (var3 = 0; var3 < 104; ++var3) { // L: 629 - for (var4 = 0; var4 < 104; ++var4) { // L: 630 - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 631 - var5 = var2; // L: 632 - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 633 - var5 = var2 - 1; - } - - if (var5 >= 0) { // L: 634 - var1[var5].setBlockedByFloor(var3, var4); - } - } + for (var0 = 0; var0 < 4; ++var0) { // L: 2661 + for (int var1 = 0; var1 < 104; ++var1) { // L: 2662 + for (var2 = 0; var2 < 104; ++var2) { // L: 2663 + Client.groundItems[var0][var1][var2] = null; // L: 2664 } } } - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 639 - if (Tiles.rndHue < -8) { // L: 640 - Tiles.rndHue = -8; - } + Client.pendingSpawns = new NodeDeque(); // L: 2668 + Decimator.friendSystem.clear(); // L: 2669 - if (Tiles.rndHue > 8) { // L: 641 - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 642 - if (Tiles.rndLightness < -16) { // L: 643 - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { // L: 644 - Tiles.rndLightness = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { // L: 645 - byte[][] var44 = GrandExchangeOfferNameComparator.field4010[var2]; // L: 646 - boolean var51 = true; // L: 647 - boolean var52 = true; // L: 648 - boolean var6 = true; // L: 649 - boolean var7 = true; // L: 650 - boolean var8 = true; // L: 651 - var9 = (int)Math.sqrt(5100.0D); // L: 652 - var10 = var9 * 768 >> 8; // L: 653 - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { // L: 654 - for (var12 = 1; var12 < 103; ++var12) { // L: 655 - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 656 - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 657 - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 658 - var16 = (var13 << 8) / var15; // L: 659 - var17 = 65536 / var15; // L: 660 - var18 = (var14 << 8) / var15; // L: 661 - var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 662 - var20 = (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11 + 1] >> 3) + (var44[var12][var11] >> 1); // L: 663 - Widget.field3495[var12][var11] = var19 - var20; // L: 664 - } + for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2670 + VarpDefinition var4 = class134.VarpDefinition_get(var0); // L: 2671 + if (var4 != null) { // L: 2672 + Varps.Varps_temp[var0] = 0; // L: 2673 + Varps.Varps_main[var0] = 0; // L: 2674 } + } - for (var11 = 0; var11 < 104; ++var11) { // L: 667 - class4.Tiles_hue[var11] = 0; // L: 668 - Login.Tiles_saturation[var11] = 0; // L: 669 - WorldMapSectionType.Tiles_lightness[var11] = 0; // L: 670 - class300.Tiles_hueMultiplier[var11] = 0; // L: 671 - Tiles.field986[var11] = 0; // L: 672 - } + class160.varcs.clearTransient(); // L: 2677 + Client.followerIndex = -1; // L: 2678 + if (Client.rootInterface != -1) { // L: 2679 + var0 = Client.rootInterface; // L: 2680 + if (var0 != -1 && WorldMapSectionType.Widget_loadedInterfaces[var0]) { // L: 2682 2683 + Widget.Widget_archive.clearFilesGroup(var0); // L: 2684 + if (Widget.Widget_interfaceComponents[var0] != null) { // L: 2685 + boolean var5 = true; // L: 2686 - for (var11 = -5; var11 < 109; ++var11) { // L: 674 - for (var12 = 0; var12 < 104; ++var12) { // L: 675 - var13 = var11 + 5; // L: 676 - int var10002; - if (var13 >= 0 && var13 < 104) { // L: 677 - var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 678 - if (var14 > 0) { // L: 679 - FloorUnderlayDefinition var49 = class151.method3100(var14 - 1); // L: 680 - var10000 = class4.Tiles_hue; // L: 681 - var10000[var12] += var49.hue; - var10000 = Login.Tiles_saturation; // L: 682 - var10000[var12] += var49.saturation; - var10000 = WorldMapSectionType.Tiles_lightness; // L: 683 - var10000[var12] += var49.lightness; - var10000 = class300.Tiles_hueMultiplier; // L: 684 - var10000[var12] += var49.hueMultiplier; - var10002 = Tiles.field986[var12]++; // L: 685 + for (var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 2687 + if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 2688 + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 2689 + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var5 = false; // L: 2690 + } } } - var14 = var11 - 5; // L: 688 - if (var14 >= 0 && var14 < 104) { // L: 689 - var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 690 - if (var15 > 0) { // L: 691 - FloorUnderlayDefinition var50 = class151.method3100(var15 - 1); // L: 692 - var10000 = class4.Tiles_hue; // L: 693 - var10000[var12] -= var50.hue; - var10000 = Login.Tiles_saturation; // L: 694 - var10000[var12] -= var50.saturation; - var10000 = WorldMapSectionType.Tiles_lightness; // L: 695 - var10000[var12] -= var50.lightness; - var10000 = class300.Tiles_hueMultiplier; // L: 696 - var10000[var12] -= var50.hueMultiplier; - var10002 = Tiles.field986[var12]--; // L: 697 - } - } - } - - if (var11 >= 1 && var11 < 103) { // L: 701 - var12 = 0; // L: 702 - var13 = 0; // L: 703 - var14 = 0; // L: 704 - var15 = 0; // L: 705 - var16 = 0; // L: 706 - - for (var17 = -5; var17 < 109; ++var17) { // L: 707 - var18 = var17 + 5; // L: 708 - if (var18 >= 0 && var18 < 104) { // L: 709 - var12 += class4.Tiles_hue[var18]; // L: 710 - var13 += Login.Tiles_saturation[var18]; // L: 711 - var14 += WorldMapSectionType.Tiles_lightness[var18]; // L: 712 - var15 += class300.Tiles_hueMultiplier[var18]; // L: 713 - var16 += Tiles.field986[var18]; // L: 714 - } - - var19 = var17 - 5; // L: 716 - if (var19 >= 0 && var19 < 104) { // L: 717 - var12 -= class4.Tiles_hue[var19]; // L: 718 - var13 -= Login.Tiles_saturation[var19]; // L: 719 - var14 -= WorldMapSectionType.Tiles_lightness[var19]; // L: 720 - var15 -= class300.Tiles_hueMultiplier[var19]; // L: 721 - var16 -= Tiles.field986[var19]; // L: 722 - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 724 725 726 727 - if (var2 < Tiles.Tiles_minPlane) { // L: 730 - Tiles.Tiles_minPlane = var2; - } - - var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 731 - int var21 = Tiles.Tiles_overlays[var2][var11][var17] & 255; // L: 732 - if (var20 > 0 || var21 > 0) { // L: 733 - int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 734 - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 735 - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 736 - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 737 - int var26 = Widget.field3495[var11][var17]; // L: 738 - int var27 = Widget.field3495[var11 + 1][var17]; // L: 739 - int var28 = Widget.field3495[var11 + 1][var17 + 1]; // L: 740 - int var29 = Widget.field3495[var11][var17 + 1]; // L: 741 - int var30 = -1; // L: 742 - int var31 = -1; // L: 743 - int var32; - int var33; - int var34; - if (var20 > 0) { // L: 744 - var32 = var12 * 256 / var15; // L: 745 - var33 = var13 / var16; // L: 746 - var34 = var14 / var16; // L: 747 - var30 = SecureRandomCallable.hslToRgb(var32, var33, var34); // L: 748 - var32 = var32 + Tiles.rndHue & 255; // L: 749 - var34 += Tiles.rndLightness; // L: 750 - if (var34 < 0) { // L: 751 - var34 = 0; - } else if (var34 > 255) { // L: 752 - var34 = 255; - } - - var31 = SecureRandomCallable.hslToRgb(var32, var33, var34); // L: 753 - } - - FloorOverlayDefinition var35; - if (var2 > 0) { // L: 755 - boolean var57 = true; // L: 756 - if (var20 == 0 && Tiles.Tiles_shapes[var2][var11][var17] != 0) { // L: 757 - var57 = false; - } - - if (var21 > 0) { // L: 758 - var34 = var21 - 1; // L: 760 - var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); // L: 762 - FloorOverlayDefinition var46; - if (var35 != null) { // L: 763 - var46 = var35; // L: 764 - } else { - byte[] var36 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); // L: 767 - var35 = new FloorOverlayDefinition(); // L: 768 - if (var36 != null) { // L: 769 - var35.decode(new Buffer(var36), var34); - } - - var35.postDecode(); // L: 770 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); // L: 771 - var46 = var35; // L: 772 - } - - if (!var46.hideUnderlay) { // L: 774 - var57 = false; - } - } - - if (var57 && var22 == var23 && var24 == var22 && var22 == var25) { // L: 776 777 - var10000 = DirectByteArrayCopier.field3277[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; // L: 780 - if (var31 != -1) { // L: 781 - var32 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapIcon_0.method4901(var31, 96)]; - } - - if (var21 == 0) { // L: 782 - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, WorldMapIcon_0.method4901(var30, var26), WorldMapIcon_0.method4901(var30, var27), WorldMapIcon_0.method4901(var30, var28), WorldMapIcon_0.method4901(var30, var29), 0, 0, 0, 0, var32, 0); // L: 783 - } else { - var33 = Tiles.Tiles_shapes[var2][var11][var17] + 1; // L: 786 - byte var58 = RunException.field4754[var2][var11][var17]; // L: 787 - int var47 = var21 - 1; // L: 789 - FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var47); // L: 791 - if (var37 != null) { // L: 792 - var35 = var37; // L: 793 - } else { - byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var47); // L: 796 - var37 = new FloorOverlayDefinition(); // L: 797 - if (var38 != null) { // L: 798 - var37.decode(new Buffer(var38), var47); - } - - var37.postDecode(); // L: 799 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var47); // L: 800 - var35 = var37; // L: 801 - } - - int var48 = var35.texture; // L: 804 - int var39; - int var40; - int var41; - int var42; - if (var48 >= 0) { // L: 807 - var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var48); // L: 808 - var39 = -1; // L: 809 - } else if (var35.primaryRgb == 16711935) { // L: 812 - var39 = -2; // L: 813 - var48 = -1; // L: 814 - var40 = -2; // L: 815 - } else { - var39 = SecureRandomCallable.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 818 - var41 = var35.hue + Tiles.rndHue & 255; // L: 819 - var42 = var35.lightness + Tiles.rndLightness; // L: 820 - if (var42 < 0) { // L: 821 - var42 = 0; - } else if (var42 > 255) { // L: 822 - var42 = 255; - } - - var40 = SecureRandomCallable.hslToRgb(var41, var35.saturation, var42); // L: 823 - } - - var41 = 0; // L: 826 - if (var40 != -2) { // L: 827 - var41 = Rasterizer3D.Rasterizer3D_colorPalette[InvDefinition.method3334(var40, 96)]; - } - - if (var35.secondaryRgb != -1) { // L: 828 - var42 = var35.secondaryHue + Tiles.rndHue & 255; // L: 829 - int var43 = var35.secondaryLightness + Tiles.rndLightness; // L: 830 - if (var43 < 0) { // L: 831 - var43 = 0; - } else if (var43 > 255) { // L: 832 - var43 = 255; - } - - var40 = SecureRandomCallable.hslToRgb(var42, var35.secondarySaturation, var43); // L: 833 - var41 = Rasterizer3D.Rasterizer3D_colorPalette[InvDefinition.method3334(var40, 96)]; // L: 834 - } - - var0.addTile(var2, var11, var17, var33, var58, var48, var22, var23, var24, var25, WorldMapIcon_0.method4901(var30, var26), WorldMapIcon_0.method4901(var30, var27), WorldMapIcon_0.method4901(var30, var28), WorldMapIcon_0.method4901(var30, var29), InvDefinition.method3334(var39, var26), InvDefinition.method3334(var39, var27), InvDefinition.method3334(var39, var28), InvDefinition.method3334(var39, var29), var32, var41); // L: 836 - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { // L: 843 - for (var12 = 1; var12 < 103; ++var12) { // L: 844 - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 851 - var17 = 0; // L: 852 - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 855 - var17 = var2 - 1; // L: 856 - } else { - var17 = var2; // L: 859 + if (var5) { // L: 2693 + Widget.Widget_interfaceComponents[var0] = null; } - var0.setTileMinPlane(var2, var12, var11, var17); // L: 861 - } - } - - Tiles.Tiles_underlays[var2] = null; // L: 864 - Tiles.Tiles_overlays[var2] = null; // L: 865 - Tiles.Tiles_shapes[var2] = null; // L: 866 - RunException.field4754[var2] = null; // L: 867 - GrandExchangeOfferNameComparator.field4010[var2] = null; // L: 868 - } - - var0.method4158(-50, -10, -50); // L: 870 - - for (var2 = 0; var2 < 104; ++var2) { // L: 871 - for (var3 = 0; var3 < 104; ++var3) { // L: 872 - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 873 - var0.setLinkBelow(var2, var3); + WorldMapSectionType.Widget_loadedInterfaces[var0] = false; // L: 2694 } } } - var2 = 1; // L: 876 - var3 = 2; // L: 877 - var4 = 4; // L: 878 - - for (var5 = 0; var5 < 4; ++var5) { // L: 879 - if (var5 > 0) { // L: 880 - var2 <<= 3; // L: 881 - var3 <<= 3; // L: 882 - var4 <<= 3; // L: 883 - } - - for (int var53 = 0; var53 <= var5; ++var53) { // L: 885 - for (int var54 = 0; var54 <= 104; ++var54) { // L: 886 - for (int var55 = 0; var55 <= 104; ++var55) { // L: 887 - short var56; - if ((DirectByteArrayCopier.field3277[var53][var55][var54] & var2) != 0) { // L: 888 - var9 = var54; // L: 889 - var10 = var54; // L: 890 - var11 = var53; // L: 891 - - for (var12 = var53; var9 > 0 && (DirectByteArrayCopier.field3277[var53][var55][var9 - 1] & var2) != 0; --var9) { // L: 892 893 - } - - while (var10 < 104 && (DirectByteArrayCopier.field3277[var53][var55][var10 + 1] & var2) != 0) { // L: 894 - ++var10; - } - - label450: - while (var11 > 0) { // L: 895 - for (var13 = var9; var13 <= var10; ++var13) { // L: 896 - if ((DirectByteArrayCopier.field3277[var11 - 1][var55][var13] & var2) == 0) { - break label450; - } - } - - --var11; // L: 897 - } - - label439: - while (var12 < var5) { // L: 899 - for (var13 = var9; var13 <= var10; ++var13) { // L: 900 - if ((DirectByteArrayCopier.field3277[var12 + 1][var55][var13] & var2) == 0) { - break label439; - } - } - - ++var12; // L: 901 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 903 - if (var13 >= 8) { // L: 904 - var56 = 240; // L: 905 - var15 = Tiles.Tiles_heights[var12][var55][var9] - var56; // L: 906 - var16 = Tiles.Tiles_heights[var11][var55][var9]; // L: 907 - Scene.Scene_addOccluder(var5, 1, var55 * 128, var55 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 908 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 909 - for (var18 = var9; var18 <= var10; ++var18) { // L: 910 - var10000 = DirectByteArrayCopier.field3277[var17][var55]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((DirectByteArrayCopier.field3277[var53][var55][var54] & var3) != 0) { // L: 914 - var9 = var55; // L: 915 - var10 = var55; // L: 916 - var11 = var53; // L: 917 - - for (var12 = var53; var9 > 0 && (DirectByteArrayCopier.field3277[var53][var9 - 1][var54] & var3) != 0; --var9) { // L: 918 919 - } - - while (var10 < 104 && (DirectByteArrayCopier.field3277[var53][var10 + 1][var54] & var3) != 0) { // L: 920 - ++var10; - } - - label503: - while (var11 > 0) { // L: 921 - for (var13 = var9; var13 <= var10; ++var13) { // L: 922 - if ((DirectByteArrayCopier.field3277[var11 - 1][var13][var54] & var3) == 0) { - break label503; - } - } - - --var11; // L: 923 - } - - label492: - while (var12 < var5) { // L: 925 - for (var13 = var9; var13 <= var10; ++var13) { // L: 926 - if ((DirectByteArrayCopier.field3277[var12 + 1][var13][var54] & var3) == 0) { - break label492; - } - } - - ++var12; // L: 927 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 929 - if (var13 >= 8) { // L: 930 - var56 = 240; // L: 931 - var15 = Tiles.Tiles_heights[var12][var9][var54] - var56; // L: 932 - var16 = Tiles.Tiles_heights[var11][var9][var54]; // L: 933 - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var54 * 128, var54 * 128, var15, var16); // L: 934 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 935 - for (var18 = var9; var18 <= var10; ++var18) { // L: 936 - var10000 = DirectByteArrayCopier.field3277[var17][var18]; - var10000[var54] &= ~var3; - } - } - } - } - - if ((DirectByteArrayCopier.field3277[var53][var55][var54] & var4) != 0) { // L: 940 - var9 = var55; // L: 941 - var10 = var55; // L: 942 - var11 = var54; // L: 943 - - for (var12 = var54; var11 > 0 && (DirectByteArrayCopier.field3277[var53][var55][var11 - 1] & var4) != 0; --var11) { // L: 944 945 - } - - while (var12 < 104 && (DirectByteArrayCopier.field3277[var53][var55][var12 + 1] & var4) != 0) { // L: 946 - ++var12; - } - - label556: - while (var9 > 0) { // L: 947 - for (var13 = var11; var13 <= var12; ++var13) { // L: 948 - if ((DirectByteArrayCopier.field3277[var53][var9 - 1][var13] & var4) == 0) { - break label556; - } - } - - --var9; // L: 949 - } - - label545: - while (var10 < 104) { // L: 951 - for (var13 = var11; var13 <= var12; ++var13) { // L: 952 - if ((DirectByteArrayCopier.field3277[var53][var10 + 1][var13] & var4) == 0) { - break label545; - } - } - - ++var10; // L: 953 - } - - if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 955 - var13 = Tiles.Tiles_heights[var53][var9][var11]; // L: 956 - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 957 - - for (var14 = var9; var14 <= var10; ++var14) { // L: 958 - for (var15 = var11; var15 <= var12; ++var15) { // L: 959 - var10000 = DirectByteArrayCopier.field3277[var53][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2697 + Script.closeInterface(var3, true); // L: 2698 } - } // L: 967 + Client.rootInterface = -1; // L: 2700 + Client.interfaceParents = new NodeHashTable(8); // L: 2701 + Client.meslayerContinueWidget = null; // L: 2702 + Client.menuOptionsCount = 0; // L: 2704 + Client.isMenuOpen = false; // L: 2705 + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2707 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2708 + Client.playerMenuActions[var0] = null; // L: 2709 + Client.playerOptionsPriorities[var0] = false; // L: 2710 + } + + UserComparator10.method2622(); // L: 2712 + Client.isLoading = true; // L: 2713 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2714 + Client.field715[var0] = true; + } + + class4.method17(); // L: 2715 + ClientPacket.friendsChat = null; // L: 2716 + class154.guestClanSettings = null; // L: 2717 + Arrays.fill(Client.currentClanSettings, (Object)null); // L: 2718 + class21.guestClanChannel = null; // L: 2719 + Arrays.fill(Client.currentClanChannels, (Object)null); // L: 2720 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2721 + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + class83.grandExchangeEvents = null; // L: 2722 + } // L: 2723 + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-2093926598" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ItemComposition.getWidgetChild(var0, var1); // L: 9650 + if (var4 != null && var4.onTargetEnter != null) { // L: 9651 + ScriptEvent var5 = new ScriptEvent(); // L: 9652 + var5.widget = var4; // L: 9653 + var5.args = var4.onTargetEnter; // L: 9654 + ClanSettings.runScriptEvent(var5); // L: 9655 + } + + Client.selectedSpellItemId = var3; // L: 9657 + Client.isSpellSelected = true; // L: 9658 + Timer.selectedSpellWidget = var0; // L: 9659 + Client.selectedSpellChildIndex = var1; // L: 9660 + class17.selectedSpellFlags = var2; // L: 9661 + class346.invalidateWidget(var4); // L: 9662 + } // L: 9663 } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 71459b2327..a328fc7c3d 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,30 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gt") @Implements("RouteStrategy") public abstract class RouteStrategy { + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + @Export("fontBold12") + static Font fontBold12; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -708053839 + intValue = -280287093 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 796824927 + intValue = -436525857 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 942230725 + intValue = 1188944539 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2021281887 + intValue = 865807579 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -37,190 +43,9 @@ public abstract class RouteStrategy { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIILgf;I)Z", - garbageValue = "-2070013036" + descriptor = "(IIILgv;I)Z", + garbageValue = "773884525" ) @Export("hasArrived") - protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Llu;II)V", - garbageValue = "-1568372514" - ) - static void method3873(Archive var0, int var1) { - if (class122.NetCache_reference != null) { // L: 211 - class122.NetCache_reference.offset = var1 * 8 + 5; - int var2 = class122.NetCache_reference.readInt(); - int var3 = class122.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); - } else { - TriBool.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; // L: 219 - } - } // L: 220 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2126759813" - ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 176 - return true; - } else if (var0 >= 160 && var0 <= 255) { // L: 177 - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 178 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-55125804" - ) - static void method3872() { - class451.SpriteBuffer_xOffsets = null; // L: 212 - class451.SpriteBuffer_yOffsets = null; // L: 213 - class451.SpriteBuffer_spriteWidths = null; // L: 214 - class451.SpriteBuffer_spriteHeights = null; // L: 215 - GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette = null; // L: 216 - class460.SpriteBuffer_pixels = null; // L: 217 - } // L: 218 - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "160319401" - ) - static final int method3869() { - if (Interpreter.clientPreferences.method2255()) { // L: 4364 - return class160.Client_plane; - } else { - int var0 = 3; // L: 4365 - if (Language.cameraPitch < 310) { // L: 4366 - int var1; - int var2; - if (Client.oculusOrbState == 1) { // L: 4369 - var1 = Messages.oculusOrbFocalPointX >> 7; // L: 4370 - var2 = class115.oculusOrbFocalPointY >> 7; // L: 4371 - } else { - var1 = class19.localPlayer.x >> 7; // L: 4374 - var2 = class19.localPlayer.y >> 7; // L: 4375 - } - - int var3 = EnumComposition.cameraX >> 7; // L: 4377 - int var4 = CollisionMap.cameraZ >> 7; // L: 4378 - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { // L: 4379 - return class160.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { // L: 4380 - return class160.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4381 - var0 = class160.Client_plane; - } - - int var5; - if (var1 > var3) { // L: 4383 - var5 = var1 - var3; - } else { - var5 = var3 - var1; // L: 4384 - } - - int var6; - if (var2 > var4) { // L: 4386 - var6 = var2 - var4; - } else { - var6 = var4 - var2; // L: 4387 - } - - int var7; - int var8; - if (var5 > var6) { // L: 4388 - var7 = var6 * 65536 / var5; // L: 4389 - var8 = 32768; // L: 4390 - - while (var3 != var1) { // L: 4391 - if (var3 < var1) { // L: 4392 - ++var3; - } else if (var3 > var1) { // L: 4393 - --var3; - } - - if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4394 - var0 = class160.Client_plane; - } - - var8 += var7; // L: 4395 - if (var8 >= 65536) { // L: 4396 - var8 -= 65536; // L: 4397 - if (var4 < var2) { // L: 4398 - ++var4; - } else if (var4 > var2) { // L: 4399 - --var4; - } - - if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4400 - var0 = class160.Client_plane; - } - } - } - } else if (var6 > 0) { // L: 4404 - var7 = var5 * 65536 / var6; // L: 4405 - var8 = 32768; // L: 4406 - - while (var2 != var4) { // L: 4407 - if (var4 < var2) { // L: 4408 - ++var4; - } else if (var4 > var2) { // L: 4409 - --var4; - } - - if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4410 - var0 = class160.Client_plane; - } - - var8 += var7; // L: 4411 - if (var8 >= 65536) { // L: 4412 - var8 -= 65536; // L: 4413 - if (var3 < var1) { // L: 4414 - ++var3; - } else if (var3 > var1) { // L: 4415 - --var3; - } - - if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4416 - var0 = class160.Client_plane; - } - } - } - } - } - - if (class19.localPlayer.x >= 0 && class19.localPlayer.y >= 0 && class19.localPlayer.x < 13312 && class19.localPlayer.y < 13312) { // L: 4421 - if ((Tiles.Tiles_renderFlags[class160.Client_plane][class19.localPlayer.x >> 7][class19.localPlayer.y >> 7] & 4) != 0) { // L: 4422 - var0 = class160.Client_plane; - } - - return var0; // L: 4423 - } else { - return class160.Client_plane; - } - } - } - - @ObfuscatedName("lz") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-655837204" - ) - static final void method3875() { - Client.field687 = Client.cycleCntr; // L: 11710 - class82.field1070 = true; // L: 11711 - } // L: 11712 + public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index bd68089ecb..f76e017f3c 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,30 +4,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qe") +@ObfuscatedName("qo") @Implements("RunException") public class RunException extends RuntimeException { @ObfuscatedName("v") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 261481045 + intValue = 176570919 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1885069325 - ) - @Export("clientType") - public static int clientType; - @ObfuscatedName("d") - static byte[][][] field4754; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("message") String message; @ObfuscatedName("n") diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index a8c06e0c0e..a8971ad168 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("gs") +@ObfuscatedName("hv") @Implements("Scene") public class Scene { @ObfuscatedName("v") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; @ObfuscatedName("y") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("Scene_cameraYTile") static int Scene_cameraYTile; @ObfuscatedName("e") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "[Lhg;" + descriptor = "[Liy;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("ab") + @ObfuscatedName("av") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ad") + @ObfuscatedName("an") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("av") + @ObfuscatedName("ac") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[[Lhd;" + descriptor = "[[Lip;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("ah") + @ObfuscatedName("af") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Lhd;" + descriptor = "[Lip;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("al") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ak") - static final int[] field2413; - @ObfuscatedName("az") - static final int[] field2414; - @ObfuscatedName("ag") - static final int[] field2415; - @ObfuscatedName("af") - static final int[] field2404; + @ObfuscatedName("ax") + static final int[] field2617; + @ObfuscatedName("ar") + static final int[] field2638; @ObfuscatedName("ap") - static final int[] field2417; - @ObfuscatedName("ai") - static final int[] field2403; - @ObfuscatedName("bk") - static final int[] field2419; - @ObfuscatedName("bq") + static final int[] field2650; + @ObfuscatedName("az") + static final int[] field2616; + @ObfuscatedName("as") + static final int[] field2641; + @ObfuscatedName("aa") + static final int[] field2628; + @ObfuscatedName("bj") + static final int[] field2643; + @ObfuscatedName("bf") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("br") + @ObfuscatedName("bb") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bd") + @ObfuscatedName("bx") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bf") + @ObfuscatedName("bg") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("by") + @ObfuscatedName("bn") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bu") + @ObfuscatedName("bq") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("planes") int planes; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("xSize") int xSize; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("ySize") int ySize; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("tileHeights") int[][][] tileHeights; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[[Lgy;" + descriptor = "[[[Lhu;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("minPlane") int minPlane; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lhg;" + descriptor = "[Liy;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("r") - int[][][] field2410; - @ObfuscatedName("ba") + @ObfuscatedName("o") + int[][][] field2600; + @ObfuscatedName("be") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bg") + @ObfuscatedName("bh") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; // L: 51 Scene_currentOccluders = new Occluder[500]; // L: 52 Scene_tilesDeque = new NodeDeque(); // L: 53 - field2413 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field2414 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field2415 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field2404 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field2417 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field2403 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field2419 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + field2617 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2638 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2650 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2616 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2641 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2628 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2643 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -226,7 +226,7 @@ public class Scene { this.xSize = var2; // L: 97 this.ySize = var3; // L: 98 this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field2410 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.field2600 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 @@ -264,7 +264,7 @@ public class Scene { } // L: 120 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -279,7 +279,7 @@ public class Scene { } // L: 129 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -292,680 +292,676 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 GameObject var7 = var5.gameObjects[var6]; // L: 138 long var9 = var7.tag; // L: 140 - int var11 = (int)(var9 >>> 14 & 3L); // L: 144 - boolean var8 = var11 == 2; // L: 146 - if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 148 + boolean var8 = FloorDecoration.method4592(var9) == 2; // L: 142 + if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 144 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 152 + if (this.tiles[0][var1][var2] == null) { // L: 148 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 153 - this.tiles[3][var1][var2] = null; // L: 154 - } // L: 155 + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 149 + this.tiles[3][var1][var2] = null; // L: 150 + } // L: 151 - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 174 - if (var5 != null) { // L: 175 - this.tiles[var1][var2][var3].minPlane = var4; // L: 176 + Tile var5 = this.tiles[var1][var2][var3]; // L: 170 + if (var5 != null) { // L: 171 + this.tiles[var1][var2][var3].minPlane = var4; // L: 172 } - } // L: 177 + } // L: 173 @ObfuscatedName("n") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { SceneTilePaint var21; int var22; - if (var4 == 0) { // L: 180 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 181 + if (var4 == 0) { // L: 176 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 177 - for (var22 = var1; var22 >= 0; --var22) { // L: 182 + for (var22 = var1; var22 >= 0; --var22) { // L: 178 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 183 - } else if (var4 != 1) { // L: 186 - SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 192 + this.tiles[var1][var2][var3].paint = var21; // L: 179 + } else if (var4 != 1) { // L: 182 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 188 - for (var22 = var1; var22 >= 0; --var22) { // L: 193 + for (var22 = var1; var22 >= 0; --var22) { // L: 189 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].model = var23; // L: 194 + this.tiles[var1][var2][var3].model = var23; // L: 190 } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 187 + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 183 - for (var22 = var1; var22 >= 0; --var22) { // L: 188 + for (var22 = var1; var22 >= 0; --var22) { // L: 184 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 189 + this.tiles[var1][var2][var3].paint = var21; // L: 185 } - } // L: 184 190 195 + } // L: 180 186 191 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIILgh;JI)V" + descriptor = "(IIIILix;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - if (var5 != null) { // L: 198 - FloorDecoration var9 = new FloorDecoration(); // L: 199 - var9.renderable = var5; // L: 200 - var9.x = var2 * 128 + 64; // L: 201 - var9.y = var3 * 128 + 64; // L: 202 - var9.z = var4; // L: 203 - var9.tag = var6; // L: 204 - var9.flags = var8; // L: 205 - if (this.tiles[var1][var2][var3] == null) { // L: 206 + if (var5 != null) { // L: 194 + FloorDecoration var9 = new FloorDecoration(); // L: 195 + var9.renderable = var5; // L: 196 + var9.x = var2 * 128 + 64; // L: 197 + var9.y = var3 * 128 + 64; // L: 198 + var9.z = var4; // L: 199 + var9.tag = var6; // L: 200 + var9.flags = var8; // L: 201 + if (this.tiles[var1][var2][var3] == null) { // L: 202 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 207 + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 203 } - } // L: 208 + } // L: 204 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIILgh;JLgh;Lgh;)V" + descriptor = "(IIIILix;JLix;Lix;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { - ItemLayer var10 = new ItemLayer(); // L: 211 - var10.first = var5; // L: 212 - var10.x = var2 * 128 + 64; // L: 213 - var10.y = var3 * 128 + 64; // L: 214 - var10.z = var4; // L: 215 - var10.tag = var6; // L: 216 - var10.second = var8; // L: 217 - var10.third = var9; // L: 218 - int var11 = 0; // L: 219 - Tile var12 = this.tiles[var1][var2][var3]; // L: 220 - if (var12 != null) { // L: 221 - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 222 - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 223 - Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 224 - var14.calculateBoundsCylinder(); // L: 225 - if (var14.height > var11) { // L: 226 + ItemLayer var10 = new ItemLayer(); // L: 207 + var10.first = var5; // L: 208 + var10.x = var2 * 128 + 64; // L: 209 + var10.y = var3 * 128 + 64; // L: 210 + var10.z = var4; // L: 211 + var10.tag = var6; // L: 212 + var10.second = var8; // L: 213 + var10.third = var9; // L: 214 + int var11 = 0; // L: 215 + Tile var12 = this.tiles[var1][var2][var3]; // L: 216 + if (var12 != null) { // L: 217 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 218 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 219 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 220 + var14.calculateBoundsCylinder(); // L: 221 + if (var14.height > var11) { // L: 222 var11 = var14.height; } } } } - var10.height = var11; // L: 230 + var10.height = var11; // L: 226 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 231 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 227 } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 232 - } // L: 233 + this.tiles[var1][var2][var3].itemLayer = var10; // L: 228 + } // L: 229 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIIILgh;Lgh;IIJI)V" + descriptor = "(IIIILix;Lix;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { // L: 236 - BoundaryObject var12 = new BoundaryObject(); // L: 237 - var12.tag = var9; // L: 238 - var12.flags = var11; // L: 239 - var12.x = var2 * 128 + 64; // L: 240 - var12.y = var3 * 128 + 64; // L: 241 - var12.z = var4; // L: 242 - var12.renderable1 = var5; // L: 243 - var12.renderable2 = var6; // L: 244 - var12.orientationA = var7; // L: 245 - var12.orientationB = var8; // L: 246 + if (var5 != null || var6 != null) { // L: 232 + BoundaryObject var12 = new BoundaryObject(); // L: 233 + var12.tag = var9; // L: 234 + var12.flags = var11; // L: 235 + var12.x = var2 * 128 + 64; // L: 236 + var12.y = var3 * 128 + 64; // L: 237 + var12.z = var4; // L: 238 + var12.renderable1 = var5; // L: 239 + var12.renderable2 = var6; // L: 240 + var12.orientationA = var7; // L: 241 + var12.orientationB = var8; // L: 242 for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 247 + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 243 } } - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 248 + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 244 } - } // L: 249 + } // L: 245 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIILgh;Lgh;IIIIJI)V" + descriptor = "(IIIILix;Lix;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { // L: 252 - WallDecoration var14 = new WallDecoration(); // L: 253 - var14.tag = var11; // L: 254 - var14.flags = var13; // L: 255 - var14.x = var2 * 128 + 64; // L: 256 - var14.y = var3 * 128 + 64; // L: 257 - var14.z = var4; // L: 258 - var14.renderable1 = var5; // L: 259 - var14.renderable2 = var6; // L: 260 - var14.orientation = var7; // L: 261 - var14.orientation2 = var8; // L: 262 - var14.xOffset = var9; // L: 263 - var14.yOffset = var10; // L: 264 + if (var5 != null) { // L: 248 + WallDecoration var14 = new WallDecoration(); // L: 249 + var14.tag = var11; // L: 250 + var14.flags = var13; // L: 251 + var14.x = var2 * 128 + 64; // L: 252 + var14.y = var3 * 128 + 64; // L: 253 + var14.z = var4; // L: 254 + var14.renderable1 = var5; // L: 255 + var14.renderable2 = var6; // L: 256 + var14.orientation = var7; // L: 257 + var14.orientation2 = var8; // L: 258 + var14.xOffset = var9; // L: 259 + var14.yOffset = var10; // L: 260 for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 265 + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 261 } } - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 266 + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 262 } - } // L: 267 + } // L: 263 - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIIIILgh;IJI)Z" + descriptor = "(IIIIIILix;IJI)Z" ) - public boolean method4138(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { // L: 270 + public boolean method4882(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 266 return true; } else { - int var12 = var5 * 64 + var2 * 128; // L: 271 - int var13 = var6 * 64 + var3 * 128; // L: 272 - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 273 + int var12 = var5 * 64 + var2 * 128; // L: 267 + int var13 = var6 * 64 + var3 * 128; // L: 268 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 269 } } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIIILgh;IJZ)Z" + descriptor = "(IIIIILix;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { - if (var6 == null) { // L: 277 + if (var6 == null) { // L: 273 return true; } else { - int var11 = var2 - var5; // L: 278 - int var12 = var3 - var5; // L: 279 - int var13 = var5 + var2; // L: 280 - int var14 = var3 + var5; // L: 281 - if (var10) { // L: 282 - if (var7 > 640 && var7 < 1408) { // L: 283 + int var11 = var2 - var5; // L: 274 + int var12 = var3 - var5; // L: 275 + int var13 = var5 + var2; // L: 276 + int var14 = var3 + var5; // L: 277 + if (var10) { // L: 278 + if (var7 > 640 && var7 < 1408) { // L: 279 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 284 + if (var7 > 1152 && var7 < 1920) { // L: 280 var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 285 + if (var7 > 1664 || var7 < 384) { // L: 281 var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 286 + if (var7 > 128 && var7 < 896) { // L: 282 var11 -= 128; } } - var11 /= 128; // L: 288 - var12 /= 128; // L: 289 - var13 /= 128; // L: 290 - var14 /= 128; // L: 291 - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 + var11 /= 128; // L: 284 + var12 /= 128; // L: 285 + var13 /= 128; // L: 286 + var14 /= 128; // L: 287 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 288 } } - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIIILgh;IJIIII)Z" + descriptor = "(IIIIILix;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { - return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 296 297 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 293 } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIIIIIILgh;IZJI)Z" + descriptor = "(IIIIIIIILix;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { int var16; - for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 301 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 302 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 303 + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 297 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 298 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 299 return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 304 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 305 + Tile var23 = this.tiles[var1][var15][var16]; // L: 300 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 301 return false; } } } - GameObject var21 = new GameObject(); // L: 308 - var21.tag = var12; // L: 309 - var21.flags = var14; // L: 310 - var21.plane = var1; // L: 311 - var21.centerX = var6; // L: 312 - var21.centerY = var7; // L: 313 - var21.z = var8; // L: 314 - var21.renderable = var9; // L: 315 - var21.orientation = var10; // L: 316 - var21.startX = var2; // L: 317 - var21.startY = var3; // L: 318 - var21.endX = var2 + var4 - 1; // L: 319 - var21.endY = var3 + var5 - 1; // L: 320 + GameObject var21 = new GameObject(); // L: 304 + var21.tag = var12; // L: 305 + var21.flags = var14; // L: 306 + var21.plane = var1; // L: 307 + var21.centerX = var6; // L: 308 + var21.centerY = var7; // L: 309 + var21.z = var8; // L: 310 + var21.renderable = var9; // L: 311 + var21.orientation = var10; // L: 312 + var21.startX = var2; // L: 313 + var21.startY = var3; // L: 314 + var21.endX = var2 + var4 - 1; // L: 315 + var21.endY = var3 + var5 - 1; // L: 316 - for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 321 - for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 322 - int var18 = 0; // L: 323 - if (var16 > var2) { // L: 324 + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 317 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 318 + int var18 = 0; // L: 319 + if (var16 > var2) { // L: 320 ++var18; } - if (var16 < var2 + var4 - 1) { // L: 325 + if (var16 < var2 + var4 - 1) { // L: 321 var18 += 4; } - if (var17 > var3) { // L: 326 + if (var17 > var3) { // L: 322 var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 327 + if (var17 < var3 + var5 - 1) { // L: 323 var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 328 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 324 } } - Tile var22 = this.tiles[var1][var16][var17]; // L: 329 - var22.gameObjects[var22.gameObjectsCount] = var21; // L: 330 - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 331 - var22.gameObjectsEdgeMask |= var18; // L: 333 - ++var22.gameObjectsCount; // L: 334 + Tile var22 = this.tiles[var1][var16][var17]; // L: 325 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 326 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 327 + var22.gameObjectsEdgeMask |= var18; // L: 329 + ++var22.gameObjectsCount; // L: 330 } } - if (var11) { // L: 337 + if (var11) { // L: 333 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 338 + return true; // L: 334 } - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 342 - GameObject var2 = this.tempGameObjects[var1]; // L: 343 - this.removeGameObject(var2); // L: 344 - this.tempGameObjects[var1] = null; // L: 345 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 338 + GameObject var2 = this.tempGameObjects[var1]; // L: 339 + this.removeGameObject(var2); // L: 340 + this.tempGameObjects[var1] = null; // L: 341 } - this.tempGameObjectsCount = 0; // L: 347 - } // L: 348 + this.tempGameObjectsCount = 0; // L: 343 + } // L: 344 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lhg;)V" + descriptor = "(Liy;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 351 - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 352 - Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 353 - if (var4 != null) { // L: 354 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 347 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 348 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 349 + if (var4 != null) { // L: 350 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 355 - if (var4.gameObjects[var5] == var1) { // L: 356 - --var4.gameObjectsCount; // L: 357 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 351 + if (var4.gameObjects[var5] == var1) { // L: 352 + --var4.gameObjectsCount; // L: 353 - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 358 - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 359 - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 360 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 354 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 355 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 356 } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 362 + var4.gameObjects[var4.gameObjectsCount] = null; // L: 358 break; } } - var4.gameObjectsEdgeMask = 0; // L: 366 + var4.gameObjectsEdgeMask = 0; // L: 362 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 367 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 369 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 363 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 365 } } } } - } // L: 374 + } // L: 370 - @ObfuscatedName("b") - public void method4144(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 377 - if (var5 != null) { // L: 378 - WallDecoration var6 = var5.wallDecoration; // L: 379 - if (var6 != null) { // L: 380 - var6.xOffset = var4 * var6.xOffset / 16; // L: 381 - var6.yOffset = var4 * var6.yOffset / 16; // L: 382 + @ObfuscatedName("u") + public void method4748(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 373 + if (var5 != null) { // L: 374 + WallDecoration var6 = var5.wallDecoration; // L: 375 + if (var6 != null) { // L: 376 + var6.xOffset = var4 * var6.xOffset / 16; // L: 377 + var6.yOffset = var4 * var6.yOffset / 16; // L: 378 } } - } // L: 383 + } // L: 379 - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 386 + Tile var4 = this.tiles[var1][var2][var3]; // L: 382 if (var4 != null) { - var4.boundaryObject = null; // L: 388 + var4.boundaryObject = null; // L: 384 } - } // L: 387 389 + } // L: 383 385 - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 392 + Tile var4 = this.tiles[var1][var2][var3]; // L: 388 if (var4 != null) { - var4.wallDecoration = null; // L: 394 + var4.wallDecoration = null; // L: 390 } - } // L: 393 395 + } // L: 389 391 - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 398 - if (var4 != null) { // L: 399 - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 400 - GameObject var6 = var4.gameObjects[var5]; // L: 401 - long var8 = var6.tag; // L: 403 - int var10 = (int)(var8 >>> 14 & 3L); // L: 407 - boolean var7 = var10 == 2; // L: 409 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 411 - this.removeGameObject(var6); // L: 412 - return; // L: 413 + Tile var4 = this.tiles[var1][var2][var3]; // L: 394 + if (var4 != null) { // L: 395 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 396 + GameObject var6 = var4.gameObjects[var5]; // L: 397 + long var8 = var6.tag; // L: 399 + boolean var7 = FloorDecoration.method4592(var8) == 2; // L: 401 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 403 + this.removeGameObject(var6); // L: 404 + return; // L: 405 } } } - } // L: 416 + } // L: 408 - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 419 + Tile var4 = this.tiles[var1][var2][var3]; // L: 411 if (var4 != null) { - var4.floorDecoration = null; // L: 421 + var4.floorDecoration = null; // L: 413 } - } // L: 420 422 + } // L: 412 414 @ObfuscatedName("y") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 425 + Tile var4 = this.tiles[var1][var2][var3]; // L: 417 if (var4 != null) { - var4.itemLayer = null; // L: 427 + var4.itemLayer = null; // L: 419 } - } // L: 426 428 + } // L: 418 420 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(III)Lhu;" + descriptor = "(III)Lij;" ) - public BoundaryObject method4150(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 431 - return var4 == null ? null : var4.boundaryObject; // L: 432 433 + public BoundaryObject method4754(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 423 + return var4 == null ? null : var4.boundaryObject; // L: 424 425 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)Lhr;" + descriptor = "(III)Lio;" ) - public WallDecoration method4224(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 437 - return var4 == null ? null : var4.wallDecoration; // L: 438 439 + public WallDecoration method4860(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 429 + return var4 == null ? null : var4.wallDecoration; // L: 430 431 } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhg;" + descriptor = "(III)Liy;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 443 - if (var4 == null) { // L: 444 + Tile var4 = this.tiles[var1][var2][var3]; // L: 435 + if (var4 == null) { // L: 436 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 445 - GameObject var6 = var4.gameObjects[var5]; // L: 446 - long var8 = var6.tag; // L: 448 - int var10 = (int)(var8 >>> 14 & 3L); // L: 452 - boolean var7 = var10 == 2; // L: 454 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 456 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 437 + GameObject var6 = var4.gameObjects[var5]; // L: 438 + long var8 = var6.tag; // L: 440 + boolean var7 = FloorDecoration.method4592(var8) == 2; // L: 442 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 444 return var6; } } - return null; // L: 458 + return null; // L: 446 } } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Lgb;" + descriptor = "(III)Lhp;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 462 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 463 464 + Tile var4 = this.tiles[var1][var2][var3]; // L: 450 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 451 452 } - @ObfuscatedName("ac") + @ObfuscatedName("ae") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 468 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 469 470 + Tile var4 = this.tiles[var1][var2][var3]; // L: 456 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 457 458 } - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 474 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 475 476 + Tile var4 = this.tiles[var1][var2][var3]; // L: 462 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 463 464 } - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 480 - if (var4 == null) { // L: 481 + Tile var4 = this.tiles[var1][var2][var3]; // L: 468 + if (var4 == null) { // L: 469 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 482 - GameObject var6 = var4.gameObjects[var5]; // L: 483 - long var8 = var6.tag; // L: 485 - int var10 = (int)(var8 >>> 14 & 3L); // L: 489 - boolean var7 = var10 == 2; // L: 491 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 493 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 470 + GameObject var6 = var4.gameObjects[var5]; // L: 471 + long var8 = var6.tag; // L: 473 + boolean var7 = FloorDecoration.method4592(var8) == 2; // L: 475 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 477 return var6.tag; } } - return 0L; // L: 495 + return 0L; // L: 479 } } - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 499 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 500 501 + Tile var4 = this.tiles[var1][var2][var3]; // L: 483 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 484 485 } - @ObfuscatedName("at") + @ObfuscatedName("ak") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 505 - if (var6 == null) { // L: 506 + Tile var6 = this.tiles[var1][var2][var3]; // L: 489 + if (var6 == null) { // L: 490 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 507 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 491 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 508 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 492 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 509 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 493 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 510 - if (var6.gameObjects[var7].tag == var4) { // L: 511 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 494 + if (var6.gameObjects[var7].tag == var4) { // L: 495 return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 513 + return -1; // L: 497 } } - @ObfuscatedName("aw") - public void method4158(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { // L: 517 - for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 518 - for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 519 - Tile var7 = this.tiles[var4][var5][var6]; // L: 520 - if (var7 != null) { // L: 521 - BoundaryObject var8 = var7.boundaryObject; // L: 522 + @ObfuscatedName("ao") + public void method4762(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 501 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 502 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 503 + Tile var7 = this.tiles[var4][var5][var6]; // L: 504 + if (var7 != null) { // L: 505 + BoundaryObject var8 = var7.boundaryObject; // L: 506 ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 523 - ModelData var9 = (ModelData)var8.renderable1; // L: 524 - this.method4160(var9, var4, var5, var6, 1, 1); // L: 525 - if (var8.renderable2 instanceof ModelData) { // L: 526 - var10 = (ModelData)var8.renderable2; // L: 527 - this.method4160(var10, var4, var5, var6, 1, 1); // L: 528 - ModelData.method3976(var9, var10, 0, 0, 0, false); // L: 529 - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 507 + ModelData var9 = (ModelData)var8.renderable1; // L: 508 + this.method4764(var9, var4, var5, var6, 1, 1); // L: 509 + if (var8.renderable2 instanceof ModelData) { // L: 510 + var10 = (ModelData)var8.renderable2; // L: 511 + this.method4764(var10, var4, var5, var6, 1, 1); // L: 512 + ModelData.method4531(var9, var10, 0, 0, 0, false); // L: 513 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 514 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 532 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 516 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 534 - GameObject var14 = var7.gameObjects[var12]; // L: 535 - if (var14 != null && var14.renderable instanceof ModelData) { // L: 536 - ModelData var11 = (ModelData)var14.renderable; // L: 537 - this.method4160(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 538 - var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 539 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 518 + GameObject var14 = var7.gameObjects[var12]; // L: 519 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 520 + ModelData var11 = (ModelData)var14.renderable; // L: 521 + this.method4764(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 522 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 523 } } - FloorDecoration var13 = var7.floorDecoration; // L: 542 - if (var13 != null && var13.renderable instanceof ModelData) { // L: 543 - var10 = (ModelData)var13.renderable; // L: 544 - this.method4159(var10, var4, var5, var6); // L: 545 - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 546 + FloorDecoration var13 = var7.floorDecoration; // L: 526 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 527 + var10 = (ModelData)var13.renderable; // L: 528 + this.method4763(var10, var4, var5, var6); // L: 529 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 } } } } } - } // L: 552 + } // L: 536 - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lgt;III)V" + descriptor = "(Lhc;III)V" ) - void method4159(ModelData var1, int var2, int var3, int var4) { + void method4763(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 555 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 556 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 557 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 558 - ModelData.method3976(var1, var6, 128, 0, 0, true); // L: 559 + if (var3 < this.xSize) { // L: 539 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 540 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 541 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 542 + ModelData.method4531(var1, var6, 128, 0, 0, true); // L: 543 } } - if (var4 < this.xSize) { // L: 562 - var5 = this.tiles[var2][var3][var4 + 1]; // L: 563 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 564 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 565 - ModelData.method3976(var1, var6, 0, 0, 128, true); // L: 566 + if (var4 < this.xSize) { // L: 546 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 547 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 548 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 549 + ModelData.method4531(var1, var6, 0, 0, 128, true); // L: 550 } } - if (var3 < this.xSize && var4 < this.ySize) { // L: 569 - var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 570 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 571 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 572 - ModelData.method3976(var1, var6, 128, 0, 128, true); // L: 573 + if (var3 < this.xSize && var4 < this.ySize) { // L: 553 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 554 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 555 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 556 + ModelData.method4531(var1, var6, 128, 0, 128, true); // L: 557 } } - if (var3 < this.xSize && var4 > 0) { // L: 576 - var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 577 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 578 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 579 - ModelData.method3976(var1, var6, 128, 0, -128, true); // L: 580 + if (var3 < this.xSize && var4 > 0) { // L: 560 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 561 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 562 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 563 + ModelData.method4531(var1, var6, 128, 0, -128, true); // L: 564 } } - } // L: 583 + } // L: 567 - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lgt;IIIII)V" + descriptor = "(Lhc;IIIII)V" ) - void method4160(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 586 - int var8 = var3; // L: 587 - int var9 = var3 + var5; // L: 588 - int var10 = var4 - 1; // L: 589 - int var11 = var4 + var6; // L: 590 + void method4764(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 570 + int var8 = var3; // L: 571 + int var9 = var3 + var5; // L: 572 + int var10 = var4 - 1; // L: 573 + int var11 = var4 + var6; // L: 574 - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 591 - if (var12 != this.planes) { // L: 592 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 593 - if (var13 >= 0 && var13 < this.xSize) { // L: 594 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 595 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 596 597 - Tile var15 = this.tiles[var12][var13][var14]; // L: 598 - if (var15 != null) { // L: 599 - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 600 - BoundaryObject var17 = var15.boundaryObject; // L: 601 - if (var17 != null) { // L: 602 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 575 + if (var12 != this.planes) { // L: 576 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 577 + if (var13 >= 0 && var13 < this.xSize) { // L: 578 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 579 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 580 581 + Tile var15 = this.tiles[var12][var13][var14]; // L: 582 + if (var15 != null) { // L: 583 + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 584 + BoundaryObject var17 = var15.boundaryObject; // L: 585 + if (var17 != null) { // L: 586 ModelData var18; - if (var17.renderable1 instanceof ModelData) { // L: 603 - var18 = (ModelData)var17.renderable1; // L: 604 - ModelData.method3976(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 605 + if (var17.renderable1 instanceof ModelData) { // L: 587 + var18 = (ModelData)var17.renderable1; // L: 588 + ModelData.method4531(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 589 } - if (var17.renderable2 instanceof ModelData) { // L: 607 - var18 = (ModelData)var17.renderable2; // L: 608 - ModelData.method3976(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 609 + if (var17.renderable2 instanceof ModelData) { // L: 591 + var18 = (ModelData)var17.renderable2; // L: 592 + ModelData.method4531(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 593 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 612 - GameObject var19 = var15.gameObjects[var23]; // L: 613 - if (var19 != null && var19.renderable instanceof ModelData) { // L: 614 - ModelData var20 = (ModelData)var19.renderable; // L: 615 - int var21 = var19.endX - var19.startX + 1; // L: 616 - int var22 = var19.endY - var19.startY + 1; // L: 617 - ModelData.method3976(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 618 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 596 + GameObject var19 = var15.gameObjects[var23]; // L: 597 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 598 + ModelData var20 = (ModelData)var19.renderable; // L: 599 + int var21 = var19.endX - var19.startX + 1; // L: 600 + int var22 = var19.endY - var19.startY + 1; // L: 601 + ModelData.method4531(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 602 } } } @@ -974,179 +970,179 @@ public class Scene { } } - --var8; // L: 623 - var7 = false; // L: 624 + --var8; // L: 607 + var7 = false; // L: 608 } } - } // L: 626 + } // L: 610 - @ObfuscatedName("ab") + @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]; // L: 629 - if (var7 != null) { // L: 630 - SceneTilePaint var8 = var7.paint; // L: 631 + Tile var7 = this.tiles[var4][var5][var6]; // L: 613 + if (var7 != null) { // L: 614 + SceneTilePaint var8 = var7.paint; // L: 615 int var10; - if (var8 != null) { // L: 632 - int var18 = var8.rgb; // L: 633 - if (var18 != 0) { // L: 634 - for (var10 = 0; var10 < 4; ++var10) { // L: 635 - var1[var2] = var18; // L: 636 - var1[var2 + 1] = var18; // L: 637 - var1[var2 + 2] = var18; // L: 638 - var1[var2 + 3] = var18; // L: 639 - var2 += var3; // L: 640 + if (var8 != null) { // L: 616 + int var18 = var8.rgb; // L: 617 + if (var18 != 0) { // L: 618 + for (var10 = 0; var10 < 4; ++var10) { // L: 619 + var1[var2] = var18; // L: 620 + var1[var2 + 1] = var18; // L: 621 + var1[var2 + 2] = var18; // L: 622 + var1[var2 + 3] = var18; // L: 623 + var2 += var3; // L: 624 } } } else { - SceneTileModel var9 = var7.model; // L: 644 - if (var9 != null) { // L: 645 - var10 = var9.shape; // L: 646 - int var11 = var9.rotation; // L: 647 - int var12 = var9.underlayRgb; // L: 648 - int var13 = var9.overlayRgb; // L: 649 - int[] var14 = this.tileShape2D[var10]; // L: 650 - int[] var15 = this.tileRotation2D[var11]; // L: 651 - int var16 = 0; // L: 652 + SceneTileModel var9 = var7.model; // L: 628 + if (var9 != null) { // L: 629 + var10 = var9.shape; // L: 630 + int var11 = var9.rotation; // L: 631 + int var12 = var9.underlayRgb; // L: 632 + int var13 = var9.overlayRgb; // L: 633 + int[] var14 = this.tileShape2D[var10]; // L: 634 + int[] var15 = this.tileRotation2D[var11]; // L: 635 + int var16 = 0; // L: 636 int var17; - if (var12 != 0) { // L: 653 - for (var17 = 0; var17 < 4; ++var17) { // L: 654 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 655 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 656 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 657 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 658 - var2 += var3; // L: 659 + if (var12 != 0) { // L: 637 + for (var17 = 0; var17 < 4; ++var17) { // L: 638 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 639 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 640 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 641 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 642 + var2 += var3; // L: 643 } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 663 - if (var14[var15[var16++]] != 0) { // L: 664 + for (var17 = 0; var17 < 4; ++var17) { // L: 647 + if (var14[var15[var16++]] != 0) { // L: 648 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 665 + if (var14[var15[var16++]] != 0) { // L: 649 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 666 + if (var14[var15[var16++]] != 0) { // L: 650 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 667 + if (var14[var15[var16++]] != 0) { // L: 651 var1[var2 + 3] = var13; } - var2 += var3; // L: 668 + var2 += var3; // L: 652 } } } } } - } // L: 642 671 + } // L: 626 655 - @ObfuscatedName("aj") + @ObfuscatedName("ay") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 750 - checkClick = true; // L: 751 - viewportWalking = var4; // L: 752 - Scene_selectedPlane = var1; // L: 753 - Scene_selectedScreenX = var2; // L: 754 - Scene_selectedScreenY = var3; // L: 755 - Scene_selectedX = -1; // L: 756 - Scene_selectedY = -1; // L: 757 + if (!shouldSendWalk() || var4) { // L: 734 + checkClick = true; // L: 735 + viewportWalking = var4; // L: 736 + Scene_selectedPlane = var1; // L: 737 + Scene_selectedScreenX = var2; // L: 738 + Scene_selectedScreenY = var3; // L: 739 + Scene_selectedX = -1; // L: 740 + Scene_selectedY = -1; // L: 741 } - } // L: 758 + } // L: 742 - @ObfuscatedName("as") + @ObfuscatedName("ag") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 761 - } // L: 762 + viewportWalking = true; // L: 745 + } // L: 746 - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 774 + if (var1 < 0) { // L: 758 var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 775 + } else if (var1 >= this.xSize * 128) { // L: 759 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 776 + if (var3 < 0) { // L: 760 var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 777 + } else if (var3 >= this.ySize * 128) { // L: 761 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 778 + if (var4 < 128) { // L: 762 var4 = 128; - } else if (var4 > 383) { // L: 779 + } else if (var4 > 383) { // L: 763 var4 = 383; } - ++Scene_drawnCount; // L: 780 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 781 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 782 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 783 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 784 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 785 - Scene_cameraX = var1; // L: 786 - Scene_cameraY = var2; // L: 787 - Scene_cameraZ = var3; // L: 788 - Scene_cameraXTile = var1 / 128; // L: 789 - Scene_cameraYTile = var3 / 128; // L: 790 - Scene_plane = var6; // L: 791 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 792 - if (Scene_cameraXTileMin < 0) { // L: 793 + ++Scene_drawnCount; // L: 764 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 765 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 766 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 767 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 768 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 769 + Scene_cameraX = var1; // L: 770 + Scene_cameraY = var2; // L: 771 + Scene_cameraZ = var3; // L: 772 + Scene_cameraXTile = var1 / 128; // L: 773 + Scene_cameraYTile = var3 / 128; // L: 774 + Scene_plane = var6; // L: 775 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 776 + if (Scene_cameraXTileMin < 0) { // L: 777 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 794 - if (Scene_cameraYTileMin < 0) { // L: 795 + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 778 + if (Scene_cameraYTileMin < 0) { // L: 779 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 796 - if (Scene_cameraXTileMax > this.xSize) { // L: 797 + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 780 + if (Scene_cameraXTileMax > this.xSize) { // L: 781 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 798 - if (Scene_cameraYTileMax > this.ySize) { // L: 799 + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 782 + if (Scene_cameraYTileMax > this.ySize) { // L: 783 Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 800 - tileUpdateCount = 0; // L: 801 + this.occlude(); // L: 784 + tileUpdateCount = 0; // L: 785 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 802 - var8 = this.tiles[var7]; // L: 803 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 786 + var8 = this.tiles[var7]; // L: 787 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 804 - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 805 - Tile var16 = var8[var9][var10]; // L: 806 - if (var16 != null) { // L: 807 - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 808 - var16.drawPrimary = true; // L: 814 - var16.drawSecondary = true; // L: 815 - if (var16.gameObjectsCount > 0) { // L: 816 - var16.drawGameObjects = true; + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 788 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 789 + Tile var16 = var8[var9][var10]; // L: 790 + if (var16 != null) { // L: 791 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 792 + var16.drawPrimary = true; // L: 798 + var16.drawSecondary = true; // L: 799 + if (var16.gameObjectsCount > 0) { + var16.drawGameObjects = true; // L: 800 } else { - var16.drawGameObjects = false; // L: 817 + var16.drawGameObjects = false; // L: 801 } - ++tileUpdateCount; // L: 818 + ++tileUpdateCount; // L: 802 } else { - var16.drawPrimary = false; // L: 809 - var16.drawSecondary = false; // L: 810 - var16.drawGameObjectEdges = 0; // L: 811 + var16.drawPrimary = false; // L: 793 + var16.drawSecondary = false; // L: 794 + var16.drawGameObjectEdges = 0; // L: 795 } } } @@ -1158,118 +1154,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 824 - var8 = this.tiles[var7]; // L: 825 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 808 + var8 = this.tiles[var7]; // L: 809 - for (var9 = -25; var9 <= 0; ++var9) { // L: 826 - var10 = var9 + Scene_cameraXTile; // L: 827 - var11 = Scene_cameraXTile - var9; // L: 828 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 829 - for (var12 = -25; var12 <= 0; ++var12) { // L: 830 - var13 = var12 + Scene_cameraYTile; // L: 831 - var14 = Scene_cameraYTile - var12; // L: 832 - if (var10 >= Scene_cameraXTileMin) { // L: 833 - if (var13 >= Scene_cameraYTileMin) { // L: 834 - var15 = var8[var10][var13]; // L: 835 - if (var15 != null && var15.drawPrimary) { // L: 836 + for (var9 = -25; var9 <= 0; ++var9) { // L: 810 + var10 = var9 + Scene_cameraXTile; // L: 811 + var11 = Scene_cameraXTile - var9; // L: 812 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 813 + for (var12 = -25; var12 <= 0; ++var12) { // L: 814 + var13 = var12 + Scene_cameraYTile; // L: 815 + var14 = Scene_cameraYTile - var12; // L: 816 + if (var10 >= Scene_cameraXTileMin) { // L: 817 + if (var13 >= Scene_cameraYTileMin) { // L: 818 + var15 = var8[var10][var13]; // L: 819 + if (var15 != null && var15.drawPrimary) { // L: 820 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 838 - var15 = var8[var10][var14]; // L: 839 - if (var15 != null && var15.drawPrimary) { // L: 840 + if (var14 < Scene_cameraYTileMax) { // L: 822 + var15 = var8[var10][var14]; // L: 823 + if (var15 != null && var15.drawPrimary) { // L: 824 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 843 - if (var13 >= Scene_cameraYTileMin) { // L: 844 - var15 = var8[var11][var13]; // L: 845 - if (var15 != null && var15.drawPrimary) { // L: 846 + if (var11 < Scene_cameraXTileMax) { // L: 827 + if (var13 >= Scene_cameraYTileMin) { // L: 828 + var15 = var8[var11][var13]; // L: 829 + if (var15 != null && var15.drawPrimary) { // L: 830 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 848 - var15 = var8[var11][var14]; // L: 849 - if (var15 != null && var15.drawPrimary) { // L: 850 + if (var14 < Scene_cameraYTileMax) { // L: 832 + var15 = var8[var11][var14]; // L: 833 + if (var15 != null && var15.drawPrimary) { // L: 834 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 853 - checkClick = false; // L: 854 - return; // L: 855 + if (tileUpdateCount == 0) { // L: 837 + checkClick = false; // L: 838 + return; // L: 839 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 861 - var8 = this.tiles[var7]; // L: 862 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 845 + var8 = this.tiles[var7]; // L: 846 - for (var9 = -25; var9 <= 0; ++var9) { // L: 863 - var10 = var9 + Scene_cameraXTile; // L: 864 - var11 = Scene_cameraXTile - var9; // L: 865 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 866 - for (var12 = -25; var12 <= 0; ++var12) { // L: 867 - var13 = var12 + Scene_cameraYTile; // L: 868 - var14 = Scene_cameraYTile - var12; // L: 869 - if (var10 >= Scene_cameraXTileMin) { // L: 870 - if (var13 >= Scene_cameraYTileMin) { // L: 871 - var15 = var8[var10][var13]; // L: 872 - if (var15 != null && var15.drawPrimary) { // L: 873 + for (var9 = -25; var9 <= 0; ++var9) { // L: 847 + var10 = var9 + Scene_cameraXTile; // L: 848 + var11 = Scene_cameraXTile - var9; // L: 849 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 850 + for (var12 = -25; var12 <= 0; ++var12) { // L: 851 + var13 = var12 + Scene_cameraYTile; // L: 852 + var14 = Scene_cameraYTile - var12; // L: 853 + if (var10 >= Scene_cameraXTileMin) { // L: 854 + if (var13 >= Scene_cameraYTileMin) { // L: 855 + var15 = var8[var10][var13]; // L: 856 + if (var15 != null && var15.drawPrimary) { // L: 857 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 875 - var15 = var8[var10][var14]; // L: 876 - if (var15 != null && var15.drawPrimary) { // L: 877 + if (var14 < Scene_cameraYTileMax) { // L: 859 + var15 = var8[var10][var14]; // L: 860 + if (var15 != null && var15.drawPrimary) { // L: 861 this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { // L: 880 - if (var13 >= Scene_cameraYTileMin) { // L: 881 - var15 = var8[var11][var13]; // L: 882 - if (var15 != null && var15.drawPrimary) { // L: 883 + if (var11 < Scene_cameraXTileMax) { // L: 864 + if (var13 >= Scene_cameraYTileMin) { // L: 865 + var15 = var8[var11][var13]; // L: 866 + if (var15 != null && var15.drawPrimary) { // L: 867 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 885 - var15 = var8[var11][var14]; // L: 886 - if (var15 != null && var15.drawPrimary) { // L: 887 + if (var14 < Scene_cameraYTileMax) { // L: 869 + var15 = var8[var11][var14]; // L: 870 + if (var15 != null && var15.drawPrimary) { // L: 871 this.drawTile(var15, false); } } } - if (tileUpdateCount == 0) { // L: 890 - checkClick = false; // L: 891 - return; // L: 892 + if (tileUpdateCount == 0) { // L: 874 + checkClick = false; // L: 875 + return; // L: 876 } } } } } - checkClick = false; // L: 898 - } // L: 899 + checkClick = false; // L: 882 + } // L: 883 - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lgy;Z)V" + descriptor = "(Lhu;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 902 + Scene_tilesDeque.addFirst(var1); // L: 886 while (true) { Tile var3; @@ -1301,227 +1297,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 904 - if (var3 == null) { // L: 905 + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 888 + if (var3 == null) { // L: 889 return; } - } while(!var3.drawSecondary); // L: 906 + } while(!var3.drawSecondary); // L: 890 - var4 = var3.x; // L: 907 - var5 = var3.y; // L: 908 - var6 = var3.plane; // L: 909 - var7 = var3.originalPlane; // L: 910 - var8 = this.tiles[var6]; // L: 911 - if (!var3.drawPrimary) { // L: 912 + var4 = var3.x; // L: 891 + var5 = var3.y; // L: 892 + var6 = var3.plane; // L: 893 + var7 = var3.originalPlane; // L: 894 + var8 = this.tiles[var6]; // L: 895 + if (!var3.drawPrimary) { // L: 896 break; } - if (var2) { // L: 913 - if (var6 > 0) { // L: 914 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 915 - if (var9 != null && var9.drawSecondary) { // L: 916 + if (var2) { // L: 897 + if (var6 > 0) { // L: 898 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 899 + if (var9 != null && var9.drawSecondary) { // L: 900 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 918 - var9 = var8[var4 - 1][var5]; // L: 919 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 920 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 902 + var9 = var8[var4 - 1][var5]; // L: 903 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 904 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 922 - var9 = var8[var4 + 1][var5]; // L: 923 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 924 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 906 + var9 = var8[var4 + 1][var5]; // L: 907 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 908 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 926 - var9 = var8[var4][var5 - 1]; // L: 927 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 928 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 910 + var9 = var8[var4][var5 - 1]; // L: 911 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 912 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 930 - var9 = var8[var4][var5 + 1]; // L: 931 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 932 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 914 + var9 = var8[var4][var5 + 1]; // L: 915 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 916 continue; } } } else { - var2 = true; // L: 935 + var2 = true; // L: 919 } - var3.drawPrimary = false; // L: 936 - if (var3.linkedBelowTile != null) { // L: 937 - var9 = var3.linkedBelowTile; // L: 938 - if (var9.paint != null) { // L: 939 - if (!this.method4175(0, var4, var5)) { // L: 940 + var3.drawPrimary = false; // L: 920 + if (var3.linkedBelowTile != null) { // L: 921 + var9 = var3.linkedBelowTile; // L: 922 + if (var9.paint != null) { // L: 923 + if (!this.method4867(0, var4, var5)) { // L: 924 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method4175(0, var4, var5)) { // L: 942 943 + } else if (var9.model != null && !this.method4867(0, var4, var5)) { // L: 926 927 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 945 - if (var10 != null) { // L: 946 + var10 = var9.boundaryObject; // L: 929 + if (var10 != null) { // L: 930 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 947 - var12 = var9.gameObjects[var11]; // L: 948 - if (var12 != null) { // L: 949 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931 + var12 = var9.gameObjects[var11]; // L: 932 + if (var12 != null) { // L: 933 var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.z - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 952 - if (var3.paint != null) { // L: 953 - if (!this.method4175(var7, var4, var5)) { // L: 954 - var20 = true; // L: 955 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 956 + var20 = false; // L: 936 + if (var3.paint != null) { // L: 937 + if (!this.method4867(var7, var4, var5)) { // L: 938 + var20 = true; // L: 939 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 940 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method4175(var7, var4, var5)) { // L: 959 960 - var20 = true; // L: 961 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 962 + } else if (var3.model != null && !this.method4867(var7, var4, var5)) { // L: 943 944 + var20 = true; // L: 945 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 946 } - var21 = 0; // L: 965 - var11 = 0; // L: 966 - BoundaryObject var31 = var3.boundaryObject; // L: 967 - WallDecoration var13 = var3.wallDecoration; // L: 968 - if (var31 != null || var13 != null) { // L: 969 - if (var4 == Scene_cameraXTile) { // L: 970 + var21 = 0; // L: 949 + var11 = 0; // L: 950 + BoundaryObject var31 = var3.boundaryObject; // L: 951 + WallDecoration var13 = var3.wallDecoration; // L: 952 + if (var31 != null || var13 != null) { // L: 953 + if (var4 == Scene_cameraXTile) { // L: 954 ++var21; - } else if (Scene_cameraXTile < var4) { // L: 971 + } else if (Scene_cameraXTile < var4) { // L: 955 var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 972 + if (var5 == Scene_cameraYTile) { // L: 956 var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 973 + } else if (Scene_cameraYTile > var5) { // L: 957 var21 += 6; } - var11 = field2413[var21]; // L: 974 - var3.field2318 = field2415[var21]; // L: 975 + var11 = field2617[var21]; // L: 958 + var3.field2546 = field2650[var21]; // L: 959 } - if (var31 != null) { // L: 977 - if ((var31.orientationA & field2414[var21]) != 0) { // L: 978 - if (var31.orientationA == 16) { // L: 979 - var3.drawGameObjectEdges = 3; // L: 980 - var3.field2300 = field2404[var21]; // L: 981 - var3.field2305 = 3 - var3.field2300; // L: 982 - } else if (var31.orientationA == 32) { // L: 984 - var3.drawGameObjectEdges = 6; // L: 985 - var3.field2300 = field2417[var21]; // L: 986 - var3.field2305 = 6 - var3.field2300; // L: 987 - } else if (var31.orientationA == 64) { // L: 989 - var3.drawGameObjectEdges = 12; // L: 990 - var3.field2300 = field2403[var21]; // L: 991 - var3.field2305 = 12 - var3.field2300; // L: 992 + if (var31 != null) { // L: 961 + if ((var31.orientationA & field2638[var21]) != 0) { // L: 962 + if (var31.orientationA == 16) { // L: 963 + var3.drawGameObjectEdges = 3; // L: 964 + var3.field2544 = field2616[var21]; // L: 965 + var3.field2545 = 3 - var3.field2544; // L: 966 + } else if (var31.orientationA == 32) { // L: 968 + var3.drawGameObjectEdges = 6; // L: 969 + var3.field2544 = field2641[var21]; // L: 970 + var3.field2545 = 6 - var3.field2544; // L: 971 + } else if (var31.orientationA == 64) { // L: 973 + var3.drawGameObjectEdges = 12; // L: 974 + var3.field2544 = field2628[var21]; // L: 975 + var3.field2545 = 12 - var3.field2544; // L: 976 } else { - var3.drawGameObjectEdges = 9; // L: 995 - var3.field2300 = field2419[var21]; // L: 996 - var3.field2305 = 9 - var3.field2300; // L: 997 + var3.drawGameObjectEdges = 9; // L: 979 + var3.field2544 = field2643[var21]; // L: 980 + var3.field2545 = 9 - var3.field2544; // L: 981 } } else { - var3.drawGameObjectEdges = 0; // L: 1000 + var3.drawGameObjectEdges = 0; // L: 984 } - if ((var31.orientationA & var11) != 0 && !this.method4176(var7, var4, var5, var31.orientationA)) { // L: 1001 + if ((var31.orientationA & var11) != 0 && !this.method4780(var7, var4, var5, var31.orientationA)) { // L: 985 var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method4176(var7, var4, var5, var31.orientationB)) { // L: 1002 + if ((var31.orientationB & var11) != 0 && !this.method4780(var7, var4, var5, var31.orientationB)) { // L: 986 var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method4177(var7, var4, var5, var13.renderable1.height)) { // L: 1004 - if ((var13.orientation & var11) != 0) { // L: 1005 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 1006 - } else if (var13.orientation == 256) { // L: 1008 - var14 = var13.x - Scene_cameraX; // L: 1009 - var15 = var13.z - Scene_cameraY; // L: 1010 - var16 = var13.y - Scene_cameraZ; // L: 1011 - var17 = var13.orientation2; // L: 1012 - if (var17 != 1 && var17 != 2) { // L: 1014 - var18 = var14; // L: 1015 + if (var13 != null && !this.method4781(var7, var4, var5, var13.renderable1.height)) { // L: 988 + if ((var13.orientation & var11) != 0) { // L: 989 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 990 + } else if (var13.orientation == 256) { // L: 992 + var14 = var13.x - Scene_cameraX; // L: 993 + var15 = var13.z - Scene_cameraY; // L: 994 + var16 = var13.y - Scene_cameraZ; // L: 995 + var17 = var13.orientation2; // L: 996 + if (var17 != 1 && var17 != 2) { // L: 998 + var18 = var14; // L: 999 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 1017 - var19 = var16; // L: 1018 + if (var17 != 2 && var17 != 3) { // L: 1001 + var19 = var16; // L: 1002 } else { var19 = -var16; } - if (var19 < var18) { // L: 1019 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1020 - } else if (var13.renderable2 != null) { // L: 1022 - var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1023 + if (var19 < var18) { // L: 1003 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1004 + } else if (var13.renderable2 != null) { // L: 1006 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1007 } } } - if (var20) { // L: 1027 - FloorDecoration var22 = var3.floorDecoration; // L: 1028 - if (var22 != null) { // L: 1029 + if (var20) { // L: 1011 + FloorDecoration var22 = var3.floorDecoration; // L: 1012 + if (var22 != null) { // L: 1013 var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.z - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 1030 - if (var23 != null && var23.height == 0) { // L: 1031 - if (var23.second != null) { // L: 1032 + ItemLayer var23 = var3.itemLayer; // L: 1014 + if (var23 != null && var23.height == 0) { // L: 1015 + if (var23.second != null) { // L: 1016 var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 1033 + if (var23.third != null) { // L: 1017 var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 1034 + if (var23.first != null) { // L: 1018 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1037 - if (var14 != 0) { // L: 1038 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1039 - var36 = var8[var4 + 1][var5]; // L: 1040 - if (var36 != null && var36.drawSecondary) { // L: 1041 + var14 = var3.gameObjectsEdgeMask; // L: 1021 + if (var14 != 0) { // L: 1022 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1023 + var36 = var8[var4 + 1][var5]; // L: 1024 + if (var36 != null && var36.drawSecondary) { // L: 1025 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1043 - var36 = var8[var4][var5 + 1]; // L: 1044 - if (var36 != null && var36.drawSecondary) { // L: 1045 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1027 + var36 = var8[var4][var5 + 1]; // L: 1028 + if (var36 != null && var36.drawSecondary) { // L: 1029 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1047 - var36 = var8[var4 - 1][var5]; // L: 1048 - if (var36 != null && var36.drawSecondary) { // L: 1049 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1031 + var36 = var8[var4 - 1][var5]; // L: 1032 + if (var36 != null && var36.drawSecondary) { // L: 1033 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1051 - var36 = var8[var4][var5 - 1]; // L: 1052 - if (var36 != null && var36.drawSecondary) { // L: 1053 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1035 + var36 = var8[var4][var5 - 1]; // L: 1036 + if (var36 != null && var36.drawSecondary) { // L: 1037 Scene_tilesDeque.addFirst(var36); } } @@ -1529,372 +1525,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1057 - var20 = true; // L: 1058 + if (var3.drawGameObjectEdges != 0) { // L: 1041 + var20 = true; // L: 1042 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1059 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2300) { // L: 1060 - var20 = false; // L: 1061 - break; // L: 1062 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1043 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2544) { // L: 1044 + var20 = false; // L: 1045 + break; // L: 1046 } } - if (var20) { // L: 1065 - var10 = var3.boundaryObject; // L: 1066 - if (!this.method4176(var7, var4, var5, var10.orientationA)) { // L: 1067 + if (var20) { // L: 1049 + var10 = var3.boundaryObject; // L: 1050 + if (!this.method4780(var7, var4, var5, var10.orientationA)) { // L: 1051 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1068 + var3.drawGameObjectEdges = 0; // L: 1052 } } - if (!var3.drawGameObjects) { // L: 1071 + if (!var3.drawGameObjects) { // L: 1055 break; } try { - int var34 = var3.gameObjectsCount; // L: 1073 - var3.drawGameObjects = false; // L: 1074 - var21 = 0; // L: 1075 + int var34 = var3.gameObjectsCount; // L: 1057 + var3.drawGameObjects = false; // L: 1058 + var21 = 0; // L: 1059 label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1076 - var12 = var3.gameObjects[var11]; // L: 1077 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1078 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1079 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1080 - var36 = var8[var24][var14]; // L: 1081 - if (var36.drawPrimary) { // L: 1082 - var3.drawGameObjects = true; // L: 1083 - continue label563; // L: 1084 + for (var11 = 0; var11 < var34; ++var11) { // L: 1060 + var12 = var3.gameObjects[var11]; // L: 1061 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1062 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1063 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1064 + var36 = var8[var24][var14]; // L: 1065 + if (var36.drawPrimary) { // L: 1066 + var3.drawGameObjects = true; // L: 1067 + continue label563; // L: 1068 } - if (var36.drawGameObjectEdges != 0) { // L: 1086 - var16 = 0; // L: 1087 - if (var24 > var12.startX) { // L: 1088 + if (var36.drawGameObjectEdges != 0) { // L: 1070 + var16 = 0; // L: 1071 + if (var24 > var12.startX) { // L: 1072 ++var16; } - if (var24 < var12.endX) { // L: 1089 + if (var24 < var12.endX) { // L: 1073 var16 += 4; } - if (var14 > var12.startY) { // L: 1090 + if (var14 > var12.startY) { // L: 1074 var16 += 8; } - if (var14 < var12.endY) { // L: 1091 + if (var14 < var12.endY) { // L: 1075 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2305) { // L: 1092 - var3.drawGameObjects = true; // L: 1093 - continue label563; // L: 1094 + if ((var16 & var36.drawGameObjectEdges) == var3.field2545) { // L: 1076 + var3.drawGameObjects = true; // L: 1077 + continue label563; // L: 1078 } } } } - gameObjects[var21++] = var12; // L: 1099 - var24 = Scene_cameraXTile - var12.startX; // L: 1100 - var14 = var12.endX - Scene_cameraXTile; // L: 1101 - if (var14 > var24) { // L: 1102 + gameObjects[var21++] = var12; // L: 1083 + var24 = Scene_cameraXTile - var12.startX; // L: 1084 + var14 = var12.endX - Scene_cameraXTile; // L: 1085 + if (var14 > var24) { // L: 1086 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1103 - var16 = var12.endY - Scene_cameraYTile; // L: 1104 - if (var16 > var15) { // L: 1105 - var12.field2639 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1087 + var16 = var12.endY - Scene_cameraYTile; // L: 1088 + if (var16 > var15) { // L: 1089 + var12.field2865 = var24 + var16; } else { - var12.field2639 = var24 + var15; // L: 1106 + var12.field2865 = var24 + var15; // L: 1090 } } } - while (var21 > 0) { // L: 1109 - var11 = -50; // L: 1110 - var25 = -1; // L: 1111 + while (var21 > 0) { // L: 1093 + var11 = -50; // L: 1094 + var25 = -1; // L: 1095 - for (var24 = 0; var24 < var21; ++var24) { // L: 1112 - GameObject var35 = gameObjects[var24]; // L: 1113 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1114 - if (var35.field2639 > var11) { // L: 1115 - var11 = var35.field2639; // L: 1116 - var25 = var24; // L: 1117 - } else if (var11 == var35.field2639) { // L: 1119 - var15 = var35.centerX - Scene_cameraX; // L: 1120 - var16 = var35.centerY - Scene_cameraZ; // L: 1121 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1122 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1123 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1124 + for (var24 = 0; var24 < var21; ++var24) { // L: 1096 + GameObject var35 = gameObjects[var24]; // L: 1097 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1098 + if (var35.field2865 > var11) { // L: 1099 + var11 = var35.field2865; // L: 1100 + var25 = var24; // L: 1101 + } else if (var11 == var35.field2865) { // L: 1103 + var15 = var35.centerX - Scene_cameraX; // L: 1104 + var16 = var35.centerY - Scene_cameraZ; // L: 1105 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1106 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1107 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1108 var25 = var24; } } } } - if (var25 == -1) { // L: 1128 + if (var25 == -1) { // L: 1112 break; } - GameObject var33 = gameObjects[var25]; // L: 1129 - var33.lastDrawn = Scene_drawnCount; // L: 1130 - if (!this.method4178(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1131 - var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1132 + GameObject var33 = gameObjects[var25]; // L: 1113 + var33.lastDrawn = Scene_drawnCount; // L: 1114 + if (!this.method4782(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115 + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1134 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1135 - Tile var26 = var8[var14][var15]; // L: 1136 - if (var26.drawGameObjectEdges != 0) { // L: 1137 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1118 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1119 + Tile var26 = var8[var14][var15]; // L: 1120 + if (var26.drawGameObjectEdges != 0) { // L: 1121 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1138 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1122 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1142 + if (!var3.drawGameObjects) { // L: 1126 break; } - } catch (Exception var28) { // L: 1144 - var3.drawGameObjects = false; // L: 1145 + } catch (Exception var28) { // L: 1128 + var3.drawGameObjects = false; // L: 1129 break; } } - } while(!var3.drawSecondary); // L: 1148 - } while(var3.drawGameObjectEdges != 0); // L: 1149 + } while(!var3.drawSecondary); // L: 1132 + } while(var3.drawGameObjectEdges != 0); // L: 1133 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1150 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1134 break; } - var9 = var8[var4 - 1][var5]; // L: 1151 - } while(var9 != null && var9.drawSecondary); // L: 1152 + var9 = var8[var4 - 1][var5]; // L: 1135 + } while(var9 != null && var9.drawSecondary); // L: 1136 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1154 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1138 break; } - var9 = var8[var4 + 1][var5]; // L: 1155 - } while(var9 != null && var9.drawSecondary); // L: 1156 + var9 = var8[var4 + 1][var5]; // L: 1139 + } while(var9 != null && var9.drawSecondary); // L: 1140 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1158 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1142 break; } - var9 = var8[var4][var5 - 1]; // L: 1159 - } while(var9 != null && var9.drawSecondary); // L: 1160 + var9 = var8[var4][var5 - 1]; // L: 1143 + } while(var9 != null && var9.drawSecondary); // L: 1144 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1162 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1146 break; } - var9 = var8[var4][var5 + 1]; // L: 1163 - } while(var9 != null && var9.drawSecondary); // L: 1164 + var9 = var8[var4][var5 + 1]; // L: 1147 + } while(var9 != null && var9.drawSecondary); // L: 1148 - var3.drawSecondary = false; // L: 1166 - --tileUpdateCount; // L: 1167 - ItemLayer var32 = var3.itemLayer; // L: 1168 - if (var32 != null && var32.height != 0) { // L: 1169 - if (var32.second != null) { // L: 1170 + var3.drawSecondary = false; // L: 1150 + --tileUpdateCount; // L: 1151 + ItemLayer var32 = var3.itemLayer; // L: 1152 + if (var32 != null && var32.height != 0) { // L: 1153 + if (var32.second != null) { // L: 1154 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1171 + if (var32.third != null) { // L: 1155 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1172 + if (var32.first != null) { // L: 1156 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field2318 != 0) { // L: 1174 - WallDecoration var29 = var3.wallDecoration; // L: 1175 - if (var29 != null && !this.method4177(var7, var4, var5, var29.renderable1.height)) { // L: 1176 - if ((var29.orientation & var3.field2318) != 0) { // L: 1177 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1178 - } else if (var29.orientation == 256) { // L: 1180 - var11 = var29.x - Scene_cameraX; // L: 1181 - var25 = var29.z - Scene_cameraY; // L: 1182 - var24 = var29.y - Scene_cameraZ; // L: 1183 - var14 = var29.orientation2; // L: 1184 - if (var14 != 1 && var14 != 2) { // L: 1186 - var15 = var11; // L: 1187 + if (var3.field2546 != 0) { // L: 1158 + WallDecoration var29 = var3.wallDecoration; // L: 1159 + if (var29 != null && !this.method4781(var7, var4, var5, var29.renderable1.height)) { // L: 1160 + if ((var29.orientation & var3.field2546) != 0) { // L: 1161 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1162 + } else if (var29.orientation == 256) { // L: 1164 + var11 = var29.x - Scene_cameraX; // L: 1165 + var25 = var29.z - Scene_cameraY; // L: 1166 + var24 = var29.y - Scene_cameraZ; // L: 1167 + var14 = var29.orientation2; // L: 1168 + if (var14 != 1 && var14 != 2) { // L: 1170 + var15 = var11; // L: 1171 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1189 - var16 = var24; // L: 1190 + if (var14 != 2 && var14 != 3) { // L: 1173 + var16 = var24; // L: 1174 } else { var16 = -var24; } - if (var16 >= var15) { // L: 1191 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1192 - } else if (var29.renderable2 != null) { // L: 1194 - var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1195 + if (var16 >= var15) { // L: 1175 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1176 + } else if (var29.renderable2 != null) { // L: 1178 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1179 } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1199 - if (var27 != null) { // L: 1200 - if ((var27.orientationB & var3.field2318) != 0 && !this.method4176(var7, var4, var5, var27.orientationB)) { // L: 1201 + BoundaryObject var27 = var3.boundaryObject; // L: 1183 + if (var27 != null) { // L: 1184 + if ((var27.orientationB & var3.field2546) != 0 && !this.method4780(var7, var4, var5, var27.orientationB)) { // L: 1185 var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2318) != 0 && !this.method4176(var7, var4, var5, var27.orientationA)) { // L: 1202 + if ((var27.orientationA & var3.field2546) != 0 && !this.method4780(var7, var4, var5, var27.orientationA)) { // L: 1186 var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1205 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1206 + if (var6 < this.planes - 1) { // L: 1189 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1190 + if (var30 != null && var30.drawSecondary) { // L: 1191 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var4 < Scene_cameraXTile) { // L: 1193 + var30 = var8[var4 + 1][var5]; // L: 1194 + if (var30 != null && var30.drawSecondary) { // L: 1195 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var5 < Scene_cameraYTile) { // L: 1197 + var30 = var8[var4][var5 + 1]; // L: 1198 + if (var30 != null && var30.drawSecondary) { // L: 1199 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var4 > Scene_cameraXTile) { // L: 1201 + var30 = var8[var4 - 1][var5]; // L: 1202 + if (var30 != null && var30.drawSecondary) { // L: 1203 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var5 > Scene_cameraYTile) { // L: 1205 + var30 = var8[var4][var5 - 1]; // L: 1206 if (var30 != null && var30.drawSecondary) { // L: 1207 Scene_tilesDeque.addFirst(var30); } } - - if (var4 < Scene_cameraXTile) { // L: 1209 - var30 = var8[var4 + 1][var5]; // L: 1210 - if (var30 != null && var30.drawSecondary) { // L: 1211 - Scene_tilesDeque.addFirst(var30); - } - } - - if (var5 < Scene_cameraYTile) { // L: 1213 - var30 = var8[var4][var5 + 1]; // L: 1214 - if (var30 != null && var30.drawSecondary) { // L: 1215 - Scene_tilesDeque.addFirst(var30); - } - } - - if (var4 > Scene_cameraXTile) { // L: 1217 - var30 = var8[var4 - 1][var5]; // L: 1218 - if (var30 != null && var30.drawSecondary) { // L: 1219 - Scene_tilesDeque.addFirst(var30); - } - } - - if (var5 > Scene_cameraYTile) { // L: 1221 - var30 = var8[var4][var5 - 1]; // L: 1222 - if (var30 != null && var30.drawSecondary) { // L: 1223 - Scene_tilesDeque.addFirst(var30); - } - } } } - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lhj;IIIIIII)V" + descriptor = "(Liv;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; - int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1231 + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1215 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1233 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1217 int var13; - int var14 = var13 = var10 + 128; // L: 1235 + int var14 = var13 = var10 + 128; // L: 1219 int var15; - int var16 = var15 = var12 + 128; // L: 1237 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1238 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1239 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1240 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1241 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1242 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1243 - var10 = var21; // L: 1244 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1245 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1246 - var17 = var21; // L: 1247 - if (var12 >= 50) { // L: 1248 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1249 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1250 - var14 = var21; // L: 1251 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1252 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1253 - var18 = var21; // L: 1254 - if (var11 >= 50) { // L: 1255 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1256 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1257 - var13 = var21; // L: 1258 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1259 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1260 - var19 = var21; // L: 1261 - if (var16 >= 50) { // L: 1262 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1263 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1264 - var9 = var21; // L: 1265 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1266 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1267 - if (var15 >= 50) { // L: 1269 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1270 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1271 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1272 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1273 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1274 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1275 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1276 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1277 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1278 + int var16 = var15 = var12 + 128; // L: 1221 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1222 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1223 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1224 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1225 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1226 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1227 + var10 = var21; // L: 1228 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1229 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1230 + var17 = var21; // L: 1231 + if (var12 >= 50) { // L: 1232 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1233 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1234 + var14 = var21; // L: 1235 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1236 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1237 + var18 = var21; // L: 1238 + if (var11 >= 50) { // L: 1239 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1240 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1241 + var13 = var21; // L: 1242 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1243 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1244 + var19 = var21; // L: 1245 + if (var16 >= 50) { // L: 1246 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1247 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1248 + var9 = var21; // L: 1249 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1250 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1251 + if (var15 >= 50) { // L: 1253 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1254 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1255 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1256 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1257 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1258 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1259 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1260 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1261 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1262 int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1279 - Rasterizer3D.field2334 = false; // L: 1280 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1281 - Rasterizer3D.field2334 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1263 + Rasterizer3D.field2562 = false; // L: 1264 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1265 + Rasterizer3D.field2562 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1282 - Scene_selectedX = var7; // L: 1283 - Scene_selectedY = var8; // L: 1284 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1266 + Scene_selectedX = var7; // L: 1267 + Scene_selectedY = var8; // L: 1268 } - if (var1.texture == -1) { // L: 1286 - if (var1.neColor != 12345678) { // L: 1287 - Rasterizer3D.method4003(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1270 + if (var1.neColor != 12345678) { // L: 1271 + Rasterizer3D.method4613(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1289 - if (var1.isFlat) { // L: 1290 + } else if (!Scene_isLowDetail) { // L: 1273 + if (var1.isFlat) { // L: 1274 Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1291 + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1275 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1294 - Rasterizer3D.method4003(var27, var29, var25, var26, var28, var24, method4205(var30, var1.neColor), method4205(var30, var1.nwColor), method4205(var30, var1.seColor)); // L: 1295 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1278 + Rasterizer3D.method4613(var27, var29, var25, var26, var28, var24, method4776(var30, var1.neColor), method4776(var30, var1.nwColor), method4776(var30, var1.seColor)); // L: 1279 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1298 - Rasterizer3D.field2334 = false; // L: 1299 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1300 - Rasterizer3D.field2334 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1282 + Rasterizer3D.field2562 = false; // L: 1283 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1284 + Rasterizer3D.field2562 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1301 - Scene_selectedX = var7; // L: 1302 - Scene_selectedY = var8; // L: 1303 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1285 + Scene_selectedX = var7; // L: 1286 + Scene_selectedY = var8; // L: 1287 } - if (var1.texture == -1) { // L: 1305 - if (var1.swColor != 12345678) { // L: 1306 - Rasterizer3D.method4003(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1289 + if (var1.swColor != 12345678) { // L: 1290 + Rasterizer3D.method4613(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1308 - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1309 + } else if (!Scene_isLowDetail) { // L: 1292 + Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1293 } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1312 - Rasterizer3D.method4003(var23, var25, var29, var22, var24, var28, method4205(var30, var1.swColor), method4205(var30, var1.seColor), method4205(var30, var1.nwColor)); // L: 1313 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1296 + Rasterizer3D.method4613(var23, var25, var29, var22, var24, var28, method4776(var30, var1.swColor), method4776(var30, var1.seColor), method4776(var30, var1.nwColor)); // L: 1297 } } @@ -1902,566 +1898,566 @@ public class Scene { } } } - } // L: 1316 + } // L: 1300 - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lhp;IIIIII)V" + descriptor = "(Lik;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1319 + int var8 = var1.vertexX.length; // L: 1303 int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1320 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1321 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1322 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1323 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1324 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1325 - var10 = var13; // L: 1326 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1327 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1328 - if (var12 < 50) { // L: 1330 + for (var9 = 0; var9 < var8; ++var9) { // L: 1304 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1305 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1306 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1307 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1308 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1309 + var10 = var13; // L: 1310 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1311 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1312 + if (var12 < 50) { // L: 1314 return; } - if (var1.triangleTextureId != null) { // L: 1331 - SceneTileModel.field2472[var9] = var10; // L: 1332 - SceneTileModel.field2490[var9] = var13; // L: 1333 - SceneTileModel.field2485[var9] = var12; // L: 1334 + if (var1.triangleTextureId != null) { // L: 1315 + SceneTileModel.field2703[var9] = var10; // L: 1316 + SceneTileModel.field2706[var9] = var13; // L: 1317 + SceneTileModel.field2699[var9] = var12; // L: 1318 } - SceneTileModel.field2491[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1336 - SceneTileModel.field2488[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1337 + SceneTileModel.field2712[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1320 + SceneTileModel.field2713[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1321 } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1339 - var8 = var1.faceX.length; // L: 1340 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1323 + var8 = var1.faceX.length; // L: 1324 - for (var9 = 0; var9 < var8; ++var9) { // L: 1341 - var10 = var1.faceX[var9]; // L: 1342 - var11 = var1.faceY[var9]; // L: 1343 - var12 = var1.faceZ[var9]; // L: 1344 - var13 = SceneTileModel.field2491[var10]; // L: 1345 - int var14 = SceneTileModel.field2491[var11]; // L: 1346 - int var15 = SceneTileModel.field2491[var12]; // L: 1347 - int var16 = SceneTileModel.field2488[var10]; // L: 1348 - int var17 = SceneTileModel.field2488[var11]; // L: 1349 - int var18 = SceneTileModel.field2488[var12]; // L: 1350 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1351 - Rasterizer3D.field2334 = false; // L: 1352 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1353 - Rasterizer3D.field2334 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1325 + var10 = var1.faceX[var9]; // L: 1326 + var11 = var1.faceY[var9]; // L: 1327 + var12 = var1.faceZ[var9]; // L: 1328 + var13 = SceneTileModel.field2712[var10]; // L: 1329 + int var14 = SceneTileModel.field2712[var11]; // L: 1330 + int var15 = SceneTileModel.field2712[var12]; // L: 1331 + int var16 = SceneTileModel.field2713[var10]; // L: 1332 + int var17 = SceneTileModel.field2713[var11]; // L: 1333 + int var18 = SceneTileModel.field2713[var12]; // L: 1334 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1335 + Rasterizer3D.field2562 = false; // L: 1336 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1337 + Rasterizer3D.field2562 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1354 - Scene_selectedX = var6; // L: 1355 - Scene_selectedY = var7; // L: 1356 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1338 + Scene_selectedX = var6; // L: 1339 + Scene_selectedY = var7; // L: 1340 } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1358 - if (!Scene_isLowDetail) { // L: 1362 - if (var1.isFlat) { // L: 1363 - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2472[0], SceneTileModel.field2472[1], SceneTileModel.field2472[3], SceneTileModel.field2490[0], SceneTileModel.field2490[1], SceneTileModel.field2490[3], SceneTileModel.field2485[0], SceneTileModel.field2485[1], SceneTileModel.field2485[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1342 + if (!Scene_isLowDetail) { // L: 1346 + if (var1.isFlat) { // L: 1347 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2703[0], SceneTileModel.field2703[1], SceneTileModel.field2703[3], SceneTileModel.field2706[0], SceneTileModel.field2706[1], SceneTileModel.field2706[3], SceneTileModel.field2699[0], SceneTileModel.field2699[1], SceneTileModel.field2699[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2472[var10], SceneTileModel.field2472[var11], SceneTileModel.field2472[var12], SceneTileModel.field2490[var10], SceneTileModel.field2490[var11], SceneTileModel.field2490[var12], SceneTileModel.field2485[var10], SceneTileModel.field2485[var11], SceneTileModel.field2485[var12], var1.triangleTextureId[var9]); // L: 1364 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2703[var10], SceneTileModel.field2703[var11], SceneTileModel.field2703[var12], SceneTileModel.field2706[var10], SceneTileModel.field2706[var11], SceneTileModel.field2706[var12], SceneTileModel.field2699[var10], SceneTileModel.field2699[var11], SceneTileModel.field2699[var12], var1.triangleTextureId[var9]); // L: 1348 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1367 - Rasterizer3D.method4003(var16, var17, var18, var13, var14, var15, method4205(var19, var1.triangleColorA[var9]), method4205(var19, var1.triangleColorB[var9]), method4205(var19, var1.triangleColorC[var9])); // L: 1368 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1351 + Rasterizer3D.method4613(var16, var17, var18, var13, var14, var15, method4776(var19, var1.triangleColorA[var9]), method4776(var19, var1.triangleColorB[var9]), method4776(var19, var1.triangleColorC[var9])); // L: 1352 } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1359 - Rasterizer3D.method4003(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1343 + Rasterizer3D.method4613(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1373 + } // L: 1357 - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1400 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1401 - Scene_currentOccludersCount = 0; // L: 1402 + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1384 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1385 + Scene_currentOccludersCount = 0; // L: 1386 - for (int var3 = 0; var3 < var1; ++var3) { // L: 1403 - Occluder var4 = var2[var3]; // L: 1404 + for (int var3 = 0; var3 < var1; ++var3) { // L: 1387 + Occluder var4 = var2[var3]; // L: 1388 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1405 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1406 - if (var5 >= 0 && var5 <= 50) { // L: 1407 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1408 - if (var6 < 0) { // L: 1409 + if (var4.type == 1) { // L: 1389 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1390 + if (var5 >= 0 && var5 <= 50) { // L: 1391 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1392 + if (var6 < 0) { // L: 1393 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1410 - if (var7 > 50) { // L: 1411 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1394 + if (var7 > 50) { // L: 1395 var7 = 50; } - var13 = false; // L: 1412 + var13 = false; // L: 1396 - while (var6 <= var7) { // L: 1413 - if (visibleTiles[var5][var6++]) { // L: 1414 - var13 = true; // L: 1415 + while (var6 <= var7) { // L: 1397 + if (visibleTiles[var5][var6++]) { // L: 1398 + var13 = true; // L: 1399 break; } } - if (var13) { // L: 1419 - var9 = Scene_cameraX - var4.minX; // L: 1420 - if (var9 > 32) { // L: 1421 - var4.field2453 = 1; + if (var13) { // L: 1403 + var9 = Scene_cameraX - var4.minX; // L: 1404 + if (var9 > 32) { // L: 1405 + var4.field2669 = 1; } else { - if (var9 >= -32) { // L: 1422 + if (var9 >= -32) { // L: 1406 continue; } - var4.field2453 = 2; // L: 1423 - var9 = -var9; // L: 1424 + var4.field2669 = 2; // L: 1407 + var9 = -var9; // L: 1408 } - var4.field2456 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1427 - var4.field2460 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1428 - var4.field2458 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1429 - var4.field2459 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1430 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1431 + var4.field2683 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1411 + var4.field2684 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1412 + var4.field2685 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1413 + var4.field2686 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1414 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1415 } } - } else if (var4.type == 2) { // L: 1434 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1435 - if (var5 >= 0 && var5 <= 50) { // L: 1436 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1437 - if (var6 < 0) { // L: 1438 + } else if (var4.type == 2) { // L: 1418 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1419 + if (var5 >= 0 && var5 <= 50) { // L: 1420 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1421 + if (var6 < 0) { // L: 1422 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1439 - if (var7 > 50) { // L: 1440 + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1423 + if (var7 > 50) { // L: 1424 var7 = 50; } - var13 = false; // L: 1441 + var13 = false; // L: 1425 - while (var6 <= var7) { // L: 1442 - if (visibleTiles[var6++][var5]) { // L: 1443 - var13 = true; // L: 1444 + while (var6 <= var7) { // L: 1426 + if (visibleTiles[var6++][var5]) { // L: 1427 + var13 = true; // L: 1428 break; } } - if (var13) { // L: 1448 - var9 = Scene_cameraZ - var4.minZ; // L: 1449 - if (var9 > 32) { // L: 1450 - var4.field2453 = 3; + if (var13) { // L: 1432 + var9 = Scene_cameraZ - var4.minZ; // L: 1433 + if (var9 > 32) { // L: 1434 + var4.field2669 = 3; } else { - if (var9 >= -32) { // L: 1451 + if (var9 >= -32) { // L: 1435 continue; } - var4.field2453 = 4; // L: 1452 - var9 = -var9; // L: 1453 + var4.field2669 = 4; // L: 1436 + var9 = -var9; // L: 1437 } - var4.field2454 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1456 - var4.field2455 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1457 - var4.field2458 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1458 - var4.field2459 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1459 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1460 + var4.field2681 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1440 + var4.field2682 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1441 + var4.field2685 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1442 + var4.field2686 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1443 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1444 } } - } else if (var4.type == 4) { // L: 1463 - var5 = var4.minY - Scene_cameraY; // L: 1464 - if (var5 > 128) { // L: 1465 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1466 - if (var6 < 0) { // L: 1467 + } else if (var4.type == 4) { // L: 1447 + var5 = var4.minY - Scene_cameraY; // L: 1448 + if (var5 > 128) { // L: 1449 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1450 + if (var6 < 0) { // L: 1451 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1468 - if (var7 > 50) { // L: 1469 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1452 + if (var7 > 50) { // L: 1453 var7 = 50; } - if (var6 <= var7) { // L: 1470 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1471 - if (var8 < 0) { // L: 1472 + if (var6 <= var7) { // L: 1454 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1455 + if (var8 < 0) { // L: 1456 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1473 - if (var9 > 50) { // L: 1474 + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1457 + if (var9 > 50) { // L: 1458 var9 = 50; } - boolean var10 = false; // L: 1475 + boolean var10 = false; // L: 1459 - label148: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1476 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1477 - if (visibleTiles[var11][var12]) { // L: 1478 - var10 = true; // L: 1479 - break label148; + label149: + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1460 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1461 + if (visibleTiles[var11][var12]) { // L: 1462 + var10 = true; // L: 1463 + break label149; } } } - if (var10) { // L: 1484 - var4.field2453 = 5; // L: 1485 - var4.field2454 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1486 - var4.field2455 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1487 - var4.field2456 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1488 - var4.field2460 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1489 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1490 + if (var10) { // L: 1468 + var4.field2669 = 5; // L: 1469 + var4.field2681 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1470 + var4.field2682 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1471 + var4.field2683 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1472 + var4.field2684 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1473 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1474 } } } } } - } // L: 1494 - - @ObfuscatedName("ag") - boolean method4175(int var1, int var2, int var3) { - int var4 = this.field2410[var1][var2][var3]; // L: 1497 - if (var4 == -Scene_drawnCount) { // L: 1498 - return false; - } else if (var4 == Scene_drawnCount) { // L: 1499 - return true; - } else { - int var5 = var2 << 7; // L: 1500 - int var6 = var3 << 7; // L: 1501 - if (this.method4129(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4129(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1502 - this.field2410[var1][var2][var3] = Scene_drawnCount; // L: 1503 - return true; // L: 1504 - } else { - this.field2410[var1][var2][var3] = -Scene_drawnCount; // L: 1507 - return false; // L: 1508 - } - } - } - - @ObfuscatedName("af") - boolean method4176(int var1, int var2, int var3, int var4) { - if (!this.method4175(var1, var2, var3)) { // L: 1513 - return false; - } else { - int var5 = var2 << 7; // L: 1514 - int var6 = var3 << 7; // L: 1515 - int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1516 - int var8 = var7 - 120; // L: 1517 - int var9 = var7 - 230; // L: 1518 - int var10 = var7 - 238; // L: 1519 - if (var4 < 16) { // L: 1520 - if (var4 == 1) { // L: 1521 - if (var5 > Scene_cameraX) { // L: 1522 - if (!this.method4129(var5, var7, var6)) { // L: 1523 - return false; - } - - if (!this.method4129(var5, var7, var6 + 128)) { // L: 1524 - return false; - } - } - - if (var1 > 0) { // L: 1526 - if (!this.method4129(var5, var8, var6)) { // L: 1527 - return false; - } - - if (!this.method4129(var5, var8, var6 + 128)) { // L: 1528 - return false; - } - } - - if (!this.method4129(var5, var9, var6)) { // L: 1530 - return false; - } - - if (!this.method4129(var5, var9, var6 + 128)) { // L: 1531 - return false; - } - - return true; // L: 1532 - } - - if (var4 == 2) { // L: 1534 - if (var6 < Scene_cameraZ) { // L: 1535 - if (!this.method4129(var5, var7, var6 + 128)) { // L: 1536 - return false; - } - - if (!this.method4129(var5 + 128, var7, var6 + 128)) { // L: 1537 - return false; - } - } - - if (var1 > 0) { // L: 1539 - if (!this.method4129(var5, var8, var6 + 128)) { // L: 1540 - return false; - } - - if (!this.method4129(var5 + 128, var8, var6 + 128)) { // L: 1541 - return false; - } - } - - if (!this.method4129(var5, var9, var6 + 128)) { // L: 1543 - return false; - } - - if (!this.method4129(var5 + 128, var9, var6 + 128)) { // L: 1544 - return false; - } - - return true; // L: 1545 - } - - if (var4 == 4) { // L: 1547 - if (var5 < Scene_cameraX) { // L: 1548 - if (!this.method4129(var5 + 128, var7, var6)) { // L: 1549 - return false; - } - - if (!this.method4129(var5 + 128, var7, var6 + 128)) { // L: 1550 - return false; - } - } - - if (var1 > 0) { // L: 1552 - if (!this.method4129(var5 + 128, var8, var6)) { // L: 1553 - return false; - } - - if (!this.method4129(var5 + 128, var8, var6 + 128)) { // L: 1554 - return false; - } - } - - if (!this.method4129(var5 + 128, var9, var6)) { // L: 1556 - return false; - } - - if (!this.method4129(var5 + 128, var9, var6 + 128)) { // L: 1557 - return false; - } - - return true; // L: 1558 - } - - if (var4 == 8) { // L: 1560 - if (var6 > Scene_cameraZ) { // L: 1561 - if (!this.method4129(var5, var7, var6)) { // L: 1562 - return false; - } - - if (!this.method4129(var5 + 128, var7, var6)) { // L: 1563 - return false; - } - } - - if (var1 > 0) { // L: 1565 - if (!this.method4129(var5, var8, var6)) { // L: 1566 - return false; - } - - if (!this.method4129(var5 + 128, var8, var6)) { // L: 1567 - return false; - } - } - - if (!this.method4129(var5, var9, var6)) { // L: 1569 - return false; - } - - if (!this.method4129(var5 + 128, var9, var6)) { // L: 1570 - return false; - } - - return true; // L: 1571 - } - } - - if (!this.method4129(var5 + 64, var10, var6 + 64)) { // L: 1574 - return false; - } else if (var4 == 16) { // L: 1575 - return this.method4129(var5, var9, var6 + 128); // L: 1576 - } else if (var4 == 32) { // L: 1579 - return this.method4129(var5 + 128, var9, var6 + 128); // L: 1580 - } else if (var4 == 64) { // L: 1583 - return this.method4129(var5 + 128, var9, var6); // L: 1584 - } else if (var4 == 128) { // L: 1587 - return this.method4129(var5, var9, var6); // L: 1588 - } else { - return true; // L: 1591 - } - } - } + } // L: 1478 @ObfuscatedName("ap") - boolean method4177(int var1, int var2, int var3, int var4) { - if (!this.method4175(var1, var2, var3)) { // L: 1595 + boolean method4867(int var1, int var2, int var3) { + int var4 = this.field2600[var1][var2][var3]; // L: 1481 + if (var4 == -Scene_drawnCount) { // L: 1482 + return false; + } else if (var4 == Scene_drawnCount) { // L: 1483 + return true; + } else { + int var5 = var2 << 7; // L: 1484 + int var6 = var3 << 7; // L: 1485 + if (this.method4783(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4783(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1486 + this.field2600[var1][var2][var3] = Scene_drawnCount; // L: 1487 + return true; // L: 1488 + } else { + this.field2600[var1][var2][var3] = -Scene_drawnCount; // L: 1491 + return false; // L: 1492 + } + } + } + + @ObfuscatedName("az") + boolean method4780(int var1, int var2, int var3, int var4) { + if (!this.method4867(var1, var2, var3)) { // L: 1497 return false; } else { - int var5 = var2 << 7; // L: 1596 - int var6 = var3 << 7; // L: 1597 - return this.method4129(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4129(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1598 + int var5 = var2 << 7; // L: 1498 + int var6 = var3 << 7; // L: 1499 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1500 + int var8 = var7 - 120; // L: 1501 + int var9 = var7 - 230; // L: 1502 + int var10 = var7 - 238; // L: 1503 + if (var4 < 16) { // L: 1504 + if (var4 == 1) { // L: 1505 + if (var5 > Scene_cameraX) { // L: 1506 + if (!this.method4783(var5, var7, var6)) { // L: 1507 + return false; + } + + if (!this.method4783(var5, var7, var6 + 128)) { // L: 1508 + return false; + } + } + + if (var1 > 0) { // L: 1510 + if (!this.method4783(var5, var8, var6)) { // L: 1511 + return false; + } + + if (!this.method4783(var5, var8, var6 + 128)) { // L: 1512 + return false; + } + } + + if (!this.method4783(var5, var9, var6)) { // L: 1514 + return false; + } + + if (!this.method4783(var5, var9, var6 + 128)) { // L: 1515 + return false; + } + + return true; // L: 1516 + } + + if (var4 == 2) { // L: 1518 + if (var6 < Scene_cameraZ) { // L: 1519 + if (!this.method4783(var5, var7, var6 + 128)) { // L: 1520 + return false; + } + + if (!this.method4783(var5 + 128, var7, var6 + 128)) { // L: 1521 + return false; + } + } + + if (var1 > 0) { // L: 1523 + if (!this.method4783(var5, var8, var6 + 128)) { // L: 1524 + return false; + } + + if (!this.method4783(var5 + 128, var8, var6 + 128)) { // L: 1525 + return false; + } + } + + if (!this.method4783(var5, var9, var6 + 128)) { // L: 1527 + return false; + } + + if (!this.method4783(var5 + 128, var9, var6 + 128)) { // L: 1528 + return false; + } + + return true; // L: 1529 + } + + if (var4 == 4) { // L: 1531 + if (var5 < Scene_cameraX) { // L: 1532 + if (!this.method4783(var5 + 128, var7, var6)) { // L: 1533 + return false; + } + + if (!this.method4783(var5 + 128, var7, var6 + 128)) { // L: 1534 + return false; + } + } + + if (var1 > 0) { // L: 1536 + if (!this.method4783(var5 + 128, var8, var6)) { // L: 1537 + return false; + } + + if (!this.method4783(var5 + 128, var8, var6 + 128)) { // L: 1538 + return false; + } + } + + if (!this.method4783(var5 + 128, var9, var6)) { // L: 1540 + return false; + } + + if (!this.method4783(var5 + 128, var9, var6 + 128)) { // L: 1541 + return false; + } + + return true; // L: 1542 + } + + if (var4 == 8) { // L: 1544 + if (var6 > Scene_cameraZ) { // L: 1545 + if (!this.method4783(var5, var7, var6)) { // L: 1546 + return false; + } + + if (!this.method4783(var5 + 128, var7, var6)) { // L: 1547 + return false; + } + } + + if (var1 > 0) { // L: 1549 + if (!this.method4783(var5, var8, var6)) { // L: 1550 + return false; + } + + if (!this.method4783(var5 + 128, var8, var6)) { // L: 1551 + return false; + } + } + + if (!this.method4783(var5, var9, var6)) { // L: 1553 + return false; + } + + if (!this.method4783(var5 + 128, var9, var6)) { // L: 1554 + return false; + } + + return true; // L: 1555 + } + } + + if (!this.method4783(var5 + 64, var10, var6 + 64)) { // L: 1558 + return false; + } else if (var4 == 16) { // L: 1559 + return this.method4783(var5, var9, var6 + 128); // L: 1560 + } else if (var4 == 32) { // L: 1563 + return this.method4783(var5 + 128, var9, var6 + 128); // L: 1564 + } else if (var4 == 64) { // L: 1567 + return this.method4783(var5 + 128, var9, var6); // L: 1568 + } else if (var4 == 128) { // L: 1571 + return this.method4783(var5, var9, var6); // L: 1572 + } else { + return true; // L: 1575 + } } } - @ObfuscatedName("ai") - boolean method4178(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("as") + boolean method4781(int var1, int var2, int var3, int var4) { + if (!this.method4867(var1, var2, var3)) { // L: 1579 + return false; + } else { + int var5 = var2 << 7; // L: 1580 + int var6 = var3 << 7; // L: 1581 + return this.method4783(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4783(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1582 + } + } + + @ObfuscatedName("aa") + boolean method4782(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1603 - if (!this.method4175(var1, var2, var4)) { // L: 1604 + if (var3 == var2 && var5 == var4) { // L: 1587 + if (!this.method4867(var1, var2, var4)) { // L: 1588 return false; } else { - var7 = var2 << 7; // L: 1605 - var8 = var4 << 7; // L: 1606 - return this.method4129(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4129(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4129(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4129(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1607 + var7 = var2 << 7; // L: 1589 + var8 = var4 << 7; // L: 1590 + return this.method4783(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4783(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4783(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4783(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1591 } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1610 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1611 - if (this.field2410[var1][var7][var8] == -Scene_drawnCount) { // L: 1612 + for (var7 = var2; var7 <= var3; ++var7) { // L: 1594 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1595 + if (this.field2600[var1][var7][var8] == -Scene_drawnCount) { // L: 1596 return false; } } } - var7 = (var2 << 7) + 1; // L: 1615 - var8 = (var4 << 7) + 2; // L: 1616 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1617 - if (!this.method4129(var7, var9, var8)) { // L: 1618 + var7 = (var2 << 7) + 1; // L: 1599 + var8 = (var4 << 7) + 2; // L: 1600 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1601 + if (!this.method4783(var7, var9, var8)) { // L: 1602 return false; } else { - int var10 = (var3 << 7) - 1; // L: 1619 - if (!this.method4129(var10, var9, var8)) { // L: 1620 + int var10 = (var3 << 7) - 1; // L: 1603 + if (!this.method4783(var10, var9, var8)) { // L: 1604 return false; } else { - int var11 = (var5 << 7) - 1; // L: 1621 - if (!this.method4129(var7, var9, var11)) { // L: 1622 + int var11 = (var5 << 7) - 1; // L: 1605 + if (!this.method4783(var7, var9, var11)) { // L: 1606 return false; - } else if (!this.method4129(var10, var9, var11)) { // L: 1623 + } else if (!this.method4783(var10, var9, var11)) { // L: 1607 return false; } else { - return true; // L: 1624 + return true; // L: 1608 } } } } } - @ObfuscatedName("bk") - boolean method4129(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1628 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1629 + @ObfuscatedName("bj") + boolean method4783(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1612 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1613 int var6; int var7; int var8; int var9; int var10; - if (var5.field2453 == 1) { // L: 1630 - var6 = var5.minX - var1; // L: 1631 - if (var6 > 0) { // L: 1632 - var7 = (var6 * var5.field2456 >> 8) + var5.minZ; // L: 1633 - var8 = (var6 * var5.field2460 >> 8) + var5.maxZ; // L: 1634 - var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1635 - var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1636 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1637 + if (var5.field2669 == 1) { // L: 1614 + var6 = var5.minX - var1; // L: 1615 + if (var6 > 0) { // L: 1616 + var7 = (var6 * var5.field2683 >> 8) + var5.minZ; // L: 1617 + var8 = (var6 * var5.field2684 >> 8) + var5.maxZ; // L: 1618 + var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1619 + var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1620 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1621 return true; } } - } else if (var5.field2453 == 2) { // L: 1641 - var6 = var1 - var5.minX; // L: 1642 - if (var6 > 0) { // L: 1643 - var7 = (var6 * var5.field2456 >> 8) + var5.minZ; // L: 1644 - var8 = (var6 * var5.field2460 >> 8) + var5.maxZ; // L: 1645 - var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1646 - var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1647 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1648 + } else if (var5.field2669 == 2) { // L: 1625 + var6 = var1 - var5.minX; // L: 1626 + if (var6 > 0) { // L: 1627 + var7 = (var6 * var5.field2683 >> 8) + var5.minZ; // L: 1628 + var8 = (var6 * var5.field2684 >> 8) + var5.maxZ; // L: 1629 + var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1630 + var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1631 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1632 return true; } } - } else if (var5.field2453 == 3) { // L: 1652 - var6 = var5.minZ - var3; // L: 1653 - if (var6 > 0) { // L: 1654 - var7 = (var6 * var5.field2454 >> 8) + var5.minX; // L: 1655 - var8 = (var6 * var5.field2455 >> 8) + var5.maxX; // L: 1656 - var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1657 - var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1658 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1659 + } else if (var5.field2669 == 3) { // L: 1636 + var6 = var5.minZ - var3; // L: 1637 + if (var6 > 0) { // L: 1638 + var7 = (var6 * var5.field2681 >> 8) + var5.minX; // L: 1639 + var8 = (var6 * var5.field2682 >> 8) + var5.maxX; // L: 1640 + var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1641 + var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1642 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1643 return true; } } - } else if (var5.field2453 == 4) { // L: 1663 - var6 = var3 - var5.minZ; // L: 1664 - if (var6 > 0) { // L: 1665 - var7 = (var6 * var5.field2454 >> 8) + var5.minX; // L: 1666 - var8 = (var6 * var5.field2455 >> 8) + var5.maxX; // L: 1667 - var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1668 - var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1669 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1670 + } else if (var5.field2669 == 4) { // L: 1647 + var6 = var3 - var5.minZ; // L: 1648 + if (var6 > 0) { // L: 1649 + var7 = (var6 * var5.field2681 >> 8) + var5.minX; // L: 1650 + var8 = (var6 * var5.field2682 >> 8) + var5.maxX; // L: 1651 + var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1652 + var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1653 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1654 return true; } } - } else if (var5.field2453 == 5) { // L: 1674 - var6 = var2 - var5.minY; // L: 1675 - if (var6 > 0) { // L: 1676 - var7 = (var6 * var5.field2454 >> 8) + var5.minX; // L: 1677 - var8 = (var6 * var5.field2455 >> 8) + var5.maxX; // L: 1678 - var9 = (var6 * var5.field2456 >> 8) + var5.minZ; // L: 1679 - var10 = (var6 * var5.field2460 >> 8) + var5.maxZ; // L: 1680 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1681 + } else if (var5.field2669 == 5) { // L: 1658 + var6 = var2 - var5.minY; // L: 1659 + if (var6 > 0) { // L: 1660 + var7 = (var6 * var5.field2681 >> 8) + var5.minX; // L: 1661 + var8 = (var6 * var5.field2682 >> 8) + var5.maxX; // L: 1662 + var9 = (var6 * var5.field2683 >> 8) + var5.minZ; // L: 1663 + var10 = (var6 * var5.field2684 >> 8) + var5.maxZ; // L: 1664 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1665 return true; } } } } - return false; // L: 1686 + return false; // L: 1670 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - Occluder var8 = new Occluder(); // L: 158 - var8.minTileX = var2 / 128; // L: 159 - var8.maxTileX = var3 / 128; // L: 160 - var8.minTileY = var4 / 128; // L: 161 - var8.maxTileY = var5 / 128; // L: 162 - var8.type = var1; // L: 163 - var8.minX = var2; // L: 164 - var8.maxX = var3; // L: 165 - var8.minZ = var4; // L: 166 - var8.maxZ = var5; // L: 167 - var8.minY = var6; // L: 168 - var8.maxY = var7; // L: 169 - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 170 - } // L: 171 + Occluder var8 = new Occluder(); // L: 154 + var8.minTileX = var2 / 128; // L: 155 + var8.maxTileX = var3 / 128; // L: 156 + var8.minTileY = var4 / 128; // L: 157 + var8.maxTileY = var5 / 128; // L: 158 + var8.type = var1; // L: 159 + var8.minX = var2; // L: 160 + var8.maxX = var3; // L: 161 + var8.minZ = var4; // L: 162 + var8.maxZ = var5; // L: 163 + var8.minY = var6; // L: 164 + var8.maxY = var7; // L: 165 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 166 + } // L: 167 - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 674 - Scene_viewportYMin = 0; // L: 675 - Scene_viewportXMax = var3; // L: 676 - Scene_viewportYMax = var4; // L: 677 - Scene_viewportXCenter = var3 / 2; // L: 678 - Scene_viewportYCenter = var4 / 2; // L: 679 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 680 + Scene_viewportXMin = 0; // L: 658 + Scene_viewportYMin = 0; // L: 659 + Scene_viewportXMax = var3; // L: 660 + Scene_viewportYMax = var4; // L: 661 + Scene_viewportXCenter = var3 / 2; // L: 662 + Scene_viewportYCenter = var4 / 2; // L: 663 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 664 int var6; int var7; @@ -2469,135 +2465,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 681 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 682 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 683 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 684 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 685 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 686 - var8 = (var6 - 128) / 32; // L: 687 - var9 = var7 / 64; // L: 688 + for (var6 = 128; var6 <= 383; var6 += 32) { // L: 665 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 666 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 667 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 668 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 669 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 670 + var8 = (var6 - 128) / 32; // L: 671 + var9 = var7 / 64; // L: 672 - for (int var10 = -26; var10 < 26; ++var10) { // L: 689 - for (var11 = -26; var11 < 26; ++var11) { // L: 690 - var12 = var10 * 128; // L: 691 - int var13 = var11 * 128; // L: 692 - boolean var14 = false; // L: 693 + for (int var10 = -26; var10 < 26; ++var10) { // L: 673 + for (var11 = -26; var11 < 26; ++var11) { // L: 674 + var12 = var10 * 128; // L: 675 + int var13 = var11 * 128; // L: 676 + boolean var14 = false; // L: 677 - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 694 - if (method4163(var12, var0[var8] + var15, var13)) { // L: 695 - var14 = true; // L: 696 + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 678 + if (method4767(var12, var0[var8] + var15, var13)) { // L: 679 + var14 = true; // L: 680 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 700 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 684 } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 705 - for (var7 = 0; var7 < 32; ++var7) { // L: 706 - for (var8 = -25; var8 < 25; ++var8) { // L: 707 - for (var9 = -25; var9 < 25; ++var9) { // L: 708 - boolean var16 = false; // L: 709 + for (var6 = 0; var6 < 8; ++var6) { // L: 689 + for (var7 = 0; var7 < 32; ++var7) { // L: 690 + for (var8 = -25; var8 < 25; ++var8) { // L: 691 + for (var9 = -25; var9 < 25; ++var9) { // L: 692 + boolean var16 = false; // L: 693 - label82: - for (var11 = -1; var11 <= 1; ++var11) { // L: 710 - for (var12 = -1; var12 <= 1; ++var12) { // L: 711 - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 712 - var16 = true; // L: 713 - break label82; + label83: + for (var11 = -1; var11 <= 1; ++var11) { // L: 694 + for (var12 = -1; var12 <= 1; ++var12) { // L: 695 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 696 + var16 = true; // L: 697 + break label83; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 716 - var16 = true; // L: 717 - break label82; // L: 718 + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 700 + var16 = true; // L: 701 + break label83; // L: 702 } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 720 - var16 = true; // L: 721 - break label82; // L: 722 + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 704 + var16 = true; // L: 705 + break label83; // L: 706 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 724 - var16 = true; // L: 725 - break label82; // L: 726 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 708 + var16 = true; // L: 709 + break label83; // L: 710 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 730 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 714 } } } } - } // L: 735 + } // L: 719 - @ObfuscatedName("ad") - static boolean method4163(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 738 - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 739 - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 740 - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 741 - if (var5 >= 50 && var5 <= 3500) { // L: 742 - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 743 - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 744 - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 745 + @ObfuscatedName("an") + static boolean method4767(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 722 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 723 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 724 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 725 + if (var5 >= 50 && var5 <= 3500) { // L: 726 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 727 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 728 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 729 } else { - return false; // L: 746 + return false; // L: 730 } } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 765 + return viewportWalking && Scene_selectedX != -1; // L: 749 } - @ObfuscatedName("av") - public static void method4167() { - Scene_selectedX = -1; // L: 769 - viewportWalking = false; // L: 770 - } // L: 771 + @ObfuscatedName("ac") + public static void method4771() { + Scene_selectedX = -1; // L: 753 + viewportWalking = false; // L: 754 + } // L: 755 - @ObfuscatedName("al") - static final int method4205(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1376 - if (var1 < 2) { // L: 1377 + @ObfuscatedName("ai") + static final int method4776(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1360 + if (var1 < 2) { // L: 1361 var1 = 2; - } else if (var1 > 126) { // L: 1378 + } else if (var1 > 126) { // L: 1362 var1 = 126; } - return (var0 & 65408) + var1; // L: 1379 + return (var0 & 65408) + var1; // L: 1363 } - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1383 + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1367 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1384 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1368 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1385 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1369 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1386 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1370 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1387 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1388 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1389 - if (var8 == 0) { // L: 1390 - if (var9 != 0) { // L: 1393 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1394 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1371 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1372 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1373 + if (var8 == 0) { // L: 1374 + if (var9 != 0) { // L: 1377 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1378 } else { - return true; // L: 1396 + return true; // L: 1380 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1391 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1375 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 9c135ae6cb..7efdb3c10f 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hp") +@ObfuscatedName("ik") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("s") - static int[] field2491; - @ObfuscatedName("b") - static int[] field2488; - @ObfuscatedName("w") - static int[] field2472; - @ObfuscatedName("a") - static int[] field2490; @ObfuscatedName("m") - static int[] field2485; - @ObfuscatedName("q") - static final int[][] field2478; + static int[] field2712; + @ObfuscatedName("u") + static int[] field2713; + @ObfuscatedName("t") + static int[] field2703; + @ObfuscatedName("g") + static int[] field2706; + @ObfuscatedName("x") + static int[] field2699; + @ObfuscatedName("a") + static final int[][] field2710; @ObfuscatedName("y") - static final int[][] field2493; + static final int[][] field2718; @ObfuscatedName("v") @Export("vertexX") int[] vertexX; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("vertexY") int[] vertexY; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("triangleColorB") int[] triangleColorB; @ObfuscatedName("n") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("faceX") int[] faceX; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("faceY") int[] faceY; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("faceZ") int[] faceZ; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("isFlat") boolean isFlat; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("shape") int shape; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("rotation") int rotation; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("overlayRgb") int overlayRgb; static { - field2491 = new int[6]; // L: 21 - field2488 = new int[6]; // L: 22 - field2472 = new int[6]; // L: 23 - field2490 = new int[6]; // L: 24 - field2485 = new int[6]; // L: 25 - field2478 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26 - field2493 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 + field2712 = new int[6]; // L: 21 + field2713 = new int[6]; // L: 22 + field2703 = new int[6]; // L: 23 + field2706 = new int[6]; // L: 24 + field2699 = new int[6]; // L: 25 + field2710 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26 + field2718 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class SceneTileModel { int var21 = var20 / 2; // L: 64 int var22 = var20 / 4; // L: 65 int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field2478[var1]; // L: 67 + int[] var24 = field2710[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field2493[var1]; // L: 204 + int[] var38 = field2718[var1]; // L: 204 var31 = var38.length / 4; // L: 205 this.faceX = new int[var31]; // L: 206 this.faceY = new int[var31]; // L: 207 diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 9efce8ce07..5df4096f5b 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.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("hj") +@ObfuscatedName("iv") @Implements("SceneTilePaint") public final class SceneTilePaint { + @ObfuscatedName("fy") + @ObfuscatedGetter( + intValue = 1438755039 + ) + static int field2826; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -187868113 + intValue = 439734561 ) @Export("swColor") int swColor; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1925508175 + intValue = 477804517 ) @Export("seColor") int seColor; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 221101905 + intValue = -818141463 ) @Export("neColor") int neColor; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 794090973 + intValue = -1925100489 ) @Export("nwColor") int nwColor; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1756727001 + intValue = 1030512889 ) @Export("texture") int texture; @ObfuscatedName("n") @Export("isFlat") boolean isFlat; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 587137313 + intValue = 1121760459 ) @Export("rgb") int rgb; @@ -50,57 +54,11 @@ public final class SceneTilePaint { SceneTilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { this.isFlat = true; // L: 9 this.swColor = var1; // L: 13 - this.seColor = var2; - this.neColor = var3; - this.nwColor = var4; - this.texture = var5; + this.seColor = var2; // L: 14 + this.neColor = var3; // L: 15 + this.nwColor = var4; // L: 16 + this.texture = var5; // L: 17 this.rgb = var6; // L: 18 this.isFlat = var7; // L: 19 } // L: 20 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-691234429" - ) - static int method4500(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 - } - } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "79" - ) - static void method4499() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11250 - int var1 = var0.group; // L: 11251 - if (MusicPatchNode2.loadInterface(var1)) { // L: 11252 - boolean var2 = true; // L: 11253 - Widget[] var3 = EnumComposition.Widget_interfaceComponents[var1]; // L: 11254 - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 11255 - if (var3[var4] != null) { // L: 11256 - var2 = var3[var4].isIf3; // L: 11257 - break; - } - } - - if (!var2) { // L: 11261 - var4 = (int)var0.key; // L: 11262 - Widget var5 = HorizontalAlignment.getWidget(var4); // L: 11263 - if (var5 != null) { // L: 11264 - class290.invalidateWidget(var5); - } - } - } - } - - } // L: 11268 } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 4d3a0ae600..31da83f6bb 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,121 +4,174 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("bd") @Implements("Script") public class Script extends DualNode { + @ObfuscatedName("sv") + @ObfuscatedGetter( + intValue = 1540125023 + ) + static int field955; + @ObfuscatedName("ud") + @ObfuscatedGetter( + intValue = 1431517737 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("o") - String field959; - @ObfuscatedName("h") + @ObfuscatedName("c") + String field954; + @ObfuscatedName("i") @Export("opcodes") int[] opcodes; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("intOperands") int[] intOperands; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("stringOperands") String[] stringOperands; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 138857027 + intValue = -61904285 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 736868675 + intValue = -166989853 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -674733225 + intValue = 2085074269 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1049907835 + intValue = 832856221 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lpq;" + descriptor = "[Lpt;" ) @Export("switches") IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); // L: 12 + Script_cached = new EvictingDualNodeHashTable(128); } Script() { - } // L: 23 + } - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)[Lpq;", - garbageValue = "-256970075" + descriptor = "(II)[Lpt;", + garbageValue = "1023486381" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 151 + return new IterableNodeHashTable[var1]; // L: 122 } - @ObfuscatedName("fm") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkn;III)V", - garbageValue = "762866023" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-881844017" ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3394 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3395 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3396 - if (var3 == null) { // L: 3397 - return; - } + static String method1990(int var0) { + return ""; // L: 18 + } - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3398 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3399 - if (var3.contains(var4, var5)) { // L: 3400 - var4 -= var3.width / 2; // L: 3401 - var5 -= var3.height / 2; // L: 3402 - int var6 = Client.camAngleY & 2047; // L: 3403 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3404 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3405 - int var9 = var4 * var8 + var7 * var5 >> 11; // L: 3406 - int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3407 - int var11 = var9 + class19.localPlayer.x >> 7; // L: 3408 - int var12 = class19.localPlayer.y - var10 >> 7; // L: 3409 - PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2963, Client.packetWriter.isaacCipher); // L: 3411 - var13.packetBuffer.writeByte(18); // L: 3412 - var13.packetBuffer.method7795(var11 + ApproximateRouteStrategy.baseX); // L: 3413 - var13.packetBuffer.writeShort(var12 + class250.baseY); // L: 3414 - var13.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3415 - var13.packetBuffer.writeByte(var4); // L: 3416 - var13.packetBuffer.writeByte(var5); // L: 3417 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3418 - var13.packetBuffer.writeByte(57); // L: 3419 - var13.packetBuffer.writeByte(0); // L: 3420 - var13.packetBuffer.writeByte(0); // L: 3421 - var13.packetBuffer.writeByte(89); // L: 3422 - var13.packetBuffer.writeShort(class19.localPlayer.x); // L: 3423 - var13.packetBuffer.writeShort(class19.localPlayer.y); // L: 3424 - var13.packetBuffer.writeByte(63); // L: 3425 - Client.packetWriter.addNode(var13); // L: 3426 - Client.destinationX = var11; // L: 3427 - Client.destinationY = var12; // L: 3428 - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "108796867" + ) + public static int method1996(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var0; + } else if (var2 == 1) { // L: 11 + return var1; + } else { + return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfl;", + garbageValue = "2129001923" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 + var1 = new InvDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); } + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 } - } // L: 3431 + } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(Lcc;ZS)V", + garbageValue = "7462" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 12167 + int var3 = (int)var0.key; // L: 12168 + var0.remove(); // L: 12169 + if (var1 && var2 != -1 && WorldMapSectionType.Widget_loadedInterfaces[var2]) { // L: 12170 12171 12172 + Widget.Widget_archive.clearFilesGroup(var2); // L: 12173 + if (Widget.Widget_interfaceComponents[var2] != null) { // L: 12174 + boolean var4 = true; // L: 12175 + + for (int var5 = 0; var5 < Widget.Widget_interfaceComponents[var2].length; ++var5) { // L: 12176 + if (Widget.Widget_interfaceComponents[var2][var5] != null) { // L: 12177 + if (Widget.Widget_interfaceComponents[var2][var5].type != 2) { // L: 12178 + Widget.Widget_interfaceComponents[var2][var5] = null; + } else { + var4 = false; // L: 12179 + } + } + } + + if (var4) { // L: 12182 + Widget.Widget_interfaceComponents[var2] = null; + } + + WorldMapSectionType.Widget_loadedInterfaces[var2] = false; // L: 12183 + } + } + + class29.method403(var2); // L: 12185 + Widget var6 = class127.getWidget(var3); // L: 12186 + if (var6 != null) { // L: 12187 + class346.invalidateWidget(var6); + } + + if (Client.rootInterface != -1) { // L: 12188 + MouseRecorder.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 12189 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index a4a923db9d..5969be5c73 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,77 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("ch") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("a") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("pp") - @ObfuscatedSignature( - descriptor = "Lps;" + @ObfuscatedName("hr") + @ObfuscatedGetter( + intValue = -1925838321 ) - @Export("HitSplatDefinition_cachedSprites") - static class426 HitSplatDefinition_cachedSprites; + static int field1042; @ObfuscatedName("v") @Export("args") Object[] args; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("widget") Widget widget; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 590834085 + intValue = 736658407 ) @Export("mouseX") int mouseX; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1385336571 + intValue = 1446872253 ) @Export("mouseY") int mouseY; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 274794473 + intValue = -2054800039 ) @Export("opIndex") int opIndex; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 639168691 + intValue = -2138407541 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 272606769 + intValue = 606437039 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("targetName") String targetName; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1898862119 + intValue = -2094030297 ) - int field1053; - @ObfuscatedName("x") + int field1031; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1051993591 + intValue = -2085929869 ) @Export("type") int type; @@ -86,40 +82,34 @@ public class ScriptEvent extends Node { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "108517262" + garbageValue = "-578941506" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-95" + descriptor = "(II)V", + garbageValue = "551800403" ) @Export("setType") public void setType(int var1) { this.type = var1; // L: 26 } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2145174079" + descriptor = "(IIIIS)V", + garbageValue = "-6716" ) - static void method2111() { - Tiles.Tiles_underlays = null; // L: 64 - Tiles.Tiles_overlays = null; // L: 65 - Tiles.Tiles_shapes = null; // L: 66 - RunException.field4754 = null; // L: 67 - DirectByteArrayCopier.field3277 = null; // L: 68 - GrandExchangeOfferNameComparator.field4010 = null; // L: 69 - Widget.field3495 = null; // L: 70 - class4.Tiles_hue = null; // L: 71 - Login.Tiles_saturation = null; // L: 72 - WorldMapSectionType.Tiles_lightness = null; // L: 73 - class300.Tiles_hueMultiplier = null; // L: 74 - Tiles.field986 = null; // L: 75 - } // L: 76 + static final void method2092(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8661 + 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) { // L: 8662 + Client.field716[var4] = true; + } + } + + } // L: 8664 } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 16e944c5c3..cf5b9c21c6 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -3,26 +3,33 @@ 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("bl") @Implements("ScriptFrame") public class ScriptFrame { + @ObfuscatedName("uq") + @ObfuscatedSignature( + descriptor = "Lov;" + ) + @Export("worldMap") + static WorldMap worldMap; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lbo;" + descriptor = "Lbd;" ) @Export("script") Script script; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -166615445 + intValue = 1104135589 ) @Export("pc") int pc; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("intLocals") int[] intLocals; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("stringLocals") String[] stringLocals; @@ -30,37 +37,928 @@ public class ScriptFrame { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("c") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Lql;", - garbageValue = "1868195415" + descriptor = "(ILbd;ZB)I", + garbageValue = "74" ) - static SpritePixels method1084() { - SpritePixels var0 = new SpritePixels(); // L: 138 - var0.width = class451.SpriteBuffer_spriteWidth; // L: 139 - var0.height = class451.SpriteBuffer_spriteHeight; // L: 140 - var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 141 - var0.yOffset = class451.SpriteBuffer_yOffsets[0]; // L: 142 - var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 143 - var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 144 - int var1 = var0.subWidth * var0.subHeight; // L: 145 - byte[] var2 = class460.SpriteBuffer_pixels[0]; // L: 146 - var0.pixels = new int[var1]; // L: 147 + static int method1085(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3917 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.loadWorlds() ? 1 : 0; // L: 3918 + return 1; // L: 3919 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3921 + var9 = SecureRandomCallable.worldListStart(); // L: 3922 + if (var9 != null) { // L: 3923 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3924 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3925 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.activity; // L: 3926 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3927 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3928 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.host; // L: 3929 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3932 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3933 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3934 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3935 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3936 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3937 + } - for (int var3 = 0; var3 < var1; ++var3) { // L: 148 - var0.pixels[var3] = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var2[var3] & 255]; + return 1; // L: 3939 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3941 + var9 = class305.getNextWorldListWorld(); // L: 3942 + if (var9 != null) { // L: 3943 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3944 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3945 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.activity; // L: 3946 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3947 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3948 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.host; // L: 3949 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3952 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3953 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3954 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3955 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3956 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3957 + } + + return 1; // L: 3959 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3961 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3962 + var7 = null; // L: 3963 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3964 + if (var3 == DevicePcmPlayerProvider.World_worlds[var8].id) { // L: 3965 + var7 = DevicePcmPlayerProvider.World_worlds[var8]; // L: 3966 + break; + } + } + + if (var7 != null) { // L: 3970 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3971 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3972 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.activity; // L: 3973 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3974 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3975 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.host; // L: 3976 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3979 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3980 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3981 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3982 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3983 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3984 + } + + return 1; // L: 3986 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3988 + Interpreter.Interpreter_intStackSize -= 4; // L: 3989 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3990 + boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3991 + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3992 + boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; // L: 3993 + class204.sortWorldList(var3, var10, var8, var6); // L: 3994 + return 1; // L: 3995 + } else if (var0 != 6511) { // L: 3997 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4018 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4019 + return 1; // L: 4020 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4022 + Interpreter.Interpreter_intStackSize -= 2; // L: 4023 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4024 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4025 + var5 = class151.getParamDefinition(var4); // L: 4026 + if (var5.isString()) { // L: 4027 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = KeyHandler.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4028 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4031 + } + + return 1; // L: 4033 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4035 + Interpreter.Interpreter_intStackSize -= 2; // L: 4036 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4037 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4038 + var5 = class151.getParamDefinition(var4); // L: 4039 + if (var5.isString()) { // L: 4040 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = class146.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4041 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class146.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4044 + } + + return 1; // L: 4046 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4048 + Interpreter.Interpreter_intStackSize -= 2; // L: 4049 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4050 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4051 + var5 = class151.getParamDefinition(var4); // L: 4052 + if (var5.isString()) { // L: 4053 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = class19.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4054 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4057 + } + + return 1; // L: 4059 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4061 + Interpreter.Interpreter_intStackSize -= 2; // L: 4062 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4063 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4064 + var5 = class151.getParamDefinition(var4); // L: 4065 + if (var5.isString()) { // L: 4066 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ObjectComposition.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4067 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ObjectComposition.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4070 + } + + return 1; // L: 4072 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4074 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4075 + return 1; // L: 4076 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4078 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType; // L: 4079 + return 1; // L: 4080 + } else if (var0 == 6520) { // L: 4082 + return 1; // L: 4083 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4085 + return 1; // L: 4086 + } else if (var0 == 6522) { // L: 4088 + --class122.Interpreter_stringStackSize; // L: 4089 + --Interpreter.Interpreter_intStackSize; // L: 4090 + return 1; // L: 4091 + } else if (var0 == 6523) { // L: 4093 + --class122.Interpreter_stringStackSize; // L: 4094 + --Interpreter.Interpreter_intStackSize; // L: 4095 + return 1; // L: 4096 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4098 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4099 + return 1; // L: 4100 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4102 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 4103 + return 1; // L: 4104 + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4106 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 4107 + return 1; // L: 4108 + } else if (var0 == 6527) { // L: 4110 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field498; // L: 4111 + return 1; // L: 4112 + } else { + return 2; // L: 4114 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3998 + if (var3 >= 0 && var3 < World.World_count) { // L: 3999 + var7 = DevicePcmPlayerProvider.World_worlds[var3]; // L: 4000 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 4001 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 4002 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.activity; // L: 4003 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 4004 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 4005 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.host; // L: 4006 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4009 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4010 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4011 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4012 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4013 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4014 + } + + return 1; // L: 4016 + } + } } - - RouteStrategy.method3872(); // L: 149 - return var0; // L: 150 } - @ObfuscatedName("ic") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "(Lbp;III)V", - garbageValue = "-96287651" + descriptor = "(II)V", + garbageValue = "377425883" ) - static final void method1083(MenuAction var0, int var1, int var2) { - SoundCache.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 8194 - } // L: 8195 + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2764 + class4.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2765 + class4.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2766 + class4.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2767 + Ignored.method6828(3); // L: 2768 + Login.field895 = 1; // L: 2769 + } else if (var0 == 4) { // L: 2771 + class267.method5196(0); // L: 2772 + } else if (var0 == 5) { // L: 2774 + Login.field895 = 2; // L: 2775 + class4.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2776 + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 2778 + class4.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2779 + } else if (var0 == 7) { // L: 2781 + class4.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2782 + class4.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2783 + class4.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2784 + class4.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2785 + class4.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2786 + class4.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2787 + class4.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2788 + class4.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2789 + class4.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2790 + class4.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { // L: 2791 + class267.method5196(1); // L: 2792 + } else if (var0 == 19) { // L: 2794 + class4.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2795 + class4.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2796 + class4.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2797 + class4.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2798 + class4.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2799 + class4.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2800 + class4.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2801 + class4.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2802 + class4.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) { // L: 2803 + class4.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) { // L: 2804 + class4.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2805 + class4.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2806 + Ignored.method6828(8); // L: 2807 + } else { + if (var0 == 56) { // L: 2809 + class4.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2810 + Decimator.updateGameState(11); // L: 2811 + return; // L: 2812 + } + + if (var0 == 57) { // L: 2814 + class4.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2815 + Decimator.updateGameState(11); // L: 2816 + return; // L: 2817 + } + + if (var0 == 61) { // L: 2819 + class4.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2820 + Ignored.method6828(7); // L: 2821 + } else { + if (var0 == 62) { // L: 2823 + Decimator.updateGameState(10); // L: 2824 + Ignored.method6828(9); // L: 2825 + class4.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2826 + return; // L: 2827 + } + + if (var0 == 63) { // L: 2829 + Decimator.updateGameState(10); // L: 2830 + Ignored.method6828(9); // L: 2831 + class4.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2832 + return; // L: 2833 + } + + if (var0 == 65 || var0 == 67) { // L: 2835 + Decimator.updateGameState(10); // L: 2836 + Ignored.method6828(9); // L: 2837 + class4.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2838 + return; // L: 2839 + } + + if (var0 == 71) { // L: 2841 + Decimator.updateGameState(10); // L: 2842 + Ignored.method6828(7); // L: 2843 + class4.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2844 + } else { + class4.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2846 + } + } + } + + Decimator.updateGameState(10); // L: 2847 + if (Client.field532.method7928()) { // L: 2848 + Ignored.method6828(9); // L: 2849 + } + + } // L: 2851 + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(Lcb;IIIIII)V", + garbageValue = "692099527" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4877 + if (var0 instanceof NPC) { // L: 4878 + NPCComposition var6 = ((NPC)var0).definition; // L: 4879 + if (var6.transforms != null) { // L: 4880 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 4881 + return; + } + } + + int var75 = Players.Players_count; // L: 4883 + int[] var7 = Players.Players_indices; // L: 4884 + byte var8 = 0; // L: 4885 + if (var1 < var75 && var0.playerCycle == Client.cycle && PacketBufferNode.method5188((Player)var0)) { // L: 4886 + Player var9 = (Player)var0; // L: 4887 + if (var1 < var75) { // L: 4888 + class93.method2376(var0, var0.defaultHeight + 15); // L: 4889 + AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4890 + byte var11 = 9; // L: 4891 + var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); // L: 4892 + var8 = 18; // L: 4893 + } + } + + int var76 = -2; // L: 4896 + int var15; + int var22; + int var23; + if (!var0.healthBars.method6164()) { // L: 4897 + class93.method2376(var0, var0.defaultHeight + 15); // L: 4898 + + for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { // L: 4899 + HealthBarUpdate var79 = var87.get(Client.cycle); // L: 4900 + if (var79 == null) { // L: 4901 + if (var87.isEmpty()) { // L: 4959 + var87.remove(); + } + } else { + HealthBarDefinition var80 = var87.definition; // L: 4902 + SpritePixels var13 = var80.getBackSprite(); // L: 4903 + SpritePixels var81 = var80.getFrontSprite(); // L: 4904 + int var82 = 0; // L: 4906 + if (var13 != null && var81 != null) { // L: 4907 + if (var80.widthPadding * 2 < var81.subWidth) { // L: 4908 + var82 = var80.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; // L: 4909 + } else { + var15 = var80.width; // L: 4911 + } + + int var17 = 255; // L: 4912 + boolean var83 = true; // L: 4913 + int var84 = Client.cycle - var79.cycle; // L: 4914 + int var85 = var15 * var79.health2 / var80.width; // L: 4915 + int var86; + int var93; + if (var79.cycleOffset > var84) { // L: 4916 + var86 = var80.field1866 == 0 ? 0 : var80.field1866 * (var84 / var80.field1866); // L: 4917 + var22 = var15 * var79.health / var80.width; // L: 4918 + var93 = var86 * (var85 - var22) / var79.cycleOffset + var22; // L: 4919 + } else { + var93 = var85; // L: 4922 + var86 = var80.int5 + var79.cycleOffset - var84; // L: 4923 + if (var80.int3 >= 0) { // L: 4924 + var17 = (var86 << 8) / (var80.int5 - var80.int3); + } + } + + if (var79.health2 > 0 && var93 < 1) { // L: 4926 + var93 = 1; + } + + if (var13 != null && var81 != null) { // L: 4927 + if (var15 == var93) { // L: 4928 + var93 += var82 * 2; + } else { + var93 += var82; // L: 4929 + } + + var86 = var13.subHeight; // L: 4930 + var76 += var86; // L: 4931 + var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4932 + var23 = var3 + Client.viewportTempY - var76; // L: 4933 + var22 -= var82; // L: 4934 + if (var17 >= 0 && var17 < 255) { // L: 4935 + var13.drawTransAt(var22, var23, var17); // L: 4936 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); // L: 4937 + var81.drawTransAt(var22, var23, var17); // L: 4938 + } else { + var13.drawTransBgAt(var22, var23); // L: 4941 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); // L: 4942 + var81.drawTransBgAt(var22, var23); // L: 4943 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4945 + var76 += 2; // L: 4946 + } else { + var76 += 5; // L: 4949 + if (Client.viewportTempX > -1) { // L: 4950 + var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4951 + var22 = var3 + Client.viewportTempY - var76; // L: 4952 + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var93, 5, 65280); // L: 4953 + Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var93, var22, var15 - var93, 5, 16711680); // L: 4954 + } + + var76 += 2; // L: 4956 + } + } + } + } + + if (var76 == -2) { // L: 4962 + var76 += 7; + } + + var76 += var8; // L: 4963 + if (var1 < var75) { // L: 4964 + Player var88 = (Player)var0; // L: 4965 + if (var88.isHidden) { // L: 4966 + return; + } + + if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 4967 + class93.method2376(var0, var0.defaultHeight + 15); // L: 4968 + if (Client.viewportTempX > -1) { // L: 4969 + if (var88.headIconPk != -1) { // L: 4970 + var76 += 25; // L: 4971 + class150.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4972 + } + + if (var88.headIconPrayer != -1) { // L: 4974 + var76 += 25; // L: 4975 + WallDecoration.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4976 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4980 + class93.method2376(var0, var0.defaultHeight + 15); // L: 4981 + if (Client.viewportTempX > -1) { // L: 4982 + var76 += InvDefinition.headIconHintSprites[1].subHeight; // L: 4983 + InvDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4984 + } + } + } else { + NPCComposition var89 = ((NPC)var0).definition; // L: 4989 + if (var89.transforms != null) { // L: 4990 + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < WallDecoration.headIconPrayerSprites.length) { // L: 4991 + class93.method2376(var0, var0.defaultHeight + 15); // L: 4992 + if (Client.viewportTempX > -1) { // L: 4993 + WallDecoration.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4994 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4997 + class93.method2376(var0, var0.defaultHeight + 15); // L: 4998 + if (Client.viewportTempX > -1) { // L: 4999 + InvDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1130 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5002 5003 + class93.method2376(var0, var0.defaultHeight); // L: 5004 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5005 + Client.overheadTextXOffsets[Client.overheadTextCount] = RouteStrategy.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5006 + Client.overheadTextAscents[Client.overheadTextCount] = RouteStrategy.fontBold12.ascent; // L: 5007 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5008 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5009 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5010 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5011 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5012 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5013 + ++Client.overheadTextCount; // L: 5014 + } + } + + for (int var77 = 0; var77 < 4; ++var77) { // L: 5018 + int var90 = var0.hitSplatCycles[var77]; // L: 5019 + int var12 = var0.hitSplatTypes[var77]; // L: 5020 + HitSplatDefinition var91 = null; // L: 5021 + int var14 = 0; // L: 5022 + if (var12 >= 0) { // L: 5023 + if (var90 <= Client.cycle) { // L: 5024 + continue; + } + + var91 = UserComparator3.method2602(var0.hitSplatTypes[var77]); // L: 5025 + var14 = var91.field1998; // L: 5026 + if (var91 != null && var91.transforms != null) { // L: 5027 + var91 = var91.transform(); // L: 5028 + if (var91 == null) { // L: 5029 + var0.hitSplatCycles[var77] = -1; // L: 5030 + continue; // L: 5031 + } + } + } else if (var90 < 0) { // L: 5035 + continue; + } + + var15 = var0.hitSplatTypes2[var77]; // L: 5036 + HitSplatDefinition var16 = null; // L: 5037 + if (var15 >= 0) { // L: 5038 + var16 = UserComparator3.method2602(var15); // L: 5039 + if (var16 != null && var16.transforms != null) { // L: 5040 + var16 = var16.transform(); + } + } + + if (var90 - var14 <= Client.cycle) { // L: 5042 + if (var91 == null) { // L: 5043 + var0.hitSplatCycles[var77] = -1; // L: 5044 + } else { + class93.method2376(var0, var0.defaultHeight / 2); // L: 5047 + if (Client.viewportTempX > -1) { // L: 5048 + if (var77 == 1) { // L: 5050 + Client.viewportTempY -= 20; // L: 5051 + } + + if (var77 == 2) { // L: 5053 + Client.viewportTempX -= 15; // L: 5054 + Client.viewportTempY -= 10; // L: 5055 + } + + if (var77 == 3) { // L: 5057 + Client.viewportTempX += 15; // L: 5058 + Client.viewportTempY -= 10; // L: 5059 + } + + SpritePixels var18 = null; // L: 5061 + SpritePixels var19 = null; // L: 5062 + SpritePixels var20 = null; // L: 5063 + SpritePixels var21 = null; // L: 5064 + var22 = 0; // L: 5065 + var23 = 0; // L: 5066 + int var24 = 0; // L: 5067 + int var25 = 0; // L: 5068 + int var26 = 0; // L: 5069 + int var27 = 0; // L: 5070 + int var28 = 0; // L: 5071 + int var29 = 0; // L: 5072 + SpritePixels var30 = null; // L: 5073 + SpritePixels var31 = null; // L: 5074 + SpritePixels var32 = null; // L: 5075 + SpritePixels var33 = null; // L: 5076 + int var34 = 0; // L: 5077 + int var35 = 0; // L: 5078 + int var36 = 0; // L: 5079 + int var37 = 0; // L: 5080 + int var38 = 0; // L: 5081 + int var39 = 0; // L: 5082 + int var40 = 0; // L: 5083 + int var41 = 0; // L: 5084 + int var42 = 0; // L: 5085 + var18 = var91.method3625(); // L: 5086 + int var43; + if (var18 != null) { // L: 5087 + var22 = var18.subWidth; // L: 5088 + var43 = var18.subHeight; // L: 5089 + if (var43 > var42) { // L: 5090 + var42 = var43; + } + + var26 = var18.xOffset; // L: 5091 + } + + var19 = var91.method3640(); // L: 5093 + if (var19 != null) { // L: 5094 + var23 = var19.subWidth; // L: 5095 + var43 = var19.subHeight; // L: 5096 + if (var43 > var42) { // L: 5097 + var42 = var43; + } + + var27 = var19.xOffset; // L: 5098 + } + + var20 = var91.method3626(); // L: 5100 + if (var20 != null) { // L: 5101 + var24 = var20.subWidth; // L: 5102 + var43 = var20.subHeight; // L: 5103 + if (var43 > var42) { // L: 5104 + var42 = var43; + } + + var28 = var20.xOffset; // L: 5105 + } + + var21 = var91.method3627(); // L: 5107 + if (var21 != null) { // L: 5108 + var25 = var21.subWidth; // L: 5109 + var43 = var21.subHeight; // L: 5110 + if (var43 > var42) { // L: 5111 + var42 = var43; + } + + var29 = var21.xOffset; // L: 5112 + } + + if (var16 != null) { // L: 5114 + var30 = var16.method3625(); // L: 5115 + if (var30 != null) { // L: 5116 + var34 = var30.subWidth; // L: 5117 + var43 = var30.subHeight; // L: 5118 + if (var43 > var42) { // L: 5119 + var42 = var43; + } + + var38 = var30.xOffset; // L: 5120 + } + + var31 = var16.method3640(); // L: 5122 + if (var31 != null) { // L: 5123 + var35 = var31.subWidth; // L: 5124 + var43 = var31.subHeight; // L: 5125 + if (var43 > var42) { // L: 5126 + var42 = var43; + } + + var39 = var31.xOffset; // L: 5127 + } + + var32 = var16.method3626(); // L: 5129 + if (var32 != null) { // L: 5130 + var36 = var32.subWidth; // L: 5131 + var43 = var32.subHeight; // L: 5132 + if (var43 > var42) { // L: 5133 + var42 = var43; + } + + var40 = var32.xOffset; // L: 5134 + } + + var33 = var16.method3627(); // L: 5136 + if (var33 != null) { // L: 5137 + var37 = var33.subWidth; // L: 5138 + var43 = var33.subHeight; // L: 5139 + if (var43 > var42) { // L: 5140 + var42 = var43; + } + + var41 = var33.xOffset; // L: 5141 + } + } + + Font var78 = var91.getFont(); // L: 5146 + if (var78 == null) { // L: 5147 + var78 = class113.fontPlain11; + } + + Font var44; + if (var16 != null) { // L: 5148 + var44 = var16.getFont(); // L: 5149 + if (var44 == null) { // L: 5150 + var44 = class113.fontPlain11; + } + } else { + var44 = class113.fontPlain11; // L: 5152 + } + + String var45 = null; // L: 5153 + String var46 = null; // L: 5154 + boolean var47 = false; // L: 5155 + int var48 = 0; // L: 5156 + var45 = var91.getString(var0.hitSplatValues[var77]); // L: 5157 + int var92 = var78.stringWidth(var45); // L: 5158 + if (var16 != null) { // L: 5159 + var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 5160 + var48 = var44.stringWidth(var46); // L: 5161 + } + + int var49 = 0; // L: 5163 + int var50 = 0; // L: 5164 + if (var23 > 0) { // L: 5165 + if (var20 == null && var21 == null) { // L: 5166 + var49 = 1; // L: 5167 + } else { + var49 = var92 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { // L: 5169 5170 + if (var32 == null && var33 == null) { // L: 5171 + var50 = 1; // L: 5172 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 5175 + int var52 = var51; // L: 5176 + if (var22 > 0) { // L: 5177 + var51 += var22; + } + + var51 += 2; // L: 5178 + int var53 = var51; // L: 5179 + if (var24 > 0) { // L: 5180 + var51 += var24; + } + + int var54 = var51; // L: 5181 + int var55 = var51; // L: 5182 + int var56; + if (var23 > 0) { // L: 5183 + var56 = var23 * var49; // L: 5184 + var51 += var56; // L: 5185 + var55 += (var56 - var92) / 2; // L: 5186 + } else { + var51 += var92; // L: 5189 + } + + var56 = var51; // L: 5191 + if (var25 > 0) { // L: 5192 + var51 += var25; + } + + int var57 = 0; // L: 5193 + int var58 = 0; // L: 5194 + int var59 = 0; // L: 5195 + int var60 = 0; // L: 5196 + int var61 = 0; // L: 5197 + int var62; + if (var16 != null) { // L: 5198 + var51 += 2; // L: 5199 + var57 = var51; // L: 5200 + if (var34 > 0) { // L: 5201 + var51 += var34; + } + + var51 += 2; // L: 5202 + var58 = var51; // L: 5203 + if (var36 > 0) { // L: 5204 + var51 += var36; + } + + var59 = var51; // L: 5205 + var61 = var51; // L: 5206 + if (var35 > 0) { // L: 5207 + var62 = var35 * var50; // L: 5208 + var51 += var62; // L: 5209 + var61 += (var62 - var48) / 2; // L: 5210 + } else { + var51 += var48; // L: 5213 + } + + var60 = var51; // L: 5215 + if (var37 > 0) { // L: 5216 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 5218 + int var63 = var91.field2003 - var62 * var91.field2003 / var91.field1998; // L: 5219 + int var64 = var62 * var91.field2004 / var91.field1998 + -var91.field2004; // L: 5220 + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5221 + int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 5222 + int var67 = var66; // L: 5223 + int var68 = var42 + var66; // L: 5224 + int var69 = var66 + var91.field2011 + 15; // L: 5225 + int var70 = var69 - var78.maxAscent; // L: 5226 + int var71 = var69 + var78.maxDescent; // L: 5227 + if (var70 < var66) { // L: 5228 + var67 = var70; + } + + if (var71 > var68) { // L: 5229 + var68 = var71; + } + + int var72 = 0; // L: 5230 + int var73; + int var74; + if (var16 != null) { // L: 5231 + var72 = var66 + var16.field2011 + 15; // L: 5232 + var73 = var72 - var44.maxAscent; // L: 5233 + var74 = var72 + var44.maxDescent; // L: 5234 + if (var73 < var67) { // L: 5235 + ; + } + + if (var74 > var68) { // L: 5236 + ; + } + } + + var73 = 255; // L: 5238 + if (var91.field2005 >= 0) { // L: 5239 + var73 = (var62 << 8) / (var91.field1998 - var91.field2005); + } + + if (var73 >= 0 && var73 < 255) { // L: 5240 + if (var18 != null) { // L: 5241 + var18.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var20 != null) { // L: 5242 + var20.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var19 != null) { // L: 5243 + for (var74 = 0; var74 < var49; ++var74) { // L: 5244 + var19.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); // L: 5245 + } + } + + if (var21 != null) { // L: 5248 + var21.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var78.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); // L: 5249 + if (var16 != null) { // L: 5250 + if (var30 != null) { // L: 5251 + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { // L: 5252 + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { // L: 5253 + for (var74 = 0; var74 < var50; ++var74) { // L: 5254 + var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); // L: 5255 + } + } + + if (var33 != null) { // L: 5258 + var33.drawTransAt(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var16.textColor, 0, var73); // L: 5259 + } + } else { + if (var18 != null) { // L: 5263 + var18.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var20 != null) { // L: 5264 + var20.drawTransBgAt(var53 + var65 - var28, var66); + } + + if (var19 != null) { // L: 5265 + for (var74 = 0; var74 < var49; ++var74) { // L: 5266 + var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); // L: 5267 + } + } + + if (var21 != null) { // L: 5270 + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); // L: 5271 + if (var16 != null) { // L: 5272 + if (var30 != null) { // L: 5273 + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { // L: 5274 + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { // L: 5275 + for (var74 = 0; var74 < var50; ++var74) { // L: 5276 + var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); // L: 5277 + } + } + + if (var33 != null) { // L: 5280 + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 5281 + } + } + } + } + } + } + + } + } // L: 5286 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 75d5b387a5..7e08ec567a 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,257 +1,94 @@ -import java.io.File; -import java.io.RandomAccessFile; +import java.security.SecureRandom; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bn") +@ObfuscatedName("bu") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { SecureRandomCallable() { - } // L: 36 + } // L: 42 public Object call() { - return NPC.method2364(); // L: 46 + SecureRandom var2 = new SecureRandom(); // L: 47 + var2.nextInt(); // L: 48 + return var2; // L: 51 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZI)Z", - garbageValue = "-1849824347" + descriptor = "(II)I", + garbageValue = "-2044012999" ) - public static boolean method2069(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 149 - int var3 = var2.read(); // L: 150 - var2.seek(0L); // L: 151 - var2.write(var3); // L: 152 - var2.seek(0L); // L: 153 - var2.close(); // L: 154 - if (var1) { // L: 155 - var0.delete(); - } - - return true; // L: 156 - } catch (Exception var4) { // L: 158 - return false; // L: 159 - } + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = UserComparator6.method2643(var0); // L: 24 + int var2 = var1.baseVar; // L: 25 + int var3 = var1.startBit; // L: 26 + int var4 = var1.endBit; // L: 27 + int var5 = Varps.Varps_masks[var4 - var3]; // L: 28 + return Varps.Varps_main[var2] >> var3 & var5; // L: 29 } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "57" + descriptor = "(CLlo;I)I", + garbageValue = "522647287" ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 1034 - var1 /= 2; + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 143 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144 + var0 = Character.toLowerCase(var0); // L: 145 + var2 = (var0 << 4) + 1; // L: 146 } - if (var2 > 192) { // L: 1035 - var1 /= 2; + if (var0 == 241 && var1 == Language.Language_ES) { // L: 148 + var2 = 1762; } - if (var2 > 217) { // L: 1036 - var1 /= 2; - } - - if (var2 > 243) { // L: 1037 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 1038 - return var3; // L: 1039 + return var2; // L: 149 } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-555980278" + descriptor = "(B)Z", + garbageValue = "-4" ) - static int method2064(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269 - int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286 - var7 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1287 - var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1288 - if (var4 >= 1 && var4 <= 10) { // L: 1289 - class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292 - Interpreter.field839.add(var8); // L: 1293 - return 1; // L: 1294 - } else { - throw new RuntimeException(); // L: 1290 - } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296 - class295.Interpreter_intStackSize -= 3; // L: 1297 - int var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1298 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1299 - int var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 1300 - if (var5 >= 1 && var5 <= 10) { // L: 1301 - class93 var6 = new class93(var5, var3, var4, HorizontalAlignment.getWidget(var3).itemId); // L: 1304 - Interpreter.field839.add(var6); // L: 1305 - return 1; // L: 1306 - } else { - throw new RuntimeException(); // L: 1302 - } + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 169 + if (KeyHandler.field138 == KeyHandler.field141) { // L: 170 + return false; } else { - return 2; // L: 1308 - } - } else if (Interpreter.field827 >= 10) { // L: 1270 - throw new RuntimeException(); // L: 1271 - } else { - if (var0 >= 2000) { // L: 1274 - var7 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1275 - } else { - var7 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1277 - } - - if (var7.onResize == null) { // L: 1278 - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); // L: 1279 - var9.widget = var7; // L: 1280 - var9.args = var7.onResize; // L: 1281 - var9.field1053 = Interpreter.field827 + 1; // L: 1282 - Client.scriptEvents.addFirst(var9); // L: 1283 - return 1; // L: 1284 + GameEngine.field218 = KeyHandler.field136[KeyHandler.field141]; // L: 171 + ItemComposition.field2121 = KeyHandler.field135[KeyHandler.field141]; // L: 172 + KeyHandler.field141 = KeyHandler.field141 + 1 & 127; // L: 173 + return true; // L: 174 } } } - @ObfuscatedName("ha") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZLpy;B)V", - garbageValue = "88" + descriptor = "(I)Lbb;", + garbageValue = "-771048331" ) - static final void method2066(boolean var0, PacketBuffer var1) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7909 - int var2 = var1.readBits(15); // L: 7910 - if (var2 != 32767) { // L: 7911 - boolean var3 = false; // L: 7912 - if (Client.npcs[var2] == null) { // L: 7913 - Client.npcs[var2] = new NPC(); // L: 7914 - var3 = true; // L: 7915 - } - - NPC var4 = Client.npcs[var2]; // L: 7917 - Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7918 - var4.npcCycle = Client.cycle; // L: 7919 - int var5; - int var6; - int var7; - int var8; - boolean var9; - int var10; - if (class162.field1768) { // L: 7923 - if (var0) { // L: 7924 - var6 = var1.readBits(8); // L: 7925 - if (var6 > 127) { // L: 7926 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 7929 - if (var6 > 15) { // L: 7930 - var6 -= 32; - } - } - - var5 = var1.readBits(1); // L: 7932 - var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7933 - if (var3) { // L: 7934 - var4.orientation = var4.rotation = var8; - } - - var4.definition = class9.getNpcDefinition(var1.readBits(14)); // L: 7935 - if (var0) { // L: 7936 - var7 = var1.readBits(8); // L: 7937 - if (var7 > 127) { // L: 7938 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 7941 - if (var7 > 15) { // L: 7942 - var7 -= 32; - } - } - - var9 = var1.readBits(1) == 1; // L: 7944 - if (var9) { // L: 7945 - var1.readBits(32); // L: 7946 - } - - var10 = var1.readBits(1); // L: 7948 - if (var10 == 1) { // L: 7949 - Client.field533[++Client.field609 - 1] = var2; - } - } else { - var5 = var1.readBits(1); // L: 7952 - var8 = var1.readBits(1); // L: 7953 - if (var8 == 1) { // L: 7954 - Client.field533[++Client.field609 - 1] = var2; - } - - if (var0) { // L: 7955 - var7 = var1.readBits(8); // L: 7956 - if (var7 > 127) { // L: 7957 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 7960 - if (var7 > 15) { // L: 7961 - var7 -= 32; - } - } - - var9 = var1.readBits(1) == 1; // L: 7963 - if (var9) { // L: 7964 - var1.readBits(32); // L: 7965 - } - - if (var0) { // L: 7967 - var6 = var1.readBits(8); // L: 7968 - if (var6 > 127) { // L: 7969 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 7972 - if (var6 > 15) { // L: 7973 - var6 -= 32; - } - } - - var4.definition = class9.getNpcDefinition(var1.readBits(14)); // L: 7975 - var10 = Client.defaultRotations[var1.readBits(3)]; // L: 7976 - if (var3) { // L: 7977 - var4.orientation = var4.rotation = var10; - } - } - - var4.field1145 = var4.definition.size; // L: 7979 - var4.field1192 = var4.definition.rotation; // L: 7980 - if (var4.field1192 == 0) { // L: 7981 - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; // L: 7982 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7983 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7984 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7985 - var4.idleSequence = var4.definition.idleSequence; // L: 7986 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7987 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7988 - var4.method2353(class19.localPlayer.pathX[0] + var6, class19.localPlayer.pathY[0] + var7, var5 == 1); // L: 7989 - continue; // L: 7990 - } - } - - var1.exportIndex(); // L: 7991 - return; // L: 7992 - } + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 237 + return class305.getNextWorldListWorld(); // L: 238 } + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1734362021" + ) + static final void method2050() { + Client.field702 = Client.cycleCntr; // L: 12375 + Interpreter.ClanChat_inClanChat = true; // L: 12376 + } // L: 12377 } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 162091db26..b96350932e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -7,25 +7,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bx") +@ObfuscatedName("bt") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("l") + @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = 624688943 + intValue = -1797802819 ) - public static int field949; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -586498373 - ) - @Export("cacheGamebuild") - public static int cacheGamebuild; + @Export("worldPort") + static int worldPort; @ObfuscatedName("v") @Export("executor") ExecutorService executor; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("future") Future future; @@ -37,7 +33,7 @@ public class SecureRandomFuture { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-56" + garbageValue = "100" ) @Export("shutdown") void shutdown() { @@ -45,50 +41,205 @@ public class SecureRandomFuture { this.executor = null; // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-71" + descriptor = "(I)Z", + garbageValue = "1428747809" ) @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "168688514" + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "-92" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); // L: 28 - } catch (Exception var2) { // L: 30 - return NPC.method2364(); // L: 31 + } catch (Exception var4) { // L: 30 + SecureRandom var3 = new SecureRandom(); // L: 33 + var3.nextInt(); // L: 34 + return var3; // L: 37 } } - @ObfuscatedName("ip") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "1166774684" + descriptor = "(ILbd;ZI)I", + garbageValue = "2104431553" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - DynamicObject.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9214 - } // L: 9215 + static int method1985(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2270 + Interpreter.Interpreter_intStackSize -= 2; // L: 2271 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2272 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2273 + EnumComposition var10 = class78.getEnum(var3); // L: 2274 + if (var10.outputType != 's') { // L: 2275 + } - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1463991550" - ) - static final void method1968() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11698 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11699 - var1.method2143(); // L: 11700 + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2276 + if (var9 == var10.keys[var6]) { // L: 2277 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2278 + var10 = null; // L: 2279 + break; + } + } + + if (var10 != null) { // L: 2283 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 2284 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2286 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2312 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2313 + EnumComposition var4 = class78.getEnum(var3); // L: 2314 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); // L: 2315 + return 1; // L: 2316 + } else { + return 2; // L: 2318 + } + } else { + Interpreter.Interpreter_intStackSize -= 4; // L: 2287 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2288 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2289 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2290 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2291 + EnumComposition var7 = class78.getEnum(var5); // L: 2292 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2293 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2298 + if (var6 == var7.keys[var8]) { // L: 2299 + if (var9 == 115) { // L: 2300 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2301 + } + + var7 = null; // L: 2302 + break; + } + } + + if (var7 != null) { // L: 2306 + if (var9 == 115) { // L: 2307 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2308 + } + } + + return 1; // L: 2310 + } else { + if (var9 == 115) { // L: 2294 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2295 + } + + return 1; // L: 2296 + } } + } - } // L: 11702 + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "970773332" + ) + static int method1984(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3845 + Interpreter.Interpreter_intStackSize -= 2; // L: 3846 + Client.field760 = (short)GrandExchangeOffer.method6032(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); // L: 3847 + if (Client.field760 <= 0) { // L: 3848 + Client.field760 = 256; + } + + Client.field761 = (short)GrandExchangeOffer.method6032(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3849 + if (Client.field761 <= 0) { // L: 3850 + Client.field761 = 256; + } + + return 1; // L: 3851 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3853 + Interpreter.Interpreter_intStackSize -= 2; // L: 3854 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3855 + if (Client.zoomHeight <= 0) { // L: 3856 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3857 + if (Client.zoomWidth <= 0) { // L: 3858 + Client.zoomWidth = 320; + } + + return 1; // L: 3859 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3861 + Interpreter.Interpreter_intStackSize -= 4; // L: 3862 + Client.field764 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3863 + if (Client.field764 <= 0) { // L: 3864 + Client.field764 = 1; + } + + Client.field765 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3865 + if (Client.field765 <= 0) { // L: 3866 + Client.field765 = 32767; + } else if (Client.field765 < Client.field764) { // L: 3867 + Client.field765 = Client.field764; + } + + Client.field766 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3868 + if (Client.field766 <= 0) { // L: 3869 + Client.field766 = 1; + } + + Client.field666 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3870 + if (Client.field666 <= 0) { // L: 3871 + Client.field666 = 32767; + } else if (Client.field666 < Client.field766) { // L: 3872 + Client.field666 = Client.field766; + } + + return 1; // L: 3873 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3875 + if (Client.viewportWidget != null) { // L: 3876 + class17.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3877 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3878 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3879 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3882 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3883 + } + + return 1; // L: 3885 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3887 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3888 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3889 + return 1; // L: 3890 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3892 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.method5175(Client.field760); // L: 3893 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.method5175(Client.field761); // L: 3894 + return 1; // L: 3895 + } else if (var0 == 6220) { // L: 3897 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3898 + return 1; // L: 3899 + } else if (var0 == 6221) { // L: 3901 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3902 + return 1; // L: 3903 + } else if (var0 == 6222) { // L: 3905 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth; // L: 3906 + return 1; // L: 3907 + } else if (var0 == 6223) { // L: 3909 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class321.canvasHeight; // L: 3910 + return 1; // L: 3911 + } else { + return 2; // L: 3913 + } + } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 31becd8207..fdd3612529 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -6,117 +6,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gw") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { @ObfuscatedName("v") - static boolean field2150; - @ObfuscatedName("h") + static boolean field2151; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("l") + static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lln;" + ) + @Export("SequenceDefinition_skeletonsArchive") + static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lig;" ) @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("SequenceDefinition_cachedModel") public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1904575055 + intValue = 1013494467 ) @Export("SequenceDefinition_cachedModelId") int SequenceDefinition_cachedModelId; - @ObfuscatedName("u") - public Map field2170; + @ObfuscatedName("q") + public Map field2144; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1880627603 + ) + int field2152; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1007143009 + intValue = 2046803879 ) - int field2151; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1999392015 - ) - int field2157; - @ObfuscatedName("x") + int field2160; + @ObfuscatedName("p") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -754201145 + intValue = -1070190955 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("b") - int[] field2156; - @ObfuscatedName("w") - boolean[] field2164; - @ObfuscatedName("a") - public boolean field2165; - @ObfuscatedName("m") + @ObfuscatedName("u") + int[] field2146; + @ObfuscatedName("t") + boolean[] field2156; + @ObfuscatedName("g") + public boolean field2154; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1512546953 + intValue = 118490245 ) - public int field2166; - @ObfuscatedName("q") + public int field2155; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1639485167 + intValue = 1252279117 ) @Export("shield") public int shield; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 480167985 + intValue = 221867971 ) @Export("weapon") public int weapon; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1414981787 + intValue = 290936429 ) - public int field2169; + public int field2138; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 142595323 + intValue = -1964566761 ) - public int field2162; - @ObfuscatedName("t") + public int field2159; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1199184569 + intValue = 1376607035 ) - public int field2171; - @ObfuscatedName("i") + public int field2158; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1417760427 + intValue = -1493621085 ) - public int field2172; + public int field2161; static { - field2150 = false; // L: 16 + field2151 = false; // L: 16 SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20 SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21 SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); // L: 22 @@ -124,450 +130,806 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.SequenceDefinition_cachedModelId = -1; // L: 23 - this.field2151 = 0; // L: 25 - this.field2157 = 0; // L: 26 + this.field2152 = 0; // L: 25 + this.field2160 = 0; // L: 26 this.frameCount = -1; // L: 31 - this.field2165 = false; // L: 34 - this.field2166 = 5; // L: 35 + this.field2154 = false; // L: 34 + this.field2155 = 5; // L: 35 this.shield = -1; // L: 36 this.weapon = -1; // L: 37 - this.field2169 = 99; // L: 38 - this.field2162 = -1; // L: 39 - this.field2171 = -1; // L: 40 - this.field2172 = 2; // L: 41 + this.field2138 = 99; // L: 38 + this.field2159 = -1; // L: 39 + this.field2158 = -1; // L: 40 + this.field2161 = 2; // L: 41 } // L: 43 - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-4" + descriptor = "(Lpi;S)V", + garbageValue = "-208" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 58 - if (var2 == 0) { // L: 59 - return; // L: 62 + int var2 = var1.readUnsignedByte(); // L: 64 + if (var2 == 0) { // L: 65 + return; // L: 68 } - this.decodeNext(var1, var2); // L: 60 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "429154180" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - int var3; - int var4; - if (var2 == 1) { // L: 65 - var3 = var1.readUnsignedShort(); // L: 66 - this.frameLengths = new int[var3]; // L: 67 - - for (var4 = 0; var4 < var3; ++var4) { // L: 68 - this.frameLengths[var4] = var1.readUnsignedShort(); - } - - this.frameIds = new int[var3]; // L: 69 - - for (var4 = 0; var4 < var3; ++var4) { // L: 70 - this.frameIds[var4] = var1.readUnsignedShort(); - } - - for (var4 = 0; var4 < var3; ++var4) { // L: 71 - this.frameIds[var4] += var1.readUnsignedShort() << 16; - } - } else if (var2 == 2) { // L: 73 - this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { // L: 74 - var3 = var1.readUnsignedByte(); // L: 75 - this.field2156 = new int[var3 + 1]; // L: 76 - - for (var4 = 0; var4 < var3; ++var4) { // L: 77 - this.field2156[var4] = var1.readUnsignedByte(); - } - - this.field2156[var3] = 9999999; // L: 78 - } else if (var2 == 4) { // L: 80 - this.field2165 = true; - } else if (var2 == 5) { // L: 81 - this.field2166 = var1.readUnsignedByte(); - } else if (var2 == 6) { // L: 82 - this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 83 - this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { // L: 84 - this.field2169 = var1.readUnsignedByte(); - } else if (var2 == 9) { // L: 85 - this.field2162 = var1.readUnsignedByte(); - } else if (var2 == 10) { // L: 86 - this.field2171 = var1.readUnsignedByte(); - } else if (var2 == 11) { // L: 87 - this.field2172 = var1.readUnsignedByte(); - } else if (var2 == 12) { // L: 88 - var3 = var1.readUnsignedByte(); // L: 89 - this.chatFrameIds = new int[var3]; // L: 90 - - for (var4 = 0; var4 < var3; ++var4) { // L: 91 - this.chatFrameIds[var4] = var1.readUnsignedShort(); - } - - for (var4 = 0; var4 < var3; ++var4) { // L: 92 - this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; - } - } else if (var2 == 13) { // L: 94 - var3 = var1.readUnsignedByte(); // L: 95 - this.soundEffects = new int[var3]; // L: 96 - - for (var4 = 0; var4 < var3; ++var4) { // L: 97 - this.soundEffects[var4] = var1.readMedium(); - } - } else if (var2 == 14) { // L: 99 - this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 100 - } else if (var2 == 15) { // L: 102 - var3 = var1.readUnsignedShort(); // L: 103 - this.field2170 = new HashMap(); // L: 104 - - for (var4 = 0; var4 < var3; ++var4) { // L: 105 - int var5 = var1.readUnsignedShort(); // L: 106 - int var6 = var1.readMedium(); // L: 107 - this.field2170.put(var5, var6); // L: 108 - } - } else if (var2 == 16) { // L: 111 - this.field2151 = var1.readUnsignedShort(); // L: 112 - this.field2157 = var1.readUnsignedShort(); // L: 113 - } else if (var2 == 17) { // L: 115 - this.field2164 = new boolean[256]; // L: 116 - - for (var3 = 0; var3 < this.field2164.length; ++var3) { // L: 117 - this.field2164[var3] = false; // L: 118 - } - - var3 = var1.readUnsignedByte(); // L: 120 - - for (var4 = 0; var4 < var3; ++var4) { // L: 121 - this.field2164[var1.readUnsignedByte()] = true; // L: 122 - } - } - - } // L: 126 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "45" - ) - @Export("postDecode") - void postDecode() { - if (this.field2162 == -1) { // L: 129 - if (this.field2156 == null && this.field2164 == null) { // L: 130 - this.field2162 = 0; // L: 131 - } else { - this.field2162 = 2; - } - } - - if (this.field2171 == -1) { // L: 133 - if (this.field2156 == null && this.field2164 == null) { // L: 134 - this.field2171 = 0; // L: 135 - } else { - this.field2171 = 2; - } - } - - } // L: 137 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lhx;II)Lhx;", - garbageValue = "1225828332" - ) - @Export("transformActorModel") - public Model transformActorModel(Model var1, int var2) { - Model var4; - if (!this.isCachedModelIdSet()) { // L: 140 - var2 = this.frameIds[var2]; // L: 141 - Frames var5 = class143.getFrames(var2 >> 16); // L: 142 - var2 &= 65535; // L: 143 - if (var5 == null) { // L: 144 - return var1.toSharedSequenceModel(true); - } else { - var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 145 - var4.animate(var5, var2); // L: 146 - return var4; // L: 147 - } - } else { - class122 var3 = class117.method2724(this.SequenceDefinition_cachedModelId); // L: 150 - if (var3 == null) { // L: 151 - return var1.toSharedSequenceModel(true); - } else { - var4 = var1.toSharedSequenceModel(!var3.method2784()); // L: 152 - var4.method4363(var3, var2); // L: 153 - return var4; // L: 154 - } - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lhx;III)Lhx;", - garbageValue = "804450447" - ) - @Export("transformObjectModel") - Model transformObjectModel(Model var1, int var2, int var3) { - Model var5; - if (!this.isCachedModelIdSet()) { // L: 159 - var2 = this.frameIds[var2]; // L: 160 - Frames var6 = class143.getFrames(var2 >> 16); // L: 161 - var2 &= 65535; // L: 162 - if (var6 == null) { // L: 163 - return var1.toSharedSequenceModel(true); - } else { - var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 164 - var3 &= 3; // L: 165 - if (var3 == 1) { // L: 166 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 167 - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY90Ccw(); // L: 168 - } - - var5.animate(var6, var2); // L: 169 - if (var3 == 1) { // L: 170 - var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 171 - var5.rotateY180(); - } else if (var3 == 3) { // L: 172 - var5.rotateY270Ccw(); - } - - return var5; // L: 173 - } - } else { - class122 var4 = class117.method2724(this.SequenceDefinition_cachedModelId); // L: 176 - if (var4 == null) { // L: 177 - return var1.toSharedSequenceModel(true); - } else { - var5 = var1.toSharedSequenceModel(!var4.method2784()); // L: 178 - var3 &= 3; // L: 179 - if (var3 == 1) { // L: 180 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 181 - var5.rotateY180(); - } else if (var3 == 3) { // L: 182 - var5.rotateY90Ccw(); - } - - var5.method4363(var4, var2); // L: 183 - if (var3 == 1) { // L: 184 - var5.rotateY90Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); // L: 185 - } else if (var3 == 3) { // L: 186 - var5.rotateY270Ccw(); - } - - return var5; // L: 187 - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lhx;IB)Lhx;", - garbageValue = "-28" - ) - @Export("transformSpotAnimationModel") - Model transformSpotAnimationModel(Model var1, int var2) { - Model var4; - if (!this.isCachedModelIdSet()) { // L: 192 - var2 = this.frameIds[var2]; // L: 193 - Frames var5 = class143.getFrames(var2 >> 16); // L: 194 - var2 &= 65535; // L: 195 - if (var5 == null) { // L: 196 - return var1.toSharedSpotAnimationModel(true); - } else { - var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 197 - var4.animate(var5, var2); // L: 198 - return var4; // L: 199 - } - } else { - class122 var3 = class117.method2724(this.SequenceDefinition_cachedModelId); // L: 202 - if (var3 == null) { // L: 203 - return var1.toSharedSpotAnimationModel(true); - } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method2784()); // L: 204 - var4.method4363(var3, var2); // L: 205 - return var4; // L: 206 - } + this.decodeNext(var1, var2); // L: 66 } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhx;ILgg;II)Lhx;", - garbageValue = "-181616819" + descriptor = "(Lpi;II)V", + garbageValue = "-1513978235" ) - @Export("applyTransformations") - public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field2150 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 211 - return this.method3800(var1, var2, var3, var4); // L: 212 + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + int var3; + int var4; + if (var2 == 1) { // L: 71 + var3 = var1.readUnsignedShort(); // L: 72 + this.frameLengths = new int[var3]; // L: 73 + + for (var4 = 0; var4 < var3; ++var4) { // L: 74 + this.frameLengths[var4] = var1.readUnsignedShort(); + } + + this.frameIds = new int[var3]; // L: 75 + + for (var4 = 0; var4 < var3; ++var4) { // L: 76 + this.frameIds[var4] = var1.readUnsignedShort(); + } + + for (var4 = 0; var4 < var3; ++var4) { // L: 77 + this.frameIds[var4] += var1.readUnsignedShort() << 16; + } + } else if (var2 == 2) { // L: 79 + this.frameCount = var1.readUnsignedShort(); + } else if (var2 == 3) { // L: 80 + var3 = var1.readUnsignedByte(); // L: 81 + this.field2146 = new int[var3 + 1]; // L: 82 + + for (var4 = 0; var4 < var3; ++var4) { // L: 83 + this.field2146[var4] = var1.readUnsignedByte(); + } + + this.field2146[var3] = 9999999; // L: 84 + } else if (var2 == 4) { // L: 86 + this.field2154 = true; + } else if (var2 == 5) { // L: 87 + this.field2155 = var1.readUnsignedByte(); + } else if (var2 == 6) { // L: 88 + this.shield = var1.readUnsignedShort(); + } else if (var2 == 7) { // L: 89 + this.weapon = var1.readUnsignedShort(); + } else if (var2 == 8) { // L: 90 + this.field2138 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 91 + this.field2159 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 92 + this.field2158 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 93 + this.field2161 = var1.readUnsignedByte(); + } else if (var2 == 12) { // L: 94 + var3 = var1.readUnsignedByte(); // L: 95 + this.chatFrameIds = new int[var3]; // L: 96 + + for (var4 = 0; var4 < var3; ++var4) { // L: 97 + this.chatFrameIds[var4] = var1.readUnsignedShort(); + } + + for (var4 = 0; var4 < var3; ++var4) { // L: 98 + this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; + } + } else if (var2 == 13) { // L: 100 + var3 = var1.readUnsignedByte(); // L: 101 + this.soundEffects = new int[var3]; // L: 102 + + for (var4 = 0; var4 < var3; ++var4) { // L: 103 + this.soundEffects[var4] = var1.readMedium(); + } + } else if (var2 == 14) { // L: 105 + this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 106 + } else if (var2 == 15) { // L: 108 + var3 = var1.readUnsignedShort(); // L: 109 + this.field2144 = new HashMap(); // L: 110 + + for (var4 = 0; var4 < var3; ++var4) { // L: 111 + int var5 = var1.readUnsignedShort(); // L: 112 + int var6 = var1.readMedium(); // L: 113 + this.field2144.put(var5, var6); // L: 114 + } + } else if (var2 == 16) { // L: 117 + this.field2152 = var1.readUnsignedShort(); // L: 118 + this.field2160 = var1.readUnsignedShort(); // L: 119 + } else if (var2 == 17) { // L: 121 + this.field2156 = new boolean[256]; // L: 122 + + for (var3 = 0; var3 < this.field2156.length; ++var3) { // L: 123 + this.field2156[var3] = false; // L: 124 + } + + var3 = var1.readUnsignedByte(); // L: 126 + + for (var4 = 0; var4 < var3; ++var4) { // L: 127 + this.field2156[var1.readUnsignedByte()] = true; // L: 128 + } + } + + } // L: 132 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + @Export("postDecode") + void postDecode() { + if (this.field2159 == -1) { // L: 135 + if (this.field2146 == null && this.field2156 == null) { // L: 136 + this.field2159 = 0; // L: 137 + } else { + this.field2159 = 2; + } + } + + if (this.field2158 == -1) { // L: 139 + if (this.field2146 == null && this.field2156 == null) { // L: 140 + this.field2158 = 0; // L: 141 + } else { + this.field2158 = 2; + } + } + + } // L: 143 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Liq;II)Liq;", + garbageValue = "741452141" + ) + @Export("transformActorModel") + public Model transformActorModel(Model var1, int var2) { + Model var4; + if (!this.isCachedModelIdSet()) { // L: 146 + var2 = this.frameIds[var2]; // L: 147 + Frames var5 = class115.getFrames(var2 >> 16); // L: 148 + var2 &= 65535; // L: 149 + if (var5 == null) { // L: 150 + return var1.toSharedSequenceModel(true); + } else { + var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 151 + var4.animate(var5, var2); // L: 152 + return var4; // L: 153 + } } else { - Model var5 = var1.toSharedSequenceModel(false); // L: 214 - boolean var6 = false; // L: 215 - Frames var7 = null; // L: 216 - class122 var8; - if (this.isCachedModelIdSet()) { // L: 217 - var8 = this.method3801(); // L: 218 - if (var3.isCachedModelIdSet() && this.field2164 == null) { // L: 219 - var5.method4363(var8, var2); // L: 220 - return var5; // L: 221 - } - - var5.method4367(var8, var2, this.field2164, false); // L: 223 + class122 var3 = class342.method6314(this.SequenceDefinition_cachedModelId); // L: 156 + if (var3 == null) { // L: 157 + return var1.toSharedSequenceModel(true); } else { - var2 = this.frameIds[var2]; // L: 226 - var7 = class143.getFrames(var2 >> 16); // L: 227 - var2 &= 65535; // L: 228 - if (var7 == null) { // L: 229 - return var3.transformActorModel(var1, var4); - } - - if (!var3.isCachedModelIdSet() && (this.field2156 == null || var4 == -1)) { // L: 230 - var5.animate(var7, var2); // L: 231 - return var5; // L: 232 - } - - if (this.field2156 == null || var4 == -1) { // L: 234 - var5.animate(var7, var2); // L: 235 - return var5; // L: 236 - } - - var6 = var3.isCachedModelIdSet(); // L: 238 - if (!var6) { // L: 239 - var5.method4368(var7, var2, this.field2156, false); // L: 240 - } + var4 = var1.toSharedSequenceModel(!var3.method2768()); // L: 158 + var4.method5000(var3, var2); // L: 159 + return var4; // L: 160 } - - if (var3.isCachedModelIdSet()) { // L: 243 - var8 = var3.method3801(); // L: 244 - var5.method4367(var8, var4, this.field2164, true); // L: 245 - } else { - var4 = var3.frameIds[var4]; // L: 248 - Frames var9 = class143.getFrames(var4 >> 16); // L: 249 - var4 &= 65535; // L: 250 - if (var9 == null) { // L: 251 - return this.transformActorModel(var1, var2); - } - - var5.method4368(var9, var4, this.field2156, true); // L: 252 - } - - if (var6 && var7 != null) { // L: 254 - var5.method4368(var7, var2, this.field2156, false); // L: 255 - } - - var5.resetBounds(); // L: 257 - return var5; // L: 258 } } - @ObfuscatedName("u") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lhx;ILgg;IB)Lhx;", - garbageValue = "-117" + descriptor = "(Liq;III)Liq;", + garbageValue = "-2020846308" ) - Model method3800(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; // L: 262 - Frames var5 = class143.getFrames(var2 >> 16); // L: 263 - var2 &= 65535; // L: 264 - if (var5 == null) { // L: 265 + @Export("transformObjectModel") + Model transformObjectModel(Model var1, int var2, int var3) { + Model var5; + if (!this.isCachedModelIdSet()) { // L: 165 + var2 = this.frameIds[var2]; // L: 166 + Frames var6 = class115.getFrames(var2 >> 16); // L: 167 + var2 &= 65535; // L: 168 + if (var6 == null) { // L: 169 + return var1.toSharedSequenceModel(true); + } else { + var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 170 + var3 &= 3; // L: 171 + if (var3 == 1) { // L: 172 + var5.rotateY270Ccw(); + } else if (var3 == 2) { // L: 173 + var5.rotateY180(); + } else if (var3 == 3) { // L: 174 + var5.rotateY90Ccw(); + } + + var5.animate(var6, var2); // L: 175 + if (var3 == 1) { // L: 176 + var5.rotateY90Ccw(); + } else if (var3 == 2) { // L: 177 + var5.rotateY180(); + } else if (var3 == 3) { // L: 178 + var5.rotateY270Ccw(); + } + + return var5; // L: 179 + } + } else { + class122 var4 = class342.method6314(this.SequenceDefinition_cachedModelId); // L: 182 + if (var4 == null) { // L: 183 + return var1.toSharedSequenceModel(true); + } else { + var5 = var1.toSharedSequenceModel(!var4.method2768()); // L: 184 + var3 &= 3; // L: 185 + if (var3 == 1) { // L: 186 + var5.rotateY270Ccw(); + } else if (var3 == 2) { // L: 187 + var5.rotateY180(); + } else if (var3 == 3) { // L: 188 + var5.rotateY90Ccw(); + } + + var5.method5000(var4, var2); // L: 189 + if (var3 == 1) { // L: 190 + var5.rotateY90Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); // L: 191 + } else if (var3 == 3) { // L: 192 + var5.rotateY270Ccw(); + } + + return var5; // L: 193 + } + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Liq;IS)Liq;", + garbageValue = "21409" + ) + @Export("transformSpotAnimationModel") + Model transformSpotAnimationModel(Model var1, int var2) { + Model var4; + if (!this.isCachedModelIdSet()) { // L: 198 + var2 = this.frameIds[var2]; // L: 199 + Frames var5 = class115.getFrames(var2 >> 16); // L: 200 + var2 &= 65535; // L: 201 + if (var5 == null) { // L: 202 + return var1.toSharedSpotAnimationModel(true); + } else { + var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 203 + var4.animate(var5, var2); // L: 204 + return var4; // L: 205 + } + } else { + class122 var3 = class342.method6314(this.SequenceDefinition_cachedModelId); // L: 208 + if (var3 == null) { // L: 209 + return var1.toSharedSpotAnimationModel(true); + } else { + var4 = var1.toSharedSpotAnimationModel(!var3.method2768()); // L: 210 + var4.method5000(var3, var2); // L: 211 + return var4; // L: 212 + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Liq;ILgw;IB)Liq;", + garbageValue = "4" + ) + @Export("applyTransformations") + public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { + if (field2151 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 217 + return this.method3791(var1, var2, var3, var4); // L: 218 + } else { + Model var5 = var1.toSharedSequenceModel(false); // L: 220 + boolean var6 = false; // L: 221 + Frames var7 = null; // L: 222 + class122 var8; + if (this.isCachedModelIdSet()) { // L: 223 + var8 = this.method3801(); // L: 224 + if (var3.isCachedModelIdSet() && this.field2156 == null) { // L: 225 + var5.method5000(var8, var2); // L: 226 + return var5; // L: 227 + } + + var5.method4965(var8, var2, this.field2156, false); // L: 229 + } else { + var2 = this.frameIds[var2]; // L: 232 + var7 = class115.getFrames(var2 >> 16); // L: 233 + var2 &= 65535; // L: 234 + if (var7 == null) { // L: 235 + return var3.transformActorModel(var1, var4); + } + + if (!var3.isCachedModelIdSet() && (this.field2146 == null || var4 == -1)) { // L: 236 + var5.animate(var7, var2); // L: 237 + return var5; // L: 238 + } + + if (this.field2146 == null || var4 == -1) { // L: 240 + var5.animate(var7, var2); // L: 241 + return var5; // L: 242 + } + + var6 = var3.isCachedModelIdSet(); // L: 244 + if (!var6) { // L: 245 + var5.method4981(var7, var2, this.field2146, false); // L: 246 + } + } + + if (var3.isCachedModelIdSet()) { // L: 249 + var8 = var3.method3801(); // L: 250 + var5.method4965(var8, var4, this.field2156, true); // L: 251 + } else { + var4 = var3.frameIds[var4]; // L: 254 + Frames var9 = class115.getFrames(var4 >> 16); // L: 255 + var4 &= 65535; // L: 256 + if (var9 == null) { // L: 257 + return this.transformActorModel(var1, var2); + } + + var5.method4981(var9, var4, this.field2146, true); // L: 258 + } + + if (var6 && var7 != null) { // L: 260 + var5.method4981(var7, var2, this.field2146, false); // L: 261 + } + + var5.resetBounds(); // L: 263 + return var5; // L: 264 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Liq;ILgw;II)Liq;", + garbageValue = "136721627" + ) + Model method3791(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; // L: 268 + Frames var5 = class115.getFrames(var2 >> 16); // L: 269 + var2 &= 65535; // L: 270 + if (var5 == null) { // L: 271 return var3.transformActorModel(var1, var4); } else { - var4 = var3.frameIds[var4]; // L: 266 - Frames var6 = class143.getFrames(var4 >> 16); // L: 267 - var4 &= 65535; // L: 268 + var4 = var3.frameIds[var4]; // L: 272 + Frames var6 = class115.getFrames(var4 >> 16); // L: 273 + var4 &= 65535; // L: 274 Model var7; - if (var6 == null) { // L: 269 - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 270 - var7.animate(var5, var2); // L: 271 - return var7; // L: 272 + if (var6 == null) { // L: 275 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 276 + var7.animate(var5, var2); // L: 277 + return var7; // L: 278 } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 274 - var7.animate2(var5, var2, var6, var4, this.field2156); // L: 275 - return var7; // L: 276 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 280 + var7.animate2(var5, var2, var6, var4, this.field2146); // L: 281 + return var7; // L: 282 } } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lhx;II)Lhx;", - garbageValue = "-863329997" + descriptor = "(Liq;II)Liq;", + garbageValue = "242613872" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - if (!this.isCachedModelIdSet()) { // L: 280 - int var3 = this.frameIds[var2]; // L: 281 - Frames var4 = class143.getFrames(var3 >> 16); // L: 282 - var3 &= 65535; // L: 283 - if (var4 == null) { // L: 284 + if (!this.isCachedModelIdSet()) { // L: 286 + int var3 = this.frameIds[var2]; // L: 287 + Frames var4 = class115.getFrames(var3 >> 16); // L: 288 + var3 &= 65535; // L: 289 + if (var4 == null) { // L: 290 return var1.toSharedSequenceModel(true); } else { - Frames var5 = null; // L: 285 - int var6 = 0; // L: 286 - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 287 - var6 = this.chatFrameIds[var2]; // L: 288 - var5 = class143.getFrames(var6 >> 16); // L: 289 - var6 &= 65535; // L: 290 + Frames var5 = null; // L: 291 + int var6 = 0; // L: 292 + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 293 + var6 = this.chatFrameIds[var2]; // L: 294 + var5 = class115.getFrames(var6 >> 16); // L: 295 + var6 &= 65535; // L: 296 } Model var7; - if (var5 != null && var6 != 65535) { // L: 292 - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 297 - var7.animate(var4, var3); // L: 298 - var7.animate(var5, var6); // L: 299 - return var7; // L: 300 + if (var5 != null && var6 != 65535) { // L: 298 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 303 + var7.animate(var4, var3); // L: 304 + var7.animate(var5, var6); // L: 305 + return var7; // L: 306 } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 293 - var7.animate(var4, var3); // L: 294 - return var7; // L: 295 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 299 + var7.animate(var4, var3); // L: 300 + return var7; // L: 301 } } } else { - return this.transformActorModel(var1, var2); // L: 303 + return this.transformActorModel(var1, var2); // L: 309 } } - @ObfuscatedName("k") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-5" + descriptor = "(I)Z", + garbageValue = "-2016485024" ) @Export("isCachedModelIdSet") public boolean isCachedModelIdSet() { - return this.SequenceDefinition_cachedModelId >= 0; // L: 308 + return this.SequenceDefinition_cachedModelId >= 0; // L: 314 } - @ObfuscatedName("x") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1948000582" + garbageValue = "2003317016" ) - public int method3827() { - return this.field2157 - this.field2151; // L: 312 + public int method3844() { + return this.field2160 - this.field2152; // L: 318 } - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Ldu;", - garbageValue = "-1115190580" + descriptor = "(I)Ldo;", + garbageValue = "-1683695849" ) public class122 method3801() { - return this.isCachedModelIdSet() ? class117.method2724(this.SequenceDefinition_cachedModelId) : null; // L: 324 325 328 + return this.isCachedModelIdSet() ? class342.method6314(this.SequenceDefinition_cachedModelId) : null; // L: 330 331 334 } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "646079411" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4430 + if (GrandExchangeEvents.localPlayer.x >> 7 == Client.destinationX && GrandExchangeEvents.localPlayer.y >> 7 == Client.destinationY) { // L: 4432 + Client.destinationX = 0; // L: 4433 + } + + LoginPacket.method5192(); // L: 4436 + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4438 + ArchiveLoader.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4439 + } + + MusicPatch.addNpcsToScene(true); // L: 4442 + Varcs.method2463(); // L: 4443 + MusicPatch.addNpcsToScene(false); // L: 4444 + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4446 4447 4464 + if (var4.plane == class18.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4448 + if (Client.cycle >= var4.cycleStart) { // L: 4449 + if (var4.targetIndex > 0) { // L: 4450 + NPC var23 = Client.npcs[var4.targetIndex - 1]; // L: 4451 + if (var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) { // L: 4452 + var4.setDestination(var23.x, var23.y, WorldMapLabel.getTileHeight(var23.x, var23.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { // L: 4454 + var6 = -var4.targetIndex - 1; // L: 4456 + Player var25; + if (var6 == Client.localPlayerIndex) { // L: 4457 + var25 = GrandExchangeEvents.localPlayer; + } else { + var25 = Client.players[var6]; // L: 4458 + } + + if (var25 != null && var25.x >= 0 && var25.x < 13312 && var25.y >= 0 && var25.y < 13312) { // L: 4459 + var4.setDestination(var25.x, var25.y, WorldMapLabel.getTileHeight(var25.x, var25.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field556); // L: 4461 + ArchiveLoader.scene.drawEntity(class18.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4462 + } + } else { + var4.remove(); + } + } + + class128.method2854(); // L: 4467 + class17.setViewportShape(var0, var1, var2, var3, true); // L: 4468 + var0 = Client.viewportOffsetX; // L: 4469 + var1 = Client.viewportOffsetY; // L: 4470 + var2 = Client.viewportWidth; // L: 4471 + var3 = Client.viewportHeight; // L: 4472 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4473 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4474 + int var22 = Client.camAngleX; // L: 4475 + if (Client.field718 / 256 > var22) { // L: 4476 + var22 = Client.field718 / 256; + } + + if (Client.field546[4] && Client.field636[4] + 128 > var22) { // L: 4477 + var22 = Client.field636[4] + 128; + } + + int var5 = Client.camAngleY & 2047; // L: 4478 + var6 = class10.oculusOrbFocalPointX; // L: 4479 + int var7 = Decimator.field397; // L: 4480 + int var8 = ClientPacket.oculusOrbFocalPointY; // L: 4481 + int var9 = var22 * 3 + 600; // L: 4484 + int var10 = class13.method164(var9, var3); // L: 4488 + int var11 = 2048 - var22 & 2047; // L: 4489 + int var12 = 2048 - var5 & 2047; // L: 4490 + int var13 = 0; // L: 4491 + int var14 = 0; // L: 4492 + int var15 = var10; // L: 4493 + int var16; + int var17; + int var18; + if (var11 != 0) { // L: 4494 + var16 = Rasterizer3D.Rasterizer3D_sine[var11]; // L: 4495 + var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; // L: 4496 + var18 = var14 * var17 - var16 * var10 >> 16; // L: 4497 + var15 = var16 * var14 + var10 * var17 >> 16; // L: 4498 + var14 = var18; // L: 4499 + } + + if (var12 != 0) { // L: 4501 + var16 = Rasterizer3D.Rasterizer3D_sine[var12]; // L: 4502 + var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; // L: 4503 + var18 = var17 * var13 + var15 * var16 >> 16; // L: 4504 + var15 = var15 * var17 - var13 * var16 >> 16; // L: 4505 + var13 = var18; // L: 4506 + } + + if (Client.isCameraLocked) { // L: 4508 + class93.field1253 = var6 - var13; // L: 4509 + PcmPlayer.field294 = var7 - var14; // L: 4510 + WorldMapElement.field1837 = var8 - var15; // L: 4511 + ObjectComposition.field2065 = var22; // L: 4512 + class21.field116 = var5; // L: 4513 + } else { + WorldMapLabelSize.cameraX = var6 - var13; // L: 4516 + ItemContainer.cameraY = var7 - var14; // L: 4517 + class154.cameraZ = var8 - var15; // L: 4518 + class147.cameraPitch = var22; // L: 4519 + class21.cameraYaw = var5; // L: 4520 + } + + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class10.oculusOrbFocalPointX >> 7 != GrandExchangeEvents.localPlayer.x >> 7 || ClientPacket.oculusOrbFocalPointY >> 7 != GrandExchangeEvents.localPlayer.y >> 7)) { // L: 4522 4523 + var16 = GrandExchangeEvents.localPlayer.plane; // L: 4524 + var17 = (class10.oculusOrbFocalPointX >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 4525 + var18 = (ClientPacket.oculusOrbFocalPointY >> 7) + VarcInt.baseY; // L: 4526 + StructComposition.method3619(var17, var18, var16, true); // L: 4527 + } + + int var19; + int var20; + int var21; + if (!Client.isCameraLocked) { // L: 4532 + if (class131.clientPreferences.method2263()) { // L: 4535 + var12 = class18.Client_plane; // L: 4536 + } else { + label405: { + var13 = 3; // L: 4539 + if (class147.cameraPitch < 310) { // L: 4540 + label402: { + if (Client.oculusOrbState == 1) { // L: 4543 + var14 = class10.oculusOrbFocalPointX >> 7; // L: 4544 + var15 = ClientPacket.oculusOrbFocalPointY >> 7; // L: 4545 + } else { + var14 = GrandExchangeEvents.localPlayer.x >> 7; // L: 4548 + var15 = GrandExchangeEvents.localPlayer.y >> 7; // L: 4549 + } + + var16 = WorldMapLabelSize.cameraX >> 7; // L: 4551 + var17 = class154.cameraZ >> 7; // L: 4552 + if (var16 >= 0 && var17 >= 0 && var16 < 104 && var17 < 104) { // L: 4553 + if (var14 >= 0 && var15 >= 0 && var14 < 104 && var15 < 104) { // L: 4557 + if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4561 + var13 = class18.Client_plane; + } + + if (var14 > var16) { // L: 4563 + var18 = var14 - var16; + } else { + var18 = var16 - var14; // L: 4564 + } + + if (var15 > var17) { // L: 4566 + var19 = var15 - var17; + } else { + var19 = var17 - var15; // L: 4567 + } + + if (var18 > var19) { // L: 4568 + var20 = var19 * 65536 / var18; // L: 4569 + var21 = 32768; // L: 4570 + + while (true) { + if (var14 == var16) { // L: 4571 + break label402; + } + + if (var16 < var14) { // L: 4572 + ++var16; + } else if (var16 > var14) { // L: 4573 + --var16; + } + + if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4574 + var13 = class18.Client_plane; + } + + var21 += var20; // L: 4575 + if (var21 >= 65536) { // L: 4576 + var21 -= 65536; // L: 4577 + if (var17 < var15) { // L: 4578 + ++var17; + } else if (var17 > var15) { // L: 4579 + --var17; + } + + if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4580 + var13 = class18.Client_plane; + } + } + } + } else { + if (var19 > 0) { // L: 4584 + var20 = var18 * 65536 / var19; // L: 4585 + var21 = 32768; // L: 4586 + + while (var15 != var17) { // L: 4587 + if (var17 < var15) { // L: 4588 + ++var17; + } else if (var17 > var15) { // L: 4589 + --var17; + } + + if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4590 + var13 = class18.Client_plane; + } + + var21 += var20; // L: 4591 + if (var21 >= 65536) { // L: 4592 + var21 -= 65536; // L: 4593 + if (var16 < var14) { // L: 4594 + ++var16; + } else if (var16 > var14) { // L: 4595 + --var16; + } + + if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4596 + var13 = class18.Client_plane; + } + } + } + } + break label402; + } + } + + var12 = class18.Client_plane; // L: 4558 + break label405; // L: 4559 + } + + var12 = class18.Client_plane; // L: 4554 + break label405; // L: 4555 + } + } + + if (GrandExchangeEvents.localPlayer.x >= 0 && GrandExchangeEvents.localPlayer.y >= 0 && GrandExchangeEvents.localPlayer.x < 13312 && GrandExchangeEvents.localPlayer.y < 13312) { // L: 4601 + if ((Tiles.Tiles_renderFlags[class18.Client_plane][GrandExchangeEvents.localPlayer.x >> 7][GrandExchangeEvents.localPlayer.y >> 7] & 4) != 0) { // L: 4605 + var13 = class18.Client_plane; + } + + var12 = var13; // L: 4606 + } else { + var12 = class18.Client_plane; // L: 4602 + } + } + } + + var11 = var12; // L: 4608 + } else { + if (class131.clientPreferences.method2263()) { // L: 4613 + var12 = class18.Client_plane; // L: 4614 + } else { + var13 = WorldMapLabel.getTileHeight(WorldMapLabelSize.cameraX, class154.cameraZ, class18.Client_plane); // L: 4617 + if (var13 - ItemContainer.cameraY < 800 && (Tiles.Tiles_renderFlags[class18.Client_plane][WorldMapLabelSize.cameraX >> 7][class154.cameraZ >> 7] & 4) != 0) { // L: 4618 + var12 = class18.Client_plane; // L: 4619 + } else { + var12 = 3; // L: 4622 + } + } + + var11 = var12; // L: 4624 + } + + var12 = WorldMapLabelSize.cameraX; // L: 4626 + var13 = ItemContainer.cameraY; // L: 4627 + var14 = class154.cameraZ; // L: 4628 + var15 = class147.cameraPitch; // L: 4629 + var16 = class21.cameraYaw; // L: 4630 + + for (var17 = 0; var17 < 5; ++var17) { // L: 4631 + if (Client.field546[var17]) { // L: 4632 + var18 = (int)(Math.random() * (double)(Client.field756[var17] * 2 + 1) - (double)Client.field756[var17] + Math.sin((double)Client.field674[var17] / 100.0D * (double)Client.field600[var17]) * (double)Client.field636[var17]); // L: 4633 + if (var17 == 0) { // L: 4634 + WorldMapLabelSize.cameraX += var18; + } + + if (var17 == 1) { // L: 4635 + ItemContainer.cameraY += var18; + } + + if (var17 == 2) { // L: 4636 + class154.cameraZ += var18; + } + + if (var17 == 3) { // L: 4637 + class21.cameraYaw = var18 + class21.cameraYaw & 2047; + } + + if (var17 == 4) { // L: 4638 + class147.cameraPitch += var18; // L: 4639 + if (class147.cameraPitch < 128) { // L: 4640 + class147.cameraPitch = 128; + } + + if (class147.cameraPitch > 383) { // L: 4641 + class147.cameraPitch = 383; + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 4645 + var18 = MouseHandler.MouseHandler_y; // L: 4646 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4647 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 4648 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 4649 + } + + if (var17 >= var0 && var17 < var0 + var2 && var18 >= var1 && var18 < var3 + var1) { // L: 4651 + var19 = var17 - var0; // L: 4652 + var20 = var18 - var1; // L: 4653 + ViewportMouse.ViewportMouse_x = var19; // L: 4655 + ViewportMouse.ViewportMouse_y = var20; // L: 4656 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 4657 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4658 + ViewportMouse.ViewportMouse_false0 = false; // L: 4659 + } else { + class82.method2104(); // L: 4663 + } + + class116.playPcmPlayers(); // L: 4665 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4666 + class116.playPcmPlayers(); // L: 4667 + var19 = Rasterizer3D.Rasterizer3D_zoom; // L: 4668 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4669 + ArchiveLoader.scene.draw(WorldMapLabelSize.cameraX, ItemContainer.cameraY, class154.cameraZ, class147.cameraPitch, class21.cameraYaw, var11); // L: 4670 + Rasterizer3D.Rasterizer3D_zoom = var19; // L: 4671 + class116.playPcmPlayers(); // L: 4672 + ArchiveLoader.scene.clearTempGameObjects(); // L: 4673 + MouseRecorder.method2096(var0, var1, var2, var3); // L: 4674 + class12.method158(var0, var1); // L: 4675 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field556); // L: 4676 + class260.method5173(); // L: 4678 + WorldMapLabelSize.cameraX = var12; // L: 4680 + ItemContainer.cameraY = var13; // L: 4681 + class154.cameraZ = var14; // L: 4682 + class147.cameraPitch = var15; // L: 4683 + class21.cameraYaw = var16; // L: 4684 + if (Client.isLoading) { // L: 4685 + byte var24 = 0; // L: 4688 + var21 = var24 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4689 + if (var21 == 0) { // L: 4693 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4695 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4696 + MusicPatch.drawLoadingMessage("Loading - please wait.", false); // L: 4697 + } + + } // L: 4699 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 5db3b11503..0deb627c15 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,744 +4,656 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jq") @Implements("ServerPacket") public class ServerPacket { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3127; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3025; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3026; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3078; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3028; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3029; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3060; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3031; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3058; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) public static final ServerPacket field3033; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3034; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3129; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3036; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3037; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3038; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3039; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3040; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3082; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3042; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3043; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3044; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3080; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3046; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3052; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3104; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3049; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3050; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3122; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3102; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) public static final ServerPacket field3053; - @ObfuscatedName("at") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3054; - @ObfuscatedName("aw") + public static final ServerPacket field3096; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3055; - @ObfuscatedName("ar") + public static final ServerPacket field3026; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3041; - @ObfuscatedName("ae") + public static final ServerPacket field3038; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3057; - @ObfuscatedName("ab") + public static final ServerPacket field3028; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3110; - @ObfuscatedName("aa") + public static final ServerPacket field3025; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3089; - @ObfuscatedName("ad") + public static final ServerPacket field3030; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3093; - @ObfuscatedName("aj") + public static final ServerPacket field3031; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3061; - @ObfuscatedName("as") + public static final ServerPacket field3027; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3062; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3032; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3064; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3065; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3066; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3067; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3068; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3069; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3098; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3071; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) public static final ServerPacket field3072; - @ObfuscatedName("af") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3073; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3074; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3075; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3076; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3077; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) public static final ServerPacket field3116; - @ObfuscatedName("be") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3079; - @ObfuscatedName("bt") + public static final ServerPacket field3035; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" + ) + public static final ServerPacket field3036; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3037; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3128; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3114; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3111; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3041; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3042; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3097; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3044; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3086; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ljq;" ) public static final ServerPacket field3047; - @ObfuscatedName("ba") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3081; - @ObfuscatedName("bg") + public static final ServerPacket field3119; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3024; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3083; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3084; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3085; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3051; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3087; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3088; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3070; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3117; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3091; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3092; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) public static final ServerPacket field3048; - @ObfuscatedName("bx") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3094; + public static final ServerPacket field3049; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3050; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3034; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3052; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3029; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3023; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3024; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3056; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3057; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3058; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3045; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3060; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3054; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3062; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3063; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3064; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3101; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3066; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3067; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3068; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3105; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3070; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3071; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3120; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3073; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3079; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3043; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3076; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3077; @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" + ) + public static final ServerPacket field3078; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3069; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3080; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3081; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3115; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3083; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3084; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3085; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3061; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3087; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3046; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3089; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3090; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3091; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3092; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3093; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3094; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3051; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Ljq;" ) public static final ServerPacket field3095; @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3096; - @ObfuscatedName("bj") + public static final ServerPacket field3032; + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3035; - @ObfuscatedName("bm") + public static final ServerPacket field3040; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3114; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) public static final ServerPacket field3099; - @ObfuscatedName("bw") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3030; - @ObfuscatedName("bh") + public static final ServerPacket field3100; + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3101; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3124; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3103; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3126; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3105; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3106; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3107; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3108; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3027; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3045; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3111; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3112; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3113; + public static final ServerPacket field3074; @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" + ) + public static final ServerPacket field3102; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3088; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3103; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3075; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3106; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3107; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3108; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3109; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3110; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3055; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3112; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3113; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3039; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3059; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3104; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3117; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3118; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3082; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3098; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3121; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3122; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3123; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + public static final ServerPacket field3124; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Ljq;" ) public static final ServerPacket field3125; @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljq;" ) - public static final ServerPacket field3115; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3100; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3097; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3118; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3119; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3120; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3121; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3059; - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3123; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3086; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3063; - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3109; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Ljd;" - ) - public static final ServerPacket field3090; - @ObfuscatedName("dd") + public static final ServerPacket field3126; + @ObfuscatedName("ge") @ObfuscatedGetter( - intValue = -805983233 + longValue = -6208068858010154241L + ) + static long field3129; + @ObfuscatedName("dr") + @ObfuscatedGetter( + intValue = 766304815 ) @Export("id") public final int id; - @ObfuscatedName("de") + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = -1253089641 + intValue = -1617993979 ) @Export("length") public final int length; static { - field3127 = new ServerPacket(0, -2); // L: 5 - field3025 = new ServerPacket(1, -2); // L: 6 - field3026 = new ServerPacket(2, 4); // L: 7 - field3078 = new ServerPacket(3, -2); // L: 8 - field3028 = new ServerPacket(4, 2); // L: 9 - field3029 = new ServerPacket(5, 1); // L: 10 - field3060 = new ServerPacket(6, 1); // L: 11 - field3031 = new ServerPacket(7, -2); // L: 12 - field3058 = new ServerPacket(8, 6); - field3033 = new ServerPacket(9, 1); - field3034 = new ServerPacket(10, 3); - field3129 = new ServerPacket(11, 4); - field3036 = new ServerPacket(12, -2); - field3037 = new ServerPacket(13, 2); - field3038 = new ServerPacket(14, -2); - field3039 = new ServerPacket(15, 6); - field3040 = new ServerPacket(16, 2); - field3082 = new ServerPacket(17, -1); - field3042 = new ServerPacket(18, -2); - field3043 = new ServerPacket(19, -2); - field3044 = new ServerPacket(20, 8); - field3080 = new ServerPacket(21, -2); - field3046 = new ServerPacket(22, 4); - field3052 = new ServerPacket(23, 10); - field3104 = new ServerPacket(24, 2); - field3049 = new ServerPacket(25, 2); // L: 30 - field3050 = new ServerPacket(26, -1); // L: 31 - field3122 = new ServerPacket(27, 1); // L: 32 - field3102 = new ServerPacket(28, 2); - field3053 = new ServerPacket(29, 6); - field3054 = new ServerPacket(30, -2); - field3055 = new ServerPacket(31, -2); - field3041 = new ServerPacket(32, 8); - field3057 = new ServerPacket(33, 0); - field3110 = new ServerPacket(34, -1); // L: 39 - field3089 = new ServerPacket(35, -2); - field3093 = new ServerPacket(36, 5); // L: 41 - field3061 = new ServerPacket(37, -2); // L: 42 - field3062 = new ServerPacket(38, 10); // L: 43 - field3032 = new ServerPacket(39, -1); // L: 44 - field3064 = new ServerPacket(40, 14); // L: 45 - field3065 = new ServerPacket(41, 5); // L: 46 - field3066 = new ServerPacket(42, 1); // L: 47 - field3067 = new ServerPacket(43, 3); // L: 48 - field3068 = new ServerPacket(44, -1); // L: 49 - field3069 = new ServerPacket(45, -2); // L: 50 - field3098 = new ServerPacket(46, 0); // L: 51 - field3071 = new ServerPacket(47, 12); // L: 52 - field3072 = new ServerPacket(48, 8); // L: 53 - field3073 = new ServerPacket(49, 0); // L: 54 - field3074 = new ServerPacket(50, 0); // L: 55 - field3075 = new ServerPacket(51, 2); // L: 56 - field3076 = new ServerPacket(52, -2); // L: 57 - field3077 = new ServerPacket(53, 20); // L: 58 - field3116 = new ServerPacket(54, 4); // L: 59 - field3079 = new ServerPacket(55, 6); // L: 60 - field3047 = new ServerPacket(56, -2); // L: 61 - field3081 = new ServerPacket(57, 0); // L: 62 - field3024 = new ServerPacket(58, 1); // L: 63 - field3083 = new ServerPacket(59, 2); // L: 64 - field3084 = new ServerPacket(60, -1); // L: 65 - field3085 = new ServerPacket(61, 28); // L: 66 - field3051 = new ServerPacket(62, 0); // L: 67 - field3087 = new ServerPacket(63, -2); // L: 68 - field3088 = new ServerPacket(64, -2); // L: 69 - field3070 = new ServerPacket(65, 5); // L: 70 - field3117 = new ServerPacket(66, -1); // L: 71 - field3091 = new ServerPacket(67, 15); // L: 72 - field3092 = new ServerPacket(68, 0); // L: 73 - field3048 = new ServerPacket(69, -2); // L: 74 - field3094 = new ServerPacket(70, 6); // L: 75 - field3095 = new ServerPacket(71, 0); // L: 76 - field3096 = new ServerPacket(72, 0); // L: 77 - field3035 = new ServerPacket(73, 4); // L: 78 - field3114 = new ServerPacket(74, 4); // L: 79 - field3099 = new ServerPacket(75, 4); // L: 80 - field3030 = new ServerPacket(76, -2); // L: 81 - field3101 = new ServerPacket(77, 5); // L: 82 - field3124 = new ServerPacket(78, -2); // L: 83 - field3103 = new ServerPacket(79, 8); // L: 84 - field3126 = new ServerPacket(80, 6); // L: 85 - field3105 = new ServerPacket(81, 7); // L: 86 - field3106 = new ServerPacket(82, 2); // L: 87 - field3107 = new ServerPacket(83, 5); // L: 88 - field3108 = new ServerPacket(84, -2); // L: 89 - field3027 = new ServerPacket(85, 7); // L: 90 - field3045 = new ServerPacket(86, -2); // L: 91 - field3111 = new ServerPacket(87, 6); // L: 92 - field3112 = new ServerPacket(88, 2); // L: 93 - field3113 = new ServerPacket(89, -1); // L: 94 - field3125 = new ServerPacket(90, -2); // L: 95 - field3115 = new ServerPacket(91, -1); - field3100 = new ServerPacket(92, 4); - field3097 = new ServerPacket(93, 6); - field3118 = new ServerPacket(94, 6); // L: 99 - field3119 = new ServerPacket(95, 6); - field3120 = new ServerPacket(96, -2); - field3121 = new ServerPacket(97, 6); - field3059 = new ServerPacket(98, 5); // L: 103 - field3123 = new ServerPacket(99, 6); - field3086 = new ServerPacket(100, 8); - field3063 = new ServerPacket(101, 8); - field3109 = new ServerPacket(102, 8); // L: 107 - field3090 = new ServerPacket(103, 17); + field3033 = new ServerPacket(0, -2); // L: 5 + field3053 = new ServerPacket(1, -2); // L: 6 + field3096 = new ServerPacket(2, 4); // L: 7 + field3026 = new ServerPacket(3, -2); // L: 8 + field3038 = new ServerPacket(4, 2); // L: 9 + field3028 = new ServerPacket(5, 1); // L: 10 + field3025 = new ServerPacket(6, 1); // L: 11 + field3030 = new ServerPacket(7, -2); // L: 12 + field3031 = new ServerPacket(8, 6); // L: 13 + field3027 = new ServerPacket(9, 1); // L: 14 + field3072 = new ServerPacket(10, 3); // L: 15 + field3116 = new ServerPacket(11, 4); // L: 16 + field3035 = new ServerPacket(12, -2); // L: 17 + field3036 = new ServerPacket(13, 2); // L: 18 + field3037 = new ServerPacket(14, -2); // L: 19 + field3128 = new ServerPacket(15, 6); // L: 20 + field3114 = new ServerPacket(16, 2); // L: 21 + field3111 = new ServerPacket(17, -1); // L: 22 + field3041 = new ServerPacket(18, -2); // L: 23 + field3042 = new ServerPacket(19, -2); // L: 24 + field3097 = new ServerPacket(20, 8); // L: 25 + field3044 = new ServerPacket(21, -2); // L: 26 + field3086 = new ServerPacket(22, 4); // L: 27 + field3047 = new ServerPacket(23, 10); // L: 28 + field3119 = new ServerPacket(24, 2); // L: 29 + field3048 = new ServerPacket(25, 2); // L: 30 + field3049 = new ServerPacket(26, -1); // L: 31 + field3050 = new ServerPacket(27, 1); // L: 32 + field3034 = new ServerPacket(28, 2); // L: 33 + field3052 = new ServerPacket(29, 6); // L: 34 + field3029 = new ServerPacket(30, -2); // L: 35 + field3023 = new ServerPacket(31, -2); // L: 36 + field3024 = new ServerPacket(32, 8); // L: 37 + field3056 = new ServerPacket(33, 0); // L: 38 + field3057 = new ServerPacket(34, -1); // L: 39 + field3058 = new ServerPacket(35, -2); // L: 40 + field3045 = new ServerPacket(36, 5); // L: 41 + field3060 = new ServerPacket(37, -2); // L: 42 + field3054 = new ServerPacket(38, 10); // L: 43 + field3062 = new ServerPacket(39, -1); // L: 44 + field3063 = new ServerPacket(40, 14); // L: 45 + field3064 = new ServerPacket(41, 5); // L: 46 + field3101 = new ServerPacket(42, 1); // L: 47 + field3066 = new ServerPacket(43, 3); // L: 48 + field3067 = new ServerPacket(44, -1); // L: 49 + field3068 = new ServerPacket(45, -2); // L: 50 + field3105 = new ServerPacket(46, 0); // L: 51 + field3070 = new ServerPacket(47, 12); // L: 52 + field3071 = new ServerPacket(48, 8); // L: 53 + field3120 = new ServerPacket(49, 0); // L: 54 + field3073 = new ServerPacket(50, 0); // L: 55 + field3079 = new ServerPacket(51, 2); // L: 56 + field3043 = new ServerPacket(52, -2); // L: 57 + field3076 = new ServerPacket(53, 20); // L: 58 + field3077 = new ServerPacket(54, 4); // L: 59 + field3078 = new ServerPacket(55, 6); // L: 60 + field3069 = new ServerPacket(56, -2); // L: 61 + field3080 = new ServerPacket(57, 0); // L: 62 + field3081 = new ServerPacket(58, 1); // L: 63 + field3115 = new ServerPacket(59, 2); // L: 64 + field3083 = new ServerPacket(60, -1); // L: 65 + field3084 = new ServerPacket(61, 28); // L: 66 + field3085 = new ServerPacket(62, 0); // L: 67 + field3061 = new ServerPacket(63, -2); // L: 68 + field3087 = new ServerPacket(64, -2); // L: 69 + field3046 = new ServerPacket(65, 5); // L: 70 + field3089 = new ServerPacket(66, -1); // L: 71 + field3090 = new ServerPacket(67, 15); // L: 72 + field3091 = new ServerPacket(68, 0); // L: 73 + field3092 = new ServerPacket(69, -2); // L: 74 + field3093 = new ServerPacket(70, 6); // L: 75 + field3094 = new ServerPacket(71, 0); // L: 76 + field3051 = new ServerPacket(72, 0); // L: 77 + field3095 = new ServerPacket(73, 4); // L: 78 + field3032 = new ServerPacket(74, 4); // L: 79 + field3040 = new ServerPacket(75, 4); // L: 80 + field3099 = new ServerPacket(76, -2); // L: 81 + field3100 = new ServerPacket(77, 5); // L: 82 + field3074 = new ServerPacket(78, -2); // L: 83 + field3102 = new ServerPacket(79, 8); // L: 84 + field3088 = new ServerPacket(80, 6); // L: 85 + field3103 = new ServerPacket(81, 7); // L: 86 + field3075 = new ServerPacket(82, 2); // L: 87 + field3106 = new ServerPacket(83, 5); // L: 88 + field3107 = new ServerPacket(84, -2); // L: 89 + field3108 = new ServerPacket(85, 7); // L: 90 + field3109 = new ServerPacket(86, -2); // L: 91 + field3110 = new ServerPacket(87, 6); // L: 92 + field3055 = new ServerPacket(88, 2); // L: 93 + field3112 = new ServerPacket(89, -1); // L: 94 + field3113 = new ServerPacket(90, -2); // L: 95 + field3039 = new ServerPacket(91, -1); // L: 96 + field3059 = new ServerPacket(92, 4); // L: 97 + field3104 = new ServerPacket(93, 6); // L: 98 + field3117 = new ServerPacket(94, 6); // L: 99 + field3118 = new ServerPacket(95, 6); // L: 100 + field3082 = new ServerPacket(96, -2); // L: 101 + field3098 = new ServerPacket(97, 6); // L: 102 + field3121 = new ServerPacket(98, 5); // L: 103 + field3122 = new ServerPacket(99, 6); // L: 104 + field3123 = new ServerPacket(100, 8); // L: 105 + field3124 = new ServerPacket(101, 8); // L: 106 + field3125 = new ServerPacket(102, 8); // L: 107 + field3126 = new ServerPacket(103, 17); // L: 108 } ServerPacket(int var1, int var2) { this.id = var1; // L: 117 this.length = var2; // L: 118 } // L: 119 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-488633583" - ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { // L: 13 - int var4 = (var3 + var2) / 2; // L: 14 - int var5 = var2; // L: 15 - String var6 = var0[var4]; // L: 16 - var0[var4] = var0[var3]; // L: 17 - var0[var3] = var6; // L: 18 - short var7 = var1[var4]; // L: 19 - var1[var4] = var1[var3]; // L: 20 - var1[var3] = var7; // L: 21 - - for (int var8 = var2; var8 < var3; ++var8) { // L: 22 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 23 - String var9 = var0[var8]; // L: 24 - var0[var8] = var0[var5]; // L: 25 - var0[var5] = var9; // L: 26 - short var10 = var1[var8]; // L: 27 - var1[var8] = var1[var5]; // L: 28 - var1[var5++] = var10; // L: 29 - } - } - - var0[var3] = var0[var5]; // L: 33 - var0[var5] = var6; // L: 34 - var1[var3] = var1[var5]; // L: 35 - var1[var5] = var7; // L: 36 - sortItemsByName(var0, var1, var2, var5 - 1); // L: 37 - sortItemsByName(var0, var1, var5 + 1, var3); // L: 38 - } - - } // L: 40 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "99" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4178) { // L: 96 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 97 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4165) { // L: 100 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 101 - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4172) { // L: 104 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 105 - } else if (var0.length == 30000 && ByteArrayPool.field4169 < ByteArrayPool.field4177) { // L: 108 - ByteArrayPool.field4166[++ByteArrayPool.field4169 - 1] = var0; // L: 109 - } else { - if (ScriptEvent.ByteArrayPool_arrays != null) { // L: 112 - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 113 - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && GameObject.ByteArrayPool_altSizeArrayCounts[var1] < ScriptEvent.ByteArrayPool_arrays[var1].length) { // L: 114 - ScriptEvent.ByteArrayPool_arrays[var1][GameObject.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 115 - return; // L: 116 - } - } - } - - } - } // L: 98 102 106 110 120 - - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "(IIIB)Lcy;", - garbageValue = "-80" - ) - static final InterfaceParent method5222(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 11500 - var3.group = var1; // L: 11501 - var3.type = var2; // L: 11502 - Client.interfaceParents.put(var3, (long)var0); // L: 11503 - class127.Widget_resetModelFrames(var1); // L: 11504 - Widget var4 = HorizontalAlignment.getWidget(var0); // L: 11505 - class290.invalidateWidget(var4); // L: 11506 - if (Client.meslayerContinueWidget != null) { // L: 11507 - class290.invalidateWidget(Client.meslayerContinueWidget); // L: 11508 - Client.meslayerContinueWidget = null; // L: 11509 - } - - GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11511 - class358.runWidgetOnLoadListener(var1); // L: 11512 - if (Client.rootInterface != -1) { // L: 11513 - MouseHandler.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 11514 - } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 31b7a9a7b4..56fedd2d09 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,38 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("ha") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 78791747 + intValue = 230523547 ) @Export("id") int id; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2115979069 + intValue = 90334317 ) @Export("count") int count; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("labels") int[][] labels; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lhk;" ) - class202 field2363; + class231 field2590; public Skeleton(int var1, byte[] var2) { this.id = var1; // L: 19 @@ -62,7 +56,7 @@ public class Skeleton extends Node { if (var3.offset < var3.array.length) { // L: 29 var4 = var3.readUnsignedShort(); // L: 30 if (var4 > 0) { // L: 31 - this.field2363 = new class202(var3, var4); // L: 32 + this.field2590 = new class231(var3, var4); // L: 32 } } @@ -71,48 +65,158 @@ public class Skeleton extends Node { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-23" + garbageValue = "21" ) - public int method4119() { + public int method4720() { return this.count; // L: 38 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "-954036382" + descriptor = "(I)Lhk;", + garbageValue = "1609725684" ) - public class202 method4120() { - return this.field2363; // L: 42 + public class231 method4721() { + return this.field2590; // L: 42 } - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "459175254" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-1" ) - static int method4118(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; // L: 158 - String[] var3 = Login.field881; // L: 160 + static final void method4728(String var0) { + PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 115 + var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 116 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 117 + Client.packetWriter.addNode(var1); // L: 118 + } // L: 119 - int var4; - String var5; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 161 - var5 = var3[var4]; // L: 162 - if (var0.tryLoadFileByNames(var5, "")) { // L: 164 - ++var2; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "608778502" + ) + static int method4729(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4592 + ++Interpreter.Interpreter_intStackSize; // L: 4593 + return 1; // L: 4594 + } else if (var0 == 7101) { // L: 4596 + class122.Interpreter_stringStackSize += 2; // L: 4597 + return 1; // L: 4598 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4600 + if (var0 == 7106) { // L: 4604 + ++Interpreter.Interpreter_intStackSize; // L: 4605 + return 1; // L: 4606 + } else if (var0 == 7107) { // L: 4608 + ++Interpreter.Interpreter_intStackSize; // L: 4609 + return 1; // L: 4610 + } else if (var0 == 7108) { // L: 4612 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.method303() ? 1 : 0; // L: 4613 + return 1; // L: 4614 + } else if (var0 == 7110) { // L: 4616 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4617 + return 1; // L: 4618 + } else if (var0 == 7120) { // L: 4620 + --Interpreter.Interpreter_intStackSize; // L: 4621 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4622 + return 1; // L: 4623 + } else if (var0 == 7121) { // L: 4625 + Interpreter.Interpreter_intStackSize -= 2; // L: 4626 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4627 + return 1; // L: 4628 + } else if (var0 == 7122) { // L: 4630 + Interpreter.Interpreter_intStackSize -= 2; // L: 4631 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4632 + return 1; // L: 4633 + } else { + return 2; // L: 4635 } + } else { + ++Interpreter.Interpreter_intStackSize; // L: 4601 + return 1; // L: 4602 } - - var3 = Login.field914; // L: 169 - - for (var4 = 0; var4 < var3.length; ++var4) { // L: 170 - var5 = var3[var4]; // L: 171 - if (var1.tryLoadFileByNames(var5, "")) { // L: 173 - ++var2; - } - } - - return var2; // L: 177 } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "(Lcb;I)V", + garbageValue = "664542157" + ) + static final void method4730(Actor var0) { + if (var0.field1175 != 0) { // L: 4065 + if (var0.targetIndex != -1) { // L: 4066 + Object var1 = null; // L: 4067 + if (var0.targetIndex < 32768) { // L: 4068 + var1 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 4069 + var1 = Client.players[var0.targetIndex - 32768]; + } + + if (var1 != null) { // L: 4070 + int var2 = var0.x - ((Actor)var1).x; // L: 4071 + int var3 = var0.y - ((Actor)var1).y; // L: 4072 + if (var2 != 0 || var3 != 0) { // L: 4073 + var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 4075 + var0.targetIndex = -1; // L: 4076 + var0.false0 = false; // L: 4077 + } + } + + if (var0.field1121 != -1 && (var0.pathLength == 0 || var0.field1179 > 0)) { // L: 4080 + var0.orientation = var0.field1121; // L: 4081 + var0.field1121 = -1; // L: 4082 + } + + int var4 = var0.orientation - var0.rotation & 2047; // L: 4084 + if (var4 == 0 && var0.false0) { // L: 4085 + var0.targetIndex = -1; // L: 4086 + var0.false0 = false; // L: 4087 + } + + if (var4 != 0) { // L: 4089 + ++var0.field1174; // L: 4090 + boolean var6; + if (var4 > 1024) { // L: 4091 + var0.rotation -= var0.field1144 ? var4 : var0.field1175 * -730517519 * -1419386607; // L: 4092 + var6 = true; // L: 4093 + if (var4 < var0.field1175 || var4 > 2048 - var0.field1175) { // L: 4094 + var0.rotation = var0.orientation; // L: 4095 + var6 = false; // L: 4096 + } + + if (!var0.field1144 && var0.idleSequence == var0.movementSequence && (var0.field1174 > 25 || var6)) { // L: 4098 + if (var0.turnLeftSequence != -1) { // L: 4099 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4100 + } + } + } else { + var0.rotation += var0.field1144 ? var4 : -1419386607 * var0.field1175 * -730517519; // L: 4104 + var6 = true; // L: 4105 + if (var4 < var0.field1175 || var4 > 2048 - var0.field1175) { // L: 4106 + var0.rotation = var0.orientation; // L: 4107 + var6 = false; // L: 4108 + } + + if (!var0.field1144 && var0.movementSequence == var0.idleSequence && (var0.field1174 > 25 || var6)) { // L: 4110 + if (var0.turnRightSequence != -1) { // L: 4111 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4112 + } + } + } + + var0.rotation &= 2047; // L: 4116 + var0.field1144 = false; // L: 4117 + } else { + var0.field1174 = 0; // L: 4119 + } + + } + } // L: 4120 } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 85e93a704d..caa0f985aa 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,16 +1,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kq") @Implements("Skills") public class Skills { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Llo;" + ) + @Export("clientLanguage") + static Language clientLanguage; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5 @@ -25,4 +32,38 @@ public class Skills { } } // L: 16 + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(Lky;I)Z", + garbageValue = "1366741641" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10905 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10906 + int var2 = BufferedSource.method6907(var0, var1); // L: 10907 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10908 + if (var0.cs1Comparisons[var1] == 2) { // L: 10909 + if (var2 >= var3) { // L: 10910 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10912 + if (var2 <= var3) { // L: 10913 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10915 + if (var2 == var3) { // L: 10916 + return false; + } + } else if (var2 != var3) { // L: 10918 + return false; + } + } + + return true; // L: 10920 + } + } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index b19d6eb921..033496ef7a 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iv") +@ObfuscatedName("if") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { @ObfuscatedName("v") @@ -21,7 +21,7 @@ public class SoftWrapper extends Wrapper { return this.ref.get(); // L: 15 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isSoft") boolean isSoft() { return true; // L: 19 diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index a28e734278..96b32a2487 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -3,36 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("an") +@ObfuscatedName("ac") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -1121856975 + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lln;" ) - @Export("selectedItemId") - static int selectedItemId; + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1560740679 + ) + static int field311; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lpo;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Lpo;" ) @@ -40,7 +50,7 @@ public class SoundCache { NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Llq;Llq;)V" + descriptor = "(Lln;Lln;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -51,28 +61,28 @@ public class SoundCache { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II[II)Laj;", - garbageValue = "1563241146" + descriptor = "(II[II)Lat;", + garbageValue = "-1555701815" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); - var4 |= var1 << 16; - long var5 = (long)var4; - RawSound var7 = (RawSound)this.rawSounds.get(var5); - if (var7 != null) { + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 18 + var4 |= var1 << 16; // L: 19 + long var5 = (long)var4; // L: 20 + RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 21 + if (var7 != null) { // L: 22 return var7; - } else if (var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { // L: 23 return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 if (var8 == null) { // L: 25 return null; } else { var7 = var8.toRawSound(); // L: 26 this.rawSounds.put(var7, var5); // L: 27 - if (var3 != null) { // L: 28 - var3[0] -= var7.samples.length; + if (var3 != null) { + var3[0] -= var7.samples.length; // L: 28 } return var7; // L: 29 @@ -80,10 +90,10 @@ public class SoundCache { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II[II)Laj;", - garbageValue = "-1588726679" + descriptor = "(II[II)Lat;", + garbageValue = "-1329492986" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -117,10 +127,10 @@ public class SoundCache { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I[IB)Laj;", - garbageValue = "1" + descriptor = "(I[II)Lat;", + garbageValue = "-1579364603" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -133,10 +143,10 @@ public class SoundCache { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I[II)Laj;", - garbageValue = "1380052230" + descriptor = "(I[IB)Lat;", + garbageValue = "74" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -149,838 +159,87 @@ public class SoundCache { } } - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IS)Lfc;", - garbageValue = "13903" + descriptor = "(II)I", + garbageValue = "662567928" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 - if (var1 != null) { // L: 19 - return var1; + static int method779(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 + if (var1 == null) { // L: 67 + return -1; } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 - var1 = new VarpDefinition(); // L: 21 - if (var2 != null) { // L: 22 - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 - return var1; // L: 24 + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 } } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1695145836" ) - static int method803(int var0, Script var1, boolean var2) { - Widget var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1312 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.x; // L: 1314 - return 1; // L: 1315 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.y; // L: 1318 - return 1; // L: 1319 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.width; // L: 1322 - return 1; // L: 1323 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.height; // L: 1326 - return 1; // L: 1327 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330 - return 1; // L: 1331 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334 - return 1; // L: 1335 + static void method768() { + if (TileItem.loadWorlds()) { // L: 1844 + Login.worldSelectOpen = true; // L: 1845 + Login.worldSelectPage = 0; // L: 1846 + Login.worldSelectPagesCount = 0; // L: 1847 + } + + } // L: 1849 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-2116988411" + ) + static final int method772(int var0, int var1) { + if (var0 == -1) { // L: 934 + return 12345678; } else { - return 2; // L: 1337 + var1 = (var0 & 127) * var1 / 128; // L: 935 + if (var1 < 2) { // L: 936 + var1 = 2; + } else if (var1 > 126) { // L: 937 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 938 } } - @ObfuscatedName("ir") + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "1183880843" + descriptor = "(II)V", + garbageValue = "2105059803" ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { // L: 8199 - var2 -= 2000; + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field746) { // L: 3608 + class273.midiPcmStream.clear(); // L: 3610 + class273.musicPlayerStatus = 1; // L: 3611 + class273.musicTrackArchive = null; // L: 3612 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class131.clientPreferences.method2321() != 0 && !Client.field746) { // L: 3615 + NPCComposition.method3530(2, class16.archive6, var0, 0, class131.clientPreferences.method2321(), false); // L: 3616 } - PacketBufferNode var8; - if (var2 == 1) { // L: 8200 - Client.mouseCrossX = var6; // L: 8250 - Client.mouseCrossY = var7; // L: 8251 - Client.mouseCrossColor = 2; // L: 8252 - Client.mouseCrossState = 0; // L: 8253 - Client.destinationX = var0; // L: 8254 - Client.destinationY = var1; // L: 8255 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 8257 - var8.packetBuffer.method7795(class19.selectedItemSlot); // L: 8258 - var8.packetBuffer.method7795(selectedItemId); // L: 8259 - var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8260 - var8.packetBuffer.writeShort(var0 + ApproximateRouteStrategy.baseX); // L: 8261 - var8.packetBuffer.writeShort(var3); // L: 8262 - var8.packetBuffer.method7746(PendingSpawn.selectedItemWidget); // L: 8263 - var8.packetBuffer.method7796(class250.baseY + var1); // L: 8264 - Client.packetWriter.addNode(var8); // L: 8265 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 8712 - Client.mouseCrossY = var7; // L: 8713 - Client.mouseCrossColor = 2; // L: 8714 - Client.mouseCrossState = 0; // L: 8715 - Client.destinationX = var0; // L: 8716 - Client.destinationY = var1; // L: 8717 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2894, Client.packetWriter.isaacCipher); // L: 8718 - var8.packetBuffer.method7796(Client.selectedSpellItemId); // L: 8719 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8720 - var8.packetBuffer.method7791(class250.baseY + var1); // L: 8721 - var8.packetBuffer.method7796(Client.selectedSpellChildIndex); // L: 8722 - var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8723 - var8.packetBuffer.method7746(class92.selectedSpellWidget); // L: 8724 - var8.packetBuffer.method7795(var3); // L: 8725 - Client.packetWriter.addNode(var8); // L: 8726 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 8339 - Client.mouseCrossY = var7; // L: 8340 - Client.mouseCrossColor = 2; // L: 8341 - Client.mouseCrossState = 0; // L: 8342 - Client.destinationX = var0; // L: 8343 - Client.destinationY = var1; // L: 8344 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2978, Client.packetWriter.isaacCipher); // L: 8346 - var8.packetBuffer.method7796(class250.baseY + var1); // L: 8347 - var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8348 - var8.packetBuffer.writeShort(var3); // L: 8349 - var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8350 - Client.packetWriter.addNode(var8); // L: 8351 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 8884 - Client.mouseCrossY = var7; // L: 8885 - Client.mouseCrossColor = 2; // L: 8886 - Client.mouseCrossState = 0; // L: 8887 - Client.destinationX = var0; // L: 8888 - Client.destinationY = var1; // L: 8889 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 8891 - var8.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8892 - var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8893 - var8.packetBuffer.method7791(var3); // L: 8894 - var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8895 - Client.packetWriter.addNode(var8); // L: 8896 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 8279 - Client.mouseCrossY = var7; // L: 8280 - Client.mouseCrossColor = 2; // L: 8281 - Client.mouseCrossState = 0; // L: 8282 - Client.destinationX = var0; // L: 8283 - Client.destinationY = var1; // L: 8284 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2927, Client.packetWriter.isaacCipher); // L: 8286 - var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8287 - var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8288 - var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8289 - var8.packetBuffer.method7796(var3); // L: 8290 - Client.packetWriter.addNode(var8); // L: 8291 - } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 8811 - Client.mouseCrossY = var7; // L: 8812 - Client.mouseCrossColor = 2; // L: 8813 - Client.mouseCrossState = 0; // L: 8814 - Client.destinationX = var0; // L: 8815 - Client.destinationY = var1; // L: 8816 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 8818 - var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8819 - var8.packetBuffer.method7791(var0 + ApproximateRouteStrategy.baseX); // L: 8820 - var8.packetBuffer.method7796(var3); // L: 8821 - var8.packetBuffer.method7796(class250.baseY + var1); // L: 8822 - Client.packetWriter.addNode(var8); // L: 8823 + Client.currentTrackGroupId = var0; // L: 3618 + } // L: 3619 + + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1445752455" + ) + static final boolean method781(int var0) { + if (var0 < 0) { // L: 8792 + return false; } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 8680 - if (var13 != null) { // L: 8681 - Client.mouseCrossX = var6; // L: 8682 - Client.mouseCrossY = var7; // L: 8683 - Client.mouseCrossColor = 2; // L: 8684 - Client.mouseCrossState = 0; // L: 8685 - Client.destinationX = var0; // L: 8686 - Client.destinationY = var1; // L: 8687 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2947, Client.packetWriter.isaacCipher); // L: 8689 - var9.packetBuffer.method7795(var3); // L: 8690 - var9.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8691 - var9.packetBuffer.method7791(selectedItemId); // L: 8692 - var9.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8693 - var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8694 - Client.packetWriter.addNode(var9); // L: 8695 - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 8662 - if (var13 != null) { // L: 8663 - Client.mouseCrossX = var6; // L: 8664 - Client.mouseCrossY = var7; // L: 8665 - Client.mouseCrossColor = 2; // L: 8666 - Client.mouseCrossState = 0; // L: 8667 - Client.destinationX = var0; // L: 8668 - Client.destinationY = var1; // L: 8669 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 8670 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8671 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8672 - var9.packetBuffer.method7795(var3); // L: 8673 - var9.packetBuffer.method7806(class92.selectedSpellWidget); // L: 8674 - var9.packetBuffer.method7796(Client.selectedSpellItemId); // L: 8675 - Client.packetWriter.addNode(var9); // L: 8676 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 8573 - if (var13 != null) { // L: 8574 - Client.mouseCrossX = var6; // L: 8575 - Client.mouseCrossY = var7; // L: 8576 - Client.mouseCrossColor = 2; // L: 8577 - Client.mouseCrossState = 0; // L: 8578 - Client.destinationX = var0; // L: 8579 - Client.destinationY = var1; // L: 8580 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2981, Client.packetWriter.isaacCipher); // L: 8582 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8583 - var9.packetBuffer.method7795(var3); // L: 8584 - Client.packetWriter.addNode(var9); // L: 8585 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 8216 - if (var13 != null) { // L: 8217 - Client.mouseCrossX = var6; // L: 8218 - Client.mouseCrossY = var7; // L: 8219 - Client.mouseCrossColor = 2; // L: 8220 - Client.mouseCrossState = 0; // L: 8221 - Client.destinationX = var0; // L: 8222 - Client.destinationY = var1; // L: 8223 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 8225 - var9.packetBuffer.writeShort(var3); // L: 8226 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8227 - Client.packetWriter.addNode(var9); // L: 8228 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 8524 - if (var13 != null) { // L: 8525 - Client.mouseCrossX = var6; // L: 8526 - Client.mouseCrossY = var7; // L: 8527 - Client.mouseCrossColor = 2; // L: 8528 - Client.mouseCrossState = 0; // L: 8529 - Client.destinationX = var0; // L: 8530 - Client.destinationY = var1; // L: 8531 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 8533 - var9.packetBuffer.method7795(var3); // L: 8534 - var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8535 - Client.packetWriter.addNode(var9); // L: 8536 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 8323 - if (var13 != null) { // L: 8324 - Client.mouseCrossX = var6; // L: 8325 - Client.mouseCrossY = var7; // L: 8326 - Client.mouseCrossColor = 2; // L: 8327 - Client.mouseCrossState = 0; // L: 8328 - Client.destinationX = var0; // L: 8329 - Client.destinationY = var1; // L: 8330 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 8332 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8333 - var9.packetBuffer.method7795(var3); // L: 8334 - Client.packetWriter.addNode(var9); // L: 8335 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 8760 - if (var13 != null) { // L: 8761 - Client.mouseCrossX = var6; // L: 8762 - Client.mouseCrossY = var7; // L: 8763 - Client.mouseCrossColor = 2; // L: 8764 - Client.mouseCrossState = 0; // L: 8765 - Client.destinationX = var0; // L: 8766 - Client.destinationY = var1; // L: 8767 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2916, Client.packetWriter.isaacCipher); // L: 8769 - var9.packetBuffer.method7795(var3); // L: 8770 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8771 - Client.packetWriter.addNode(var9); // L: 8772 - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 8462 - if (var15 != null) { // L: 8463 - Client.mouseCrossX = var6; // L: 8464 - Client.mouseCrossY = var7; // L: 8465 - Client.mouseCrossColor = 2; // L: 8466 - Client.mouseCrossState = 0; // L: 8467 - Client.destinationX = var0; // L: 8468 - Client.destinationY = var1; // L: 8469 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2933, Client.packetWriter.isaacCipher); // L: 8471 - var9.packetBuffer.method7791(selectedItemId); // L: 8472 - var9.packetBuffer.writeShort(var3); // L: 8473 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8474 - var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8475 - var9.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8476 - Client.packetWriter.addNode(var9); // L: 8477 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 8232 - if (var15 != null) { // L: 8233 - Client.mouseCrossX = var6; // L: 8234 - Client.mouseCrossY = var7; // L: 8235 - Client.mouseCrossColor = 2; // L: 8236 - Client.mouseCrossState = 0; // L: 8237 - Client.destinationX = var0; // L: 8238 - Client.destinationY = var1; // L: 8239 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2917, Client.packetWriter.isaacCipher); // L: 8240 - var9.packetBuffer.method7795(Client.selectedSpellChildIndex); // L: 8241 - var9.packetBuffer.method7796(var3); // L: 8242 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8243 - var9.packetBuffer.writeInt(class92.selectedSpellWidget); // L: 8244 - var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 8245 - Client.packetWriter.addNode(var9); // L: 8246 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 8959 - Client.mouseCrossY = var7; // L: 8960 - Client.mouseCrossColor = 2; // L: 8961 - Client.mouseCrossState = 0; // L: 8962 - Client.destinationX = var0; // L: 8963 - Client.destinationY = var1; // L: 8964 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2900, Client.packetWriter.isaacCipher); // L: 8966 - var8.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8967 - var8.packetBuffer.method7796(class19.selectedItemSlot); // L: 8968 - var8.packetBuffer.method7796(var3); // L: 8969 - var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8970 - var8.packetBuffer.method7791(class250.baseY + var1); // L: 8971 - var8.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8972 - var8.packetBuffer.writeShort(selectedItemId); // L: 8973 - Client.packetWriter.addNode(var8); // L: 8974 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 8776 - Client.mouseCrossY = var7; // L: 8777 - Client.mouseCrossColor = 2; // L: 8778 - Client.mouseCrossState = 0; // L: 8779 - Client.destinationX = var0; // L: 8780 - Client.destinationY = var1; // L: 8781 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2942, Client.packetWriter.isaacCipher); // L: 8782 - var8.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 8783 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8784 - var8.packetBuffer.method7795(var3); // L: 8785 - var8.packetBuffer.writeInt(class92.selectedSpellWidget); // L: 8786 - var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8787 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8788 - var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8789 - Client.packetWriter.addNode(var8); // L: 8790 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 8305 - Client.mouseCrossY = var7; // L: 8306 - Client.mouseCrossColor = 2; // L: 8307 - Client.mouseCrossState = 0; // L: 8308 - Client.destinationX = var0; // L: 8309 - Client.destinationY = var1; // L: 8310 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 8312 - var8.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8313 - var8.packetBuffer.method7791(var3); // L: 8314 - var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8315 - var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8316 - Client.packetWriter.addNode(var8); // L: 8317 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 8420 - Client.mouseCrossY = var7; // L: 8421 - Client.mouseCrossColor = 2; // L: 8422 - Client.mouseCrossState = 0; // L: 8423 - Client.destinationX = var0; // L: 8424 - Client.destinationY = var1; // L: 8425 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2915, Client.packetWriter.isaacCipher); // L: 8427 - var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8428 - var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8429 - var8.packetBuffer.writeShort(var3); // L: 8430 - var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8431 - Client.packetWriter.addNode(var8); // L: 8432 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 8201 - Client.mouseCrossY = var7; // L: 8202 - Client.mouseCrossColor = 2; // L: 8203 - Client.mouseCrossState = 0; // L: 8204 - Client.destinationX = var0; // L: 8205 - Client.destinationY = var1; // L: 8206 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2951, Client.packetWriter.isaacCipher); // L: 8208 - var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8209 - var8.packetBuffer.writeShort(var3); // L: 8210 - var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8211 - var8.packetBuffer.method7796(class250.baseY + var1); // L: 8212 - Client.packetWriter.addNode(var8); // L: 8213 - } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 8911 - Client.mouseCrossY = var7; // L: 8912 - Client.mouseCrossColor = 2; // L: 8913 - Client.mouseCrossState = 0; // L: 8914 - Client.destinationX = var0; // L: 8915 - Client.destinationY = var1; // L: 8916 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 8918 - var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8919 - var8.packetBuffer.writeShort(var0 + ApproximateRouteStrategy.baseX); // L: 8920 - var8.packetBuffer.method7791(class250.baseY + var1); // L: 8921 - var8.packetBuffer.method7791(var3); // L: 8922 - Client.packetWriter.addNode(var8); // L: 8923 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 8926 - Client.mouseCrossY = var7; // L: 8927 - Client.mouseCrossColor = 2; // L: 8928 - Client.mouseCrossState = 0; // L: 8929 - Client.destinationX = var0; // L: 8930 - Client.destinationY = var1; // L: 8931 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2909, Client.packetWriter.isaacCipher); // L: 8933 - var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8934 - var8.packetBuffer.method7791(var0 + ApproximateRouteStrategy.baseX); // L: 8935 - var8.packetBuffer.method7795(class250.baseY + var1); // L: 8936 - var8.packetBuffer.writeShort(var3); // L: 8937 - Client.packetWriter.addNode(var8); // L: 8938 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 8627 - FriendSystem.scene.setViewportWalking(); // L: 8628 - } else { - FriendSystem.scene.menuOpen(class160.Client_plane, var0, var1, true); // L: 8631 - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = HorizontalAlignment.getWidget(var1); // L: 8268 - boolean var11 = true; // L: 8269 - if (var16.contentType > 0) { // L: 8270 - var11 = Frames.method4319(var16); - } - - if (var11) { // L: 8271 - var10 = ItemContainer.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 8273 - var10.packetBuffer.writeInt(var1); // L: 8274 - Client.packetWriter.addNode(var10); // L: 8275 - } - } else { - if (var2 == 25) { - var16 = class143.getWidgetChild(var1, var0); // L: 8354 - if (var16 != null) { // L: 8355 - class120.Widget_runOnTargetLeave(); // L: 8356 - ApproximateRouteStrategy.selectSpell(var1, var0, WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var16)), var16.itemId); // L: 8357 - Client.isItemSelected = 0; // L: 8358 - Client.selectedSpellActionName = InvDefinition.Widget_getSpellActionName(var16); // L: 8359 - if (Client.selectedSpellActionName == null) { // L: 8360 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 8361 - Client.selectedSpellName = var16.dataText + ChatChannel.colorStartTag(16777215); - } else { - Client.selectedSpellName = ChatChannel.colorStartTag(65280) + var16.spellName + ChatChannel.colorStartTag(16777215); // L: 8362 - } - } - - return; // L: 8364 - } - - if (var2 == 26) { - class9.method85(); // L: 8320 - } else { - int var12; - Widget var14; - if (var2 == 28) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 8942 - var8.packetBuffer.writeInt(var1); // L: 8943 - Client.packetWriter.addNode(var8); // L: 8944 - var14 = HorizontalAlignment.getWidget(var1); // L: 8945 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8946 - var12 = var14.cs1Instructions[0][1]; // L: 8947 - Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; // L: 8948 - class78.changeGameOptions(var12); // L: 8949 - } - } else if (var2 == 29) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 8379 - var8.packetBuffer.writeInt(var1); // L: 8380 - Client.packetWriter.addNode(var8); // L: 8381 - var14 = HorizontalAlignment.getWidget(var1); // L: 8382 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8383 - var12 = var14.cs1Instructions[0][1]; // L: 8384 - if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { // L: 8385 - Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; // L: 8386 - class78.changeGameOptions(var12); // L: 8387 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 8804 - Messages.resumePauseWidget(var1, var0); // L: 8805 - Client.meslayerContinueWidget = class143.getWidgetChild(var1, var0); // L: 8806 - class290.invalidateWidget(Client.meslayerContinueWidget); // L: 8807 - } - } else if (var2 == 31) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 8560 - var8.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8561 - var8.packetBuffer.method7795(class19.selectedItemSlot); // L: 8562 - var8.packetBuffer.method7806(var1); // L: 8563 - var8.packetBuffer.writeShort(var3); // L: 8564 - var8.packetBuffer.writeShort(var0); // L: 8565 - var8.packetBuffer.method7795(selectedItemId); // L: 8566 - Client.packetWriter.addNode(var8); // L: 8567 - Client.field595 = 0; // L: 8568 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8569 - Client.field741 = var0; // L: 8570 - } else if (var2 == 32) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 8636 - var8.packetBuffer.method7796(var3); // L: 8637 - var8.packetBuffer.writeIntME(class92.selectedSpellWidget); // L: 8638 - var8.packetBuffer.method7796(var0); // L: 8639 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8640 - var8.packetBuffer.writeInt(var1); // L: 8641 - Client.packetWriter.addNode(var8); // L: 8642 - Client.field595 = 0; // L: 8643 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8644 - Client.field741 = var0; // L: 8645 - } else if (var2 == 33) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 8410 - var8.packetBuffer.writeShort(var3); // L: 8411 - var8.packetBuffer.writeShort(var0); // L: 8412 - var8.packetBuffer.method7806(var1); // L: 8413 - Client.packetWriter.addNode(var8); // L: 8414 - Client.field595 = 0; // L: 8415 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8416 - Client.field741 = var0; // L: 8417 - } else if (var2 == 34) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 8590 - var8.packetBuffer.method7806(var1); // L: 8591 - var8.packetBuffer.writeShort(var0); // L: 8592 - var8.packetBuffer.writeShort(var3); // L: 8593 - Client.packetWriter.addNode(var8); // L: 8594 - Client.field595 = 0; // L: 8595 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8596 - Client.field741 = var0; // L: 8597 - } else if (var2 == 35) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2918, Client.packetWriter.isaacCipher); // L: 8436 - var8.packetBuffer.writeShort(var3); // L: 8437 - var8.packetBuffer.writeShort(var0); // L: 8438 - var8.packetBuffer.method7806(var1); // L: 8439 - Client.packetWriter.addNode(var8); // L: 8440 - Client.field595 = 0; // L: 8441 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8442 - Client.field741 = var0; // L: 8443 - } else if (var2 == 36) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 8514 - var8.packetBuffer.method7795(var3); // L: 8515 - var8.packetBuffer.method7806(var1); // L: 8516 - var8.packetBuffer.method7791(var0); // L: 8517 - Client.packetWriter.addNode(var8); // L: 8518 - Client.field595 = 0; // L: 8519 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8520 - Client.field741 = var0; // L: 8521 - } else if (var2 == 37) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field3002, Client.packetWriter.isaacCipher); // L: 8295 - var8.packetBuffer.writeIntME(var1); // L: 8296 - var8.packetBuffer.writeShort(var3); // L: 8297 - var8.packetBuffer.method7791(var0); // L: 8298 - Client.packetWriter.addNode(var8); // L: 8299 - Client.field595 = 0; // L: 8300 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8301 - Client.field741 = var0; // L: 8302 - } else { - if (var2 == 38) { - class120.Widget_runOnTargetLeave(); // L: 8899 - var16 = HorizontalAlignment.getWidget(var1); // L: 8900 - Client.isItemSelected = 1; // L: 8901 - class19.selectedItemSlot = var0; // L: 8902 - PendingSpawn.selectedItemWidget = var1; // L: 8903 - selectedItemId = var3; // L: 8904 - class290.invalidateWidget(var16); // L: 8905 - Client.selectedItemName = ChatChannel.colorStartTag(16748608) + class67.ItemDefinition_get(var3).name + ChatChannel.colorStartTag(16777215); // L: 8906 - if (Client.selectedItemName == null) { // L: 8907 - Client.selectedItemName = "null"; - } - - return; // L: 8908 - } - - if (var2 == 39) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 8837 - var8.packetBuffer.writeInt(var1); // L: 8838 - var8.packetBuffer.method7796(var0); // L: 8839 - var8.packetBuffer.method7795(var3); // L: 8840 - Client.packetWriter.addNode(var8); // L: 8841 - Client.field595 = 0; // L: 8842 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8843 - Client.field741 = var0; // L: 8844 - } else if (var2 == 40) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 8368 - var8.packetBuffer.writeIntME(var1); // L: 8369 - var8.packetBuffer.writeShort(var0); // L: 8370 - var8.packetBuffer.method7796(var3); // L: 8371 - Client.packetWriter.addNode(var8); // L: 8372 - Client.field595 = 0; // L: 8373 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8374 - Client.field741 = var0; // L: 8375 - } else if (var2 == 41) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2922, Client.packetWriter.isaacCipher); // L: 8864 - var8.packetBuffer.method7796(var3); // L: 8865 - var8.packetBuffer.method7806(var1); // L: 8866 - var8.packetBuffer.method7791(var0); // L: 8867 - Client.packetWriter.addNode(var8); // L: 8868 - Client.field595 = 0; // L: 8869 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8870 - Client.field741 = var0; // L: 8871 - } else if (var2 == 42) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 8617 - var8.packetBuffer.method7791(var0); // L: 8618 - var8.packetBuffer.writeInt(var1); // L: 8619 - var8.packetBuffer.method7795(var3); // L: 8620 - Client.packetWriter.addNode(var8); // L: 8621 - Client.field595 = 0; // L: 8622 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8623 - Client.field741 = var0; // L: 8624 - } else if (var2 == 43) { - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 8794 - var8.packetBuffer.method7791(var0); // L: 8795 - var8.packetBuffer.method7791(var3); // L: 8796 - var8.packetBuffer.writeInt(var1); // L: 8797 - Client.packetWriter.addNode(var8); // L: 8798 - Client.field595 = 0; // L: 8799 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8800 - Client.field741 = var0; // L: 8801 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 8600 - if (var15 != null) { // L: 8601 - Client.mouseCrossX = var6; // L: 8602 - Client.mouseCrossY = var7; // L: 8603 - Client.mouseCrossColor = 2; // L: 8604 - Client.mouseCrossState = 0; // L: 8605 - Client.destinationX = var0; // L: 8606 - Client.destinationY = var1; // L: 8607 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 8609 - var9.packetBuffer.method7795(var3); // L: 8610 - var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8611 - Client.packetWriter.addNode(var9); // L: 8612 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 8744 - if (var15 != null) { // L: 8745 - Client.mouseCrossX = var6; // L: 8746 - Client.mouseCrossY = var7; // L: 8747 - Client.mouseCrossColor = 2; // L: 8748 - Client.mouseCrossState = 0; // L: 8749 - Client.destinationX = var0; // L: 8750 - Client.destinationY = var1; // L: 8751 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2957, Client.packetWriter.isaacCipher); // L: 8753 - var9.packetBuffer.method7795(var3); // L: 8754 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8755 - Client.packetWriter.addNode(var9); // L: 8756 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 8497 - if (var15 != null) { // L: 8498 - Client.mouseCrossX = var6; // L: 8499 - Client.mouseCrossY = var7; // L: 8500 - Client.mouseCrossColor = 2; // L: 8501 - Client.mouseCrossState = 0; // L: 8502 - Client.destinationX = var0; // L: 8503 - Client.destinationY = var1; // L: 8504 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2964, Client.packetWriter.isaacCipher); // L: 8506 - var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8507 - var9.packetBuffer.method7796(var3); // L: 8508 - Client.packetWriter.addNode(var9); // L: 8509 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 8540 - if (var15 != null) { // L: 8541 - Client.mouseCrossX = var6; // L: 8542 - Client.mouseCrossY = var7; // L: 8543 - Client.mouseCrossColor = 2; // L: 8544 - Client.mouseCrossState = 0; // L: 8545 - Client.destinationX = var0; // L: 8546 - Client.destinationY = var1; // L: 8547 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 8549 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8550 - var9.packetBuffer.writeShort(var3); // L: 8551 - Client.packetWriter.addNode(var9); // L: 8552 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 8847 - if (var15 != null) { // L: 8848 - Client.mouseCrossX = var6; // L: 8849 - Client.mouseCrossY = var7; // L: 8850 - Client.mouseCrossColor = 2; // L: 8851 - Client.mouseCrossState = 0; // L: 8852 - Client.destinationX = var0; // L: 8853 - Client.destinationY = var1; // L: 8854 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 8856 - var9.packetBuffer.writeShort(var3); // L: 8857 - var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8858 - Client.packetWriter.addNode(var9); // L: 8859 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 8481 - if (var15 != null) { // L: 8482 - Client.mouseCrossX = var6; // L: 8483 - Client.mouseCrossY = var7; // L: 8484 - Client.mouseCrossColor = 2; // L: 8485 - Client.mouseCrossState = 0; // L: 8486 - Client.destinationX = var0; // L: 8487 - Client.destinationY = var1; // L: 8488 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2903, Client.packetWriter.isaacCipher); // L: 8490 - var9.packetBuffer.method7791(var3); // L: 8491 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8492 - Client.packetWriter.addNode(var9); // L: 8493 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 8977 - if (var15 != null) { // L: 8978 - Client.mouseCrossX = var6; // L: 8979 - Client.mouseCrossY = var7; // L: 8980 - Client.mouseCrossColor = 2; // L: 8981 - Client.mouseCrossState = 0; // L: 8982 - Client.destinationX = var0; // L: 8983 - Client.destinationY = var1; // L: 8984 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 8986 - var9.packetBuffer.writeShort(var3); // L: 8987 - var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8988 - Client.packetWriter.addNode(var9); // L: 8989 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 8446 - if (var15 != null) { // L: 8447 - Client.mouseCrossX = var6; // L: 8448 - Client.mouseCrossY = var7; // L: 8449 - Client.mouseCrossColor = 2; // L: 8450 - Client.mouseCrossState = 0; // L: 8451 - Client.destinationX = var0; // L: 8452 - Client.destinationY = var1; // L: 8453 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2912, Client.packetWriter.isaacCipher); // L: 8455 - var9.packetBuffer.method7791(var3); // L: 8456 - var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8457 - Client.packetWriter.addNode(var9); // L: 8458 - } - } else { - label638: { - if (var2 != 57) { - if (var2 == 58) { - var16 = class143.getWidgetChild(var1, var0); // L: 8648 - if (var16 != null) { // L: 8649 - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2932, Client.packetWriter.isaacCipher); // L: 8651 - var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 8652 - var9.packetBuffer.writeIntME(class92.selectedSpellWidget); // L: 8653 - var9.packetBuffer.method7796(var16.itemId); // L: 8654 - var9.packetBuffer.method7791(Client.selectedSpellChildIndex); // L: 8655 - var9.packetBuffer.writeInt(var1); // L: 8656 - var9.packetBuffer.method7796(var0); // L: 8657 - Client.packetWriter.addNode(var9); // L: 8658 - } - break label638; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 8729 - Client.mouseCrossY = var7; // L: 8730 - Client.mouseCrossColor = 2; // L: 8731 - Client.mouseCrossState = 0; // L: 8732 - Client.destinationX = var0; // L: 8733 - Client.destinationY = var1; // L: 8734 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2976, Client.packetWriter.isaacCipher); // L: 8736 - var8.packetBuffer.method7795(var3); // L: 8737 - var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8738 - var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8739 - var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8740 - Client.packetWriter.addNode(var8); // L: 8741 - break label638; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 8874 - Client.mouseCrossY = var7; // L: 8875 - Client.mouseCrossColor = 2; // L: 8876 - Client.mouseCrossState = 0; // L: 8877 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2949, Client.packetWriter.isaacCipher); // L: 8879 - var8.packetBuffer.method7791(var3); // L: 8880 - Client.packetWriter.addNode(var8); // L: 8881 - break label638; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 8392 - Client.mouseCrossY = var7; // L: 8393 - Client.mouseCrossColor = 2; // L: 8394 - Client.mouseCrossState = 0; // L: 8395 - var13 = Client.npcs[var3]; // L: 8396 - if (var13 != null) { // L: 8397 - NPCComposition var17 = var13.definition; // L: 8398 - if (var17.transforms != null) { // L: 8399 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 8400 - var10 = ItemContainer.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 8402 - var10.packetBuffer.method7795(var17.id); // L: 8403 - Client.packetWriter.addNode(var10); // L: 8404 - } - } - break label638; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 8826 - Client.mouseCrossY = var7; // L: 8827 - Client.mouseCrossColor = 2; // L: 8828 - Client.mouseCrossState = 0; // L: 8829 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 8831 - var8.packetBuffer.method7796(var3); // L: 8832 - Client.packetWriter.addNode(var8); // L: 8833 - break label638; - } - - if (var2 == 1005) { - var16 = HorizontalAlignment.getWidget(var1); // L: 8699 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8700 - Login.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class67.ItemDefinition_get(var3).name); - } else { - var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 8703 - var9.packetBuffer.method7796(var3); // L: 8704 - Client.packetWriter.addNode(var9); // L: 8705 - } - - Client.field595 = 0; // L: 8707 - class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8708 - Client.field741 = var0; // L: 8709 - break label638; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1008 || var2 == 1010 || var2 == 1011 || var2 == 1012) { - ClanChannel.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8556 - } - break label638; - } - } - - var16 = class143.getWidgetChild(var1, var0); // L: 8953 - if (var16 != null) { // L: 8954 - Message.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8955 - } - } - } - } - } - } - } + int var1 = Client.menuOpcodes[var0]; // L: 8793 + if (var1 >= 2000) { // L: 8794 + var1 -= 2000; } - } - if (Client.isItemSelected != 0) { // L: 8992 - Client.isItemSelected = 0; // L: 8993 - class290.invalidateWidget(HorizontalAlignment.getWidget(PendingSpawn.selectedItemWidget)); // L: 8994 + return var1 == 1007; // L: 8795 } - - if (Client.isSpellSelected) { // L: 8996 - class120.Widget_runOnTargetLeave(); - } - - if (class12.field64 != null && Client.field595 == 0) { // L: 8997 - class290.invalidateWidget(class12.field64); - } - - } // L: 8998 + } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index fd69745c4b..7372686759 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("ad") +@ObfuscatedName("av") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lbl;" + descriptor = "[Lbj;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("start") int start; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Laj;" + descriptor = "()Lat;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -124,7 +124,7 @@ public class SoundEffect { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;II)Lad;" + descriptor = "(Lln;II)Lav;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 30d99d4c12..e2018744fd 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("ag") @Implements("SoundEnvelope") public class SoundEnvelope { @ObfuscatedName("v") @Export("segments") int segments; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("durations") int[] durations; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("phases") int[] phases; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("start") int start; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("end") int end; @ObfuscatedName("n") @Export("form") int form; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("ticks") int ticks; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("step") int step; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("amplitude") int amplitude; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("max") int max; @@ -52,7 +52,7 @@ public class SoundEnvelope { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("reset") final void reset() { this.ticks = 0; // L: 48 @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 1da3851394..2955110f61 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -2,13 +2,16 @@ 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("aq") +@ObfuscatedName("ah") @Implements("SoundSystem") public class SoundSystem implements Runnable { + @ObfuscatedName("ry") + static boolean field309; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lao;" + descriptor = "[Lay;" ) @Export("players") volatile PcmPlayer[] players; @@ -26,17 +29,117 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - class301.RunException_sendStackTrace((String)null, var4); // L: 18 + Widget.RunException_sendStackTrace((String)null, var4); // L: 18 } } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)[Lcb;", - garbageValue = "2120193226" + descriptor = "([BI)[B", + garbageValue = "-862016780" ) - static AttackOption[] method789() { - return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.field1279, AttackOption.field1273, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 11975 + static byte[] method764(byte[] var0) { + int var1 = var0.length; // L: 35 + byte[] var2 = new byte[var1]; // L: 36 + System.arraycopy(var0, 0, var2, 0, var1); // L: 37 + return var2; // L: 38 } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1307267367" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 138 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "1" + ) + static int method761(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1130 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1131 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1132 + return 1; // L: 1133 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1135 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1136 + return 1; // L: 1137 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1139 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.text; // L: 1140 + return 1; // L: 1141 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1143 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1144 + return 1; // L: 1145 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1147 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1148 + return 1; // L: 1149 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1151 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1152 + return 1; // L: 1153 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1155 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1156 + return 1; // L: 1157 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1159 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1160 + return 1; // L: 1161 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1163 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1164 + return 1; // L: 1165 + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1167 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1168 + return 1; // L: 1169 + } else if (var0 == 1610) { // L: 1171 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1172 + return 1; // L: 1173 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1175 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1176 + return 1; // L: 1177 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1179 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1180 + return 1; // L: 1181 + } else if (var0 == 1613) { // L: 1183 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1184 + return 1; // L: 1185 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1187 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1188 + return 1; // L: 1189 + } else if (var0 != 1615 && var0 != 1616) { // L: 1191 + return 2; // L: 1195 + } else { + ++Interpreter.Interpreter_intStackSize; // L: 1192 + return 1; // L: 1193 + } + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "1540502347" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class29.scrollBarSprites[0].drawAt(var0, var1); // L: 10887 + class29.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10888 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field566); // L: 10889 + int var5 = var3 * (var3 - 32) / var4; // L: 10890 + if (var5 < 8) { // L: 10891 + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10892 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field670); // L: 10893 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field740); // L: 10894 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field740); // L: 10895 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field740); // L: 10896 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field740); // L: 10897 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field694); // L: 10898 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field694); // L: 10899 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field694); // L: 10900 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field694); // L: 10901 + } // L: 10902 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index a88f0d17a6..784d6141f2 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,96 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fh") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("SpotAnimationDefinition_modelArchive") public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("SpotAnimationDefinition_cached") public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("SpotAnimationDefinition_cachedModels") public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("av") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lqh;" + descriptor = "Lhh;" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("l") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 427132523 + intValue = 2118158711 ) @Export("id") int id; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1014357077 + intValue = -751364127 ) @Export("archive") int archive; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2005845921 + intValue = -1190458759 ) @Export("sequence") public int sequence; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -665454789 + intValue = -1835946173 ) @Export("widthScale") int widthScale; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1952199567 + intValue = -1714205519 ) @Export("heightScale") int heightScale; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1484241863 + intValue = 870679975 ) @Export("orientation") int orientation; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1962604591 + intValue = -1029966959 ) @Export("ambient") int ambient; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1246890025 + intValue = -65447281 ) @Export("contrast") int contrast; @@ -112,15 +112,15 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; // L: 27 } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1193028896" + descriptor = "(Lpi;I)V", + garbageValue = "147710415" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 44 if (var2 == 0) { // L: 45 return; // L: 48 } @@ -129,10 +129,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "1251276315" + descriptor = "(Lpi;II)V", + garbageValue = "-1644410354" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -176,10 +176,10 @@ public class SpotAnimationDefinition extends DualNode { } // L: 77 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lhx;", - garbageValue = "-1962916593" + descriptor = "(II)Liq;", + garbageValue = "420896469" ) @Export("getModel") public final Model getModel(int var1) { @@ -204,12 +204,12 @@ public class SpotAnimationDefinition extends DualNode { } var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94 - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 95 } Model var5; if (this.sequence != -1 && var1 != -1) { // L: 98 - var5 = ItemContainer.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = class163.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); // L: 99 } @@ -238,21 +238,37 @@ public class SpotAnimationDefinition extends DualNode { return var5; // L: 113 } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-576891443" + descriptor = "(I)[Lcs;", + garbageValue = "-1958171328" ) - public static int method3515() { - return ViewportMouse.ViewportMouse_entityCount; // L: 44 + static class83[] method3549() { + return new class83[]{class83.field1066, class83.field1061, class83.field1065, class83.field1064, class83.field1067, class83.field1062}; // L: 17 } - @ObfuscatedName("x") + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1092897476" + descriptor = "(I)V", + garbageValue = "356895140" ) - static final int method3517() { - return ViewportMouse.ViewportMouse_x; // L: 95 - } + static final void method3545() { + class13.method163(class93.field1253, PcmPlayer.field294, WorldMapElement.field1837); // L: 3709 + WorldMapSectionType.method4308(ObjectComposition.field2065, class21.field116); // L: 3710 + if (WorldMapLabelSize.cameraX == class93.field1253 && ItemContainer.cameraY == PcmPlayer.field294 && class154.cameraZ == WorldMapElement.field1837 && ObjectComposition.field2065 == class147.cameraPitch && class21.field116 == class21.cameraYaw) { // L: 3711 + Client.field754 = false; // L: 3712 + Client.isCameraLocked = false; // L: 3713 + class154.field1691 = 0; // L: 3714 + class67.field881 = 0; // L: 3715 + DevicePcmPlayerProvider.field154 = 0; // L: 3716 + NetFileRequest.field3960 = 0; // L: 3717 + class386.field4337 = 0; // L: 3718 + ArchiveDisk.field4309 = 0; // L: 3719 + Script.field955 = 0; // L: 3720 + class286.field3274 = 0; // L: 3721 + class54.field447 = 0; // L: 3722 + BZip2State.field4662 = 0; // L: 3723 + } + + } // L: 3726 } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index c28fe0fcca..4d7d7f6f45 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,59 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("ki") @Implements("SpriteMask") public class SpriteMask extends DualNode { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 367264807 + intValue = 484977617 ) @Export("width") public final int width; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1985758175 + intValue = 341413753 ) @Export("height") public final int height; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 950 - this.height = var2; // L: 951 - this.xWidths = var3; // L: 952 - this.xStarts = var4; // L: 953 - } // L: 954 + this.width = var1; // L: 943 + this.height = var2; // L: 944 + this.xWidths = var3; // L: 945 + this.xStarts = var4; // L: 946 + } // L: 947 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1554135078" + descriptor = "(IIB)Z", + garbageValue = "24" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 957 - int var3 = this.xStarts[var2]; // L: 958 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 959 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 950 + int var3 = this.xStarts[var2]; // L: 951 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 952 return true; } } - return false; // L: 961 + return false; // L: 954 } - @ObfuscatedName("jr") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-16" + descriptor = "(Lbb;Lbb;IZB)I", + garbageValue = "7" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 10571 - } // L: 10572 + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 211 + int var4 = var0.population; // L: 212 + int var5 = var1.population; // L: 213 + if (!var3) { // L: 214 + if (var4 == -1) { // L: 215 + var4 = 2001; + } + + if (var5 == -1) { // L: 216 + var5 = 2001; + } + } + + return var4 - var5; // L: 218 + } else if (var2 == 2) { // L: 220 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 221 + if (var0.activity.equals("-")) { // L: 222 + if (var1.activity.equals("-")) { // L: 223 + return 0; + } else { + return var3 ? -1 : 1; // L: 224 + } + } else if (var1.activity.equals("-")) { // L: 226 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 227 + } + } else if (var2 == 4) { // L: 229 + return var0.method1639() ? (var1.method1639() ? 0 : 1) : (var1.method1639() ? -1 : 0); + } else if (var2 == 5) { // L: 230 + return var0.method1637() ? (var1.method1637() ? 0 : 1) : (var1.method1637() ? -1 : 0); + } else if (var2 == 6) { // L: 231 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 232 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; // L: 233 + } + } } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index a28c899d2b..f88b41ef0f 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ql") +@ObfuscatedName("qi") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { @ObfuscatedName("v") @Export("pixels") public int[] pixels; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("subWidth") public int subWidth; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("subHeight") public int subHeight; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("xOffset") public int xOffset; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("yOffset") int yOffset; @ObfuscatedName("n") @Export("width") public int width; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("height") public int height; @@ -45,7 +45,7 @@ public final class SpritePixels extends Rasterizer2D { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lql;" + descriptor = "()Lqi;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,11 +64,11 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lql;" + descriptor = "()Lqi;" ) - public SpritePixels method8177() { + public SpritePixels method8147() { SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 48 var1.width = this.width; // L: 49 var1.height = this.height; // L: 50 @@ -83,9 +83,9 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 55 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lql;" + descriptor = "()Lqi;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -100,13 +100,13 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 65 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 69 } // L: 70 - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 73 @@ -168,7 +168,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 110 - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 113 @@ -184,7 +184,7 @@ public final class SpritePixels extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; // L: 119 } // L: 120 - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 123 @@ -200,7 +200,7 @@ public final class SpritePixels extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; // L: 129 } // L: 130 - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 133 @@ -228,22 +228,22 @@ public final class SpritePixels extends Rasterizer2D { this.pixels = var2; // L: 147 } // L: 148 - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 151 int var3 = var2 * this.subWidth; // L: 152 for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 153 - if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; // L: 154 + if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { // L: 154 + this.pixels[var4 + var3] = var1; } } } } // L: 157 - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 160 @@ -289,7 +289,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 193 - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; // L: 214 @@ -335,7 +335,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 247 - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 278 @@ -400,7 +400,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 321 - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 340 @@ -450,7 +450,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 342 377 - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 400 @@ -496,7 +496,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 433 - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 452 @@ -561,8 +561,8 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 495 - @ObfuscatedName("z") - public void method8198(int var1, int var2, int var3) { + @ObfuscatedName("j") + public void method8097(int var1, int var2, int var3) { var1 += this.xOffset; // L: 518 var2 += this.yOffset; // L: 519 int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 520 @@ -603,16 +603,16 @@ public final class SpritePixels extends Rasterizer2D { if (var7 > 0 && var6 > 0) { // L: 549 if (var3 == 256) { - method8212(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550 + method8098(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550 } else { - method8200(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551 + method8081(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551 } } } // L: 552 - @ObfuscatedName("i") - public void method8242(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("h") + public void method8100(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 593 int var6 = this.subWidth; // L: 594 int var7 = this.subHeight; // L: 595 @@ -672,16 +672,16 @@ public final class SpritePixels extends Rasterizer2D { } if (var5 == 256) { // L: 635 - method8271(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method8101(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method8203(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636 + method8102(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636 } } } // L: 637 - @ObfuscatedName("ay") - public void method8178(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("aw") + public void method8103(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; // L: 686 int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 687 int var11 = var1 < 0 ? -var1 : 0; // L: 688 @@ -728,7 +728,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 711 - @ObfuscatedName("au") + @ObfuscatedName("am") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -763,8 +763,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 740 - @ObfuscatedName("at") - public void method8238(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("ak") + public void method8105(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; // L: 744 int var11 = -var4 / 2; // L: 745 @@ -802,13 +802,13 @@ public final class SpritePixels extends Rasterizer2D { } // L: 770 - @ObfuscatedName("aw") - public void method8207(int var1, int var2, int var3, int var4) { - this.method8208(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773 + @ObfuscatedName("ao") + public void method8106(int var1, int var2, int var3, int var4) { + this.method8107(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773 } // L: 774 - @ObfuscatedName("ar") - void method8208(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("aj") + void method8107(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { // L: 777 var1 -= this.xOffset << 4; // L: 778 var2 -= this.yOffset << 4; // L: 779 @@ -1276,7 +1276,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1087 - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1090 @@ -1399,7 +1399,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1105 1162 - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { // L: 196 @@ -1419,7 +1419,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 211 - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 250 @@ -1472,7 +1472,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 275 - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 324 @@ -1498,7 +1498,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 337 - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; // L: 380 @@ -1524,7 +1524,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 397 - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; // L: 436 @@ -1575,7 +1575,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 515 @ObfuscatedName("e") - static void method8212(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) { + static void method8098(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { // L: 555 for (var6 = -var9; var6 < 0; ++var6) { // L: 556 var0 = var4[var5++]; // L: 557 @@ -1596,8 +1596,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 570 - @ObfuscatedName("t") - static void method8200(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("z") + static void method8081(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { // L: 573 for (var6 = -var9; var6 < 0; ++var6) { // L: 574 var0 = var4[var5++]; // L: 575 @@ -1620,8 +1620,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 590 - @ObfuscatedName("ac") - static void method8271(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("ae") + static void method8101(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { // L: 640 641 var7 = var15 * (var9 >> 16); // L: 642 @@ -1647,8 +1647,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 659 - @ObfuscatedName("ax") - static void method8203(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("aq") + static void method8102(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { // L: 662 663 var7 = var15 * (var9 >> 16); // L: 664 diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index afd5b00742..5f4d1f0e09 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,111 +1,238 @@ -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("ka") +@ObfuscatedName("kv") @Implements("Strings") public class Strings { - @ObfuscatedName("be") - public static String field3731; - @ObfuscatedName("cb") - public static String field3684; - @ObfuscatedName("kn") + @ObfuscatedName("bo") public static String field3645; - @ObfuscatedName("km") + @ObfuscatedName("cn") + public static String field3684; + @ObfuscatedName("ky") + public static String field3628; + @ObfuscatedName("kc") public static String field3870; - @ObfuscatedName("ke") - public static String field3871; + @ObfuscatedName("kw") + public static String field3646; static { - field3731 = "Please visit the support page for assistance."; + field3645 = "Please visit the support page for assistance."; // L: 60 field3684 = "Please visit the support page for assistance."; // L: 99 - field3645 = ""; // L: 299 + field3628 = ""; // L: 299 field3870 = "Page has opened in a new window."; // L: 300 - field3871 = "(Please check your popup blocker.)"; // L: 301 + field3646 = "(Please check your popup blocker.)"; // L: 301 } // L: 339 - @ObfuscatedName("v") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lpy;I)V", - garbageValue = "1995067219" + descriptor = "(ILbd;ZI)I", + garbageValue = "-698381371" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = class19.localPlayer = Client.players[var1] = new Player(); // L: 39 - var2.index = var1; - int var3 = var0.readBits(30); // L: 41 - byte var4 = (byte)(var3 >> 28); // L: 42 - int var5 = var3 >> 14 & 16383; // L: 43 - int var6 = var3 & 16383; // L: 44 - var2.pathX[0] = var5 - ApproximateRouteStrategy.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - class250.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - class160.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1289[var1] != null) { // L: 50 - var2.read(Players.field1289[var1]); - } + static int method5790(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 3039 + Interpreter.Interpreter_intStackSize -= 2; // L: 3040 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3041 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3042 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4; // L: 3043 + return 1; // L: 3044 + } else if (var0 == ScriptOpcodes.SUB) { // L: 3046 + Interpreter.Interpreter_intStackSize -= 2; // L: 3047 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3048 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3049 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; // L: 3050 + return 1; // L: 3051 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3053 + Interpreter.Interpreter_intStackSize -= 2; // L: 3054 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3055 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3056 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 * var4; // L: 3057 + return 1; // L: 3058 + } else if (var0 == ScriptOpcodes.DIV) { // L: 3060 + Interpreter.Interpreter_intStackSize -= 2; // L: 3061 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3062 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3063 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; // L: 3064 + return 1; // L: 3065 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3067 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3068 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3069 + return 1; // L: 3070 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3072 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3073 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3074 + return 1; // L: 3075 + } else { + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3077 + Interpreter.Interpreter_intStackSize -= 5; // L: 3078 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3079 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3080 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3081 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3082 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 3083 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 3084 + return 1; // L: 3085 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3087 + Interpreter.Interpreter_intStackSize -= 2; // L: 3088 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3089 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3090 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 3091 + return 1; // L: 3092 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3094 + Interpreter.Interpreter_intStackSize -= 2; // L: 3095 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3096 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3097 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3098 + return 1; // L: 3099 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3101 + Interpreter.Interpreter_intStackSize -= 2; // L: 3102 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3103 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3104 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3105 + return 1; // L: 3106 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3108 + Interpreter.Interpreter_intStackSize -= 2; // L: 3109 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3110 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3111 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3112 + return 1; // L: 3113 + } else if (var0 == ScriptOpcodes.MOD) { // L: 3115 + Interpreter.Interpreter_intStackSize -= 2; // L: 3116 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3117 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3118 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; // L: 3119 + return 1; // L: 3120 + } else if (var0 == ScriptOpcodes.POW) { // L: 3122 + Interpreter.Interpreter_intStackSize -= 2; // L: 3123 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3124 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3125 + if (var3 == 0) { // L: 3126 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3127 + } - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1288[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 + return 1; // L: 3128 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3130 + Interpreter.Interpreter_intStackSize -= 2; // L: 3131 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3132 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3133 + if (var3 == 0) { // L: 3134 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3135 + return 1; // L: 3136 + } else { + switch(var4) { // L: 3138 + case 0: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3161 + break; // L: 3162 + case 1: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3156 + break; // L: 3157 + case 2: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3141 + break; + case 3: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3151 + break; // L: 3152 + case 4: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3146 + break; // L: 3147 + default: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3166 + } - for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 - if (var7 != var1) { // L: 56 - int var8 = var0.readBits(18); // L: 57 - int var9 = var8 >> 16; // L: 58 - int var10 = var8 >> 8 & 597; // L: 59 - int var11 = var8 & 597; // L: 60 - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 - Players.Players_orientations[var7] = 0; // L: 62 - Players.Players_targetIndices[var7] = -1; // L: 63 - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 - Players.field1288[var7] = 0; // L: 65 + return 1; // L: 3170 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 3172 + Interpreter.Interpreter_intStackSize -= 2; // L: 3173 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3174 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3175 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; // L: 3176 + return 1; // L: 3177 + } else if (var0 == ScriptOpcodes.OR) { // L: 3179 + Interpreter.Interpreter_intStackSize -= 2; // L: 3180 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3181 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3182 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; // L: 3183 + return 1; // L: 3184 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 3186 + Interpreter.Interpreter_intStackSize -= 3; // L: 3187 + long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3188 + long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3189 + long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3190 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 3191 + return 1; // L: 3192 + } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3194 + var3 = class150.method3150(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3195 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3196 + return 1; // L: 3197 + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3199 + Interpreter.Interpreter_intStackSize -= 2; // L: 3200 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3201 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3202 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3203 + return 1; // L: 3204 + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3206 + Interpreter.Interpreter_intStackSize -= 3; // L: 3207 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3208 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3209 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3210 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModelData0.method5091(var3, var4, var5); // L: 3211 + return 1; // L: 3212 + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3214 + Interpreter.Interpreter_intStackSize -= 3; // L: 3215 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3216 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3217 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3218 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = World.method1679(var3, var4, var5); // L: 3219 + return 1; // L: 3220 + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3222 + Interpreter.Interpreter_intStackSize -= 3; // L: 3223 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3224 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3225 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3226 + var6 = 31 - var5; // L: 3227 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3228 + return 1; // L: 3229 + } else if (var0 == 4030) { // L: 3231 + Interpreter.Interpreter_intStackSize -= 4; // L: 3232 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3233 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3234 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3235 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3236 + var3 = World.method1679(var3, var5, var6); // L: 3237 + var7 = class54.method1078(var6 - var5 + 1); // L: 3238 + if (var4 > var7) { // L: 3239 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3240 + return 1; // L: 3241 + } else if (var0 == 4032) { // L: 3243 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = HealthBar.method2344(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3244 + return 1; // L: 3245 + } else if (var0 == 4033) { // L: 3247 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class144.method3081(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3248 + return 1; // L: 3249 + } else if (var0 == 4034) { // L: 3251 + Interpreter.Interpreter_intStackSize -= 2; // L: 3252 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3253 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3254 + var5 = class194.method3890(var3, var4); // L: 3255 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; // L: 3256 + return 1; // L: 3257 + } else if (var0 == 4035) { // L: 3259 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3260 + return 1; // L: 3261 + } else { + return 2; // L: 3263 } } - - var0.exportIndex(); // L: 67 - } // L: 68 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)Lba;", - garbageValue = "-56" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "222187307" - ) - static final void method5795() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11680 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11681 - var1.clearIsFriend(); // L: 11682 - } - - class20.method326(); // L: 11684 - if (class230.friendsChat != null) { // L: 11685 - class230.friendsChat.clearFriends(); // L: 11686 - } - - } // L: 11688 - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" - ) - static final void method5798() { - Client.field726 = Client.cycleCntr; // L: 11705 - class345.ClanChat_inClanChat = true; // L: 11706 - } // L: 11707 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index d877b3d879..e39ecfb1da 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -1,26 +1,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gh") @Implements("StructComposition") public class StructComposition extends DualNode { + @ObfuscatedName("sh") + @ObfuscatedSignature( + descriptor = "Lal;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("StructDefinition_archive") - static AbstractArchive StructDefinition_archive; - @ObfuscatedName("o") + public static AbstractArchive StructDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("StructDefinition_cached") - static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("h") + public static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -200847333 + ) + public static int field1988; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpq;" + descriptor = "Lpt;" ) @Export("params") IterableNodeHashTable params; @@ -32,71 +44,133 @@ public class StructComposition extends DualNode { StructComposition() { } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1212675865" + descriptor = "(B)V", + garbageValue = "9" ) @Export("postDecode") void postDecode() { - } // L: 33 + } // L: 29 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-1834339628" + descriptor = "(Lpi;I)V", + garbageValue = "1284731224" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 37 - if (var2 == 0) { // L: 38 - return; // L: 41 + int var2 = var1.readUnsignedByte(); // L: 33 + if (var2 == 0) { // L: 34 + return; // L: 37 } - this.decodeNext(var1, var2); // L: 39 + this.decodeNext(var1, var2); // L: 35 } } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "-55" + descriptor = "(Lpi;II)V", + garbageValue = "297360450" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = NetFileRequest.readStringIntParameters(var1, this.params); // L: 44 + this.params = class214.readStringIntParameters(var1, this.params); // L: 40 } - } // L: 46 + } // L: 42 - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1125052111" + garbageValue = "-607891890" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return ClanSettings.method2976(this.params, var1, var2); // L: 49 + IterableNodeHashTable var4 = this.params; // L: 46 + int var3; + if (var4 == null) { // L: 48 + var3 = var2; // L: 49 + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 52 + if (var5 == null) { // L: 53 + var3 = var2; // L: 54 + } else { + var3 = var5.integer; // L: 57 + } + } + + return var3; // L: 59 } - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-87258445" + garbageValue = "-1724611537" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class19.method315(this.params, var1, var2); // L: 53 + IterableNodeHashTable var4 = this.params; // L: 64 + String var3; + if (var4 == null) { // L: 66 + var3 = var2; // L: 67 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 70 + if (var5 == null) { // L: 71 + var3 = var2; // L: 72 + } else { + var3 = (String)var5.obj; // L: 75 + } + } + + return var3; // L: 77 } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2122141514" + descriptor = "(I)I", + garbageValue = "-2141365595" ) - public static void method3605() { - ParamComposition.ParamDefinition_cached.clear(); // L: 72 - } // L: 73 + public static int method3618() { + return ViewportMouse.ViewportMouse_entityCount; // L: 44 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIIIIIB)I", + garbageValue = "0" + ) + public static int method3611(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 17 + int var6 = var3; // L: 18 + var3 = var4; // L: 19 + var4 = var6; // L: 20 + } + + var2 &= 3; // L: 22 + if (var2 == 0) { // L: 23 + return var0; + } else if (var2 == 1) { // L: 24 + return var1; + } else { + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 25 26 + } + } + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "1317102167" + ) + public static void method3619(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2929, Client.packetWriter.isaacCipher); // L: 12590 + var4.packetBuffer.writeShort(var0); // L: 12591 + var4.packetBuffer.method7711(var1); // L: 12592 + var4.packetBuffer.method7703(var2); // L: 12593 + var4.packetBuffer.method7721(var3 ? Client.field586 * -480626199 * -416666023 : 0); // L: 12594 + Client.packetWriter.addNode(var4); // L: 12595 + } // L: 12596 } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 26c5723850..bad13fda0c 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,97 +4,272 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("kt") @Implements("StudioGame") public enum StudioGame implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkt;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkt;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkt;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkt;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkt;" ) @Export("game5") game5("game5", "Game 5", 4), @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkt;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("name") public final String name; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1143281773 + intValue = 589131085 ) @Export("id") final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; // L: 21 - this.id = var5; // L: 22 + this.name = var3; + this.id = var5; } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; } @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;B)V", - garbageValue = "36" - ) - public static void method5783(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; // L: 17 - } // L: 18 - - @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-907530629" + garbageValue = "-741989728" ) - static void method5785() { - class150.method3089(24); // L: 2086 - GrandExchangeEvent.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2087 - } // L: 2088 + static void method5776() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 124 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 125 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 126 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 127 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 128 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 129 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 130 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 131 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 132 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 133 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 134 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 135 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 136 + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 139 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 140 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 141 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 142 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 143 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 144 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 145 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 146 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 147 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 148 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 149 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 150 + } - @ObfuscatedName("ek") + } // L: 152 + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)Lon;", - garbageValue = "10040" + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-184961670" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return ClanChannel.worldMap; // L: 664 + public static String method5780(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 11 + return ""; + } else if (var2 == 1) { // L: 12 + CharSequence var10 = var0[var1]; // L: 13 + return var10 == null ? "null" : var10.toString(); // L: 14 15 + } else { + int var3 = var2 + var1; // L: 17 + int var4 = 0; // L: 18 + + for (int var5 = var1; var5 < var3; ++var5) { // L: 19 + CharSequence var9 = var0[var5]; // L: 20 + if (var9 == null) { // L: 21 + var4 += 4; + } else { + var4 += var9.length(); // L: 22 + } + } + + StringBuilder var8 = new StringBuilder(var4); // L: 24 + + for (int var6 = var1; var6 < var3; ++var6) { // L: 25 + CharSequence var7 = var0[var6]; // L: 26 + if (var7 == null) { // L: 27 + var8.append("null"); + } else { + var8.append(var7); // L: 28 + } + } + + return var8.toString(); // L: 30 + } } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(ZLpz;B)V", + garbageValue = "1" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5453 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5454 + var2 = var1.method7714(); // L: 5455 + var3 = var1.method7714(); // L: 5456 + int var4 = var1.readUnsignedShort(); // L: 5457 + WorldMapSectionType.xteaKeys = new int[var4][4]; // L: 5458 + + for (var5 = 0; var5 < var4; ++var5) { // L: 5459 + for (var6 = 0; var6 < 4; ++var6) { // L: 5460 + WorldMapSectionType.xteaKeys[var5][var6] = var1.readInt(); // L: 5461 + } + } + + class21.regions = new int[var4]; // L: 5464 + VarpDefinition.regionMapArchiveIds = new int[var4]; // L: 5465 + class133.regionLandArchiveIds = new int[var4]; // L: 5466 + Varcs.regionLandArchives = new byte[var4][]; // L: 5467 + DynamicObject.regionMapArchives = new byte[var4][]; // L: 5468 + boolean var16 = false; // L: 5469 + if (Client.field553) { // L: 5470 + if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5471 + var16 = true; + } + + if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5472 + var16 = true; + } + } + + var4 = 0; // L: 5474 + + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5475 + for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5476 + var8 = var7 + (var6 << 8); // L: 5477 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5478 + class21.regions[var4] = var8; // L: 5479 + VarpDefinition.regionMapArchiveIds[var4] = Players.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5480 + class133.regionLandArchiveIds[var4] = Players.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5481 + ++var4; // L: 5482 + } + } + } + + FloorDecoration.method4591(var2, var3, true); // L: 5485 + } else { + var2 = var1.method7715(); // L: 5488 + var3 = var1.method7713(); // L: 5489 + boolean var15 = var1.readUnsignedByte() == 1; // L: 5490 + var5 = var1.readUnsignedShort(); // L: 5491 + var1.importIndex(); // L: 5492 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5493 + for (var7 = 0; var7 < 13; ++var7) { // L: 5494 + for (var8 = 0; var8 < 13; ++var8) { // L: 5495 + var9 = var1.readBits(1); // L: 5496 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5497 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5498 + } + } + } + } + + var1.exportIndex(); // L: 5502 + WorldMapSectionType.xteaKeys = new int[var5][4]; // L: 5503 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5504 + for (var7 = 0; var7 < 4; ++var7) { // L: 5505 + WorldMapSectionType.xteaKeys[var6][var7] = var1.readInt(); // L: 5506 + } + } + + class21.regions = new int[var5]; // L: 5509 + VarpDefinition.regionMapArchiveIds = new int[var5]; // L: 5510 + class133.regionLandArchiveIds = new int[var5]; // L: 5511 + Varcs.regionLandArchives = new byte[var5][]; // L: 5512 + DynamicObject.regionMapArchives = new byte[var5][]; // L: 5513 + var5 = 0; // L: 5514 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5515 + for (var7 = 0; var7 < 13; ++var7) { // L: 5516 + for (var8 = 0; var8 < 13; ++var8) { // L: 5517 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5518 + if (var9 != -1) { // L: 5519 + int var10 = var9 >> 14 & 1023; // L: 5520 + int var11 = var9 >> 3 & 2047; // L: 5521 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5522 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5523 + if (class21.regions[var13] == var12) { + var12 = -1; // L: 5524 + break; // L: 5525 + } + } + + if (var12 != -1) { // L: 5527 + class21.regions[var5] = var12; // L: 5528 + var13 = var12 >> 8 & 255; // L: 5529 + int var14 = var12 & 255; // L: 5530 + VarpDefinition.regionMapArchiveIds[var5] = Players.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5531 + class133.regionLandArchiveIds[var5] = Players.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5532 + ++var5; // L: 5533 + } + } + } + } + } + + FloorDecoration.method4591(var3, var2, !var15); // L: 5539 + } + + } // L: 5541 } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 8d41eaad5d..94b6749527 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("fn") +@ObfuscatedName("fx") @Implements("Task") public class Task { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfx;" ) @Export("next") Task next; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("status") public volatile int status; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1779285699 + intValue = 692855731 ) @Export("type") int type; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("intArgument") public int intArgument; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("u") + @ObfuscatedName("q") @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 05bfd9f8fe..905c3205e0 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -8,30 +8,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("ff") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("o") + @ObfuscatedName("v") + @Export("javaVendor") + public static String javaVendor; + @ObfuscatedName("c") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("c") + @ObfuscatedName("ix") @ObfuscatedGetter( - intValue = 426946051 + intValue = 64635033 ) - static int field1722; - @ObfuscatedName("h") + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfx;" ) @Export("current") Task current; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfn;" + descriptor = "Lfx;" ) @Export("task") Task task; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("thread") Thread thread; @ObfuscatedName("n") @@ -42,11 +46,11 @@ public class TaskHandler implements Runnable { this.current = null; // L: 11 this.task = null; // L: 12 this.isClosed = false; // L: 14 - ChatChannel.javaVendor = "Unknown"; // L: 20 + javaVendor = "Unknown"; // L: 20 javaVersion = "1.6"; // L: 21 try { - ChatChannel.javaVendor = System.getProperty("java.vendor"); // L: 23 + javaVendor = System.getProperty("java.vendor"); // L: 23 javaVersion = System.getProperty("java.version"); // L: 24 } catch (Exception var2) { // L: 26 } @@ -61,7 +65,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1783901151" + garbageValue = "1526764505" ) @Export("close") public final void close() { @@ -77,10 +81,10 @@ public class TaskHandler implements Runnable { } // L: 43 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lfn;", - garbageValue = "-191893082" + descriptor = "(IIILjava/lang/Object;I)Lfx;", + garbageValue = "1659123907" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -101,20 +105,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Lfn;", - garbageValue = "6" + descriptor = "(Ljava/lang/String;II)Lfx;", + garbageValue = "-1072001618" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;IS)Lfn;", - garbageValue = "24130" + descriptor = "(Ljava/lang/Runnable;II)Lfx;", + garbageValue = "-610895732" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 75e33a8c9b..3e2c7ba591 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("gw") +@ObfuscatedName("hg") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("averageRGB") int averageRGB; @ObfuscatedName("n") - boolean field2276; - @ObfuscatedName("d") + boolean field2511; + @ObfuscatedName("s") @Export("fileIds") int[] fileIds; - @ObfuscatedName("f") - int[] field2278; - @ObfuscatedName("u") - int[] field2279; + @ObfuscatedName("l") + int[] field2506; + @ObfuscatedName("q") + int[] field2507; + @ObfuscatedName("o") + int[] field2508; @ObfuscatedName("r") - int[] field2280; - @ObfuscatedName("k") @Export("animationDirection") int animationDirection; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("pixels") int[] pixels; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field2276 = var1.readUnsignedByte() == 1; // L: 30 + this.field2511 = var1.readUnsignedByte() == 1; // L: 30 int var2 = var1.readUnsignedByte(); // L: 31 if (var2 >= 1 && var2 <= 4) { // L: 32 this.fileIds = new int[var2]; // L: 35 @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field2278 = new int[var2 - 1]; // L: 38 + this.field2506 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field2278[var3] = var1.readUnsignedByte(); + this.field2506[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field2279 = new int[var2 - 1]; // L: 42 + this.field2507 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field2279[var3] = var1.readUnsignedByte(); + this.field2507[var3] = var1.readUnsignedByte(); } } - this.field2280 = new int[var2]; // L: 45 + this.field2508 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field2280[var3] = var1.readInt(); + this.field2508[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -84,7 +84,7 @@ public class Texture extends Node { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(DILlq;)Z" + descriptor = "(DILln;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,95 +99,111 @@ public class Texture extends Node { this.pixels = new int[var5]; // L: 57 for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - IndexedSprite var7 = GameBuild.method5774(var4, this.fileIds[var6]); // L: 59 - var7.normalize(); // L: 60 - byte[] var8 = var7.pixels; // L: 61 - int[] var9 = var7.palette; // L: 62 - int var10 = this.field2280[var6]; // L: 63 - if ((var10 & -16777216) == 16777216) { // L: 64 + int var8 = this.fileIds[var6]; // L: 60 + byte[] var10 = var4.takeFileFlat(var8); // L: 64 + boolean var9; + if (var10 == null) { // L: 65 + var9 = false; // L: 66 + } else { + WorldMapArea.SpriteBuffer_decode(var10); // L: 69 + var9 = true; // L: 70 } - if ((var10 & -16777216) == 33554432) { // L: 65 + IndexedSprite var7; + if (!var9) { // L: 72 + var7 = null; // L: 73 + } else { + var7 = HorizontalAlignment.method3492(); // L: 76 + } + + var7.normalize(); // L: 79 + var10 = var7.pixels; // L: 80 + int[] var11 = var7.palette; // L: 81 + int var12 = this.field2508[var6]; // L: 82 + if ((var12 & -16777216) == 16777216) { // L: 83 + } + + if ((var12 & -16777216) == 33554432) { // L: 84 } - int var11; - int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { // L: 66 - var11 = var10 & 16711935; // L: 67 - var12 = var10 >> 8 & 255; // L: 68 + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { // L: 85 + var13 = var12 & 16711935; // L: 86 + var14 = var12 >> 8 & 255; // L: 87 - for (var13 = 0; var13 < var9.length; ++var13) { // L: 69 - var14 = var9[var13]; // L: 70 - if (var14 >> 8 == (var14 & 65535)) { // L: 71 - var14 &= 255; // L: 72 - var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; // L: 73 + for (var15 = 0; var15 < var11.length; ++var15) { // L: 88 + var16 = var11[var15]; // L: 89 + if (var16 >> 8 == (var16 & 65535)) { // L: 90 + var16 &= 255; // L: 91 + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; // L: 92 } } } - for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 - var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); + for (var13 = 0; var13 < var11.length; ++var13) { // L: 96 + var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } - if (var6 == 0) { // L: 79 - var11 = 0; + if (var6 == 0) { // L: 98 + var13 = 0; } else { - var11 = this.field2278[var6 - 1]; // L: 80 + var13 = this.field2506[var6 - 1]; // L: 99 } - if (var11 == 0) { // L: 81 - if (var3 == var7.subWidth) { // L: 82 - for (var12 = 0; var12 < var5; ++var12) { // L: 83 - this.pixels[var12] = var9[var8[var12] & 255]; + if (var13 == 0) { // L: 100 + if (var3 == var7.subWidth) { // L: 101 + for (var14 = 0; var14 < var5; ++var14) { // L: 102 + this.pixels[var14] = var11[var10[var14] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 - var12 = 0; // L: 86 + } else if (var7.subWidth == 64 && var3 == 128) { // L: 104 + var14 = 0; // L: 105 - for (var13 = 0; var13 < var3; ++var13) { // L: 87 - for (var14 = 0; var14 < var3; ++var14) { // L: 88 - this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { // L: 106 + for (var16 = 0; var16 < var3; ++var16) { // L: 107 + this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { // L: 91 - throw new RuntimeException(); // L: 98 + if (var7.subWidth != 128 || var3 != 64) { // L: 110 + throw new RuntimeException(); // L: 117 } - var12 = 0; // L: 92 + var14 = 0; // L: 111 - for (var13 = 0; var13 < var3; ++var13) { // L: 93 - for (var14 = 0; var14 < var3; ++var14) { // L: 94 - this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { // L: 112 + for (var16 = 0; var16 < var3; ++var16) { // L: 113 + this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { // L: 101 + if (var13 == 1) { // L: 120 } - if (var11 == 2) { // L: 102 + if (var13 == 2) { // L: 121 } - if (var11 == 3) { // L: 103 + if (var13 == 3) { // L: 122 } } - return true; // L: 105 + return true; // L: 124 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("reset") void reset() { - this.pixels = null; // L: 109 - } // L: 110 + this.pixels = null; // L: 128 + } // L: 129 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 113 + if (this.pixels != null) { // L: 132 short var2; int var3; int var4; @@ -195,65 +211,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 + if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 133 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 134 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 117 + if (this.pixels.length == 4096) { // L: 136 var2 = 64; } else { - var2 = 128; // L: 118 + var2 = 128; // L: 137 } - var3 = this.pixels.length; // L: 119 - var4 = var2 * this.animationSpeed * var1; // L: 120 - var5 = var3 - 1; // L: 121 - if (this.animationDirection == 1) { // L: 122 + var3 = this.pixels.length; // L: 138 + var4 = var2 * this.animationSpeed * var1; // L: 139 + var5 = var3 - 1; // L: 140 + if (this.animationDirection == 1) { // L: 141 var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { // L: 123 - var7 = var6 + var4 & var5; // L: 124 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 + for (var6 = 0; var6 < var3; ++var6) { // L: 142 + var7 = var6 + var4 & var5; // L: 143 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 144 } - var10 = this.pixels; // L: 127 - this.pixels = Texture_animatedPixels; // L: 128 - Texture_animatedPixels = var10; // L: 129 + var10 = this.pixels; // L: 146 + this.pixels = Texture_animatedPixels; // L: 147 + Texture_animatedPixels = var10; // L: 148 } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 + if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 150 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 151 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 134 + if (this.pixels.length == 4096) { // L: 153 var2 = 64; } else { - var2 = 128; // L: 135 + var2 = 128; // L: 154 } - var3 = this.pixels.length; // L: 136 - var4 = this.animationSpeed * var1; // L: 137 - var5 = var2 - 1; // L: 138 - if (this.animationDirection == 2) { // L: 139 + var3 = this.pixels.length; // L: 155 + var4 = this.animationSpeed * var1; // L: 156 + var5 = var2 - 1; // L: 157 + if (this.animationDirection == 2) { // L: 158 var4 = -var4; } - for (var6 = 0; var6 < var3; var6 += var2) { // L: 140 - for (var7 = 0; var7 < var2; ++var7) { // L: 141 - int var8 = var6 + var7; // L: 142 - int var9 = var6 + (var7 + var4 & var5); // L: 143 - Texture_animatedPixels[var8] = this.pixels[var9]; // L: 144 + for (var6 = 0; var6 < var3; var6 += var2) { // L: 159 + for (var7 = 0; var7 < var2; ++var7) { // L: 160 + int var8 = var6 + var7; // L: 161 + int var9 = var6 + (var7 + var4 & var5); // L: 162 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 163 } } - var10 = this.pixels; // L: 147 - this.pixels = Texture_animatedPixels; // L: 148 - Texture_animatedPixels = var10; // L: 149 + var10 = this.pixels; // L: 166 + this.pixels = Texture_animatedPixels; // L: 167 + Texture_animatedPixels = var10; // L: 168 } } - } // L: 151 + } // L: 170 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index dd2ffae93b..19a83b6aae 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("ht") +@ObfuscatedName("iw") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1057260959" + garbageValue = "1291576532" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1770582594" + garbageValue = "-200927796" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1262216131" + garbageValue = "-1510277471" ) - boolean vmethod4505(int var1); + boolean vmethod5096(int var1); @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "9" + descriptor = "(II)Z", + garbageValue = "-1828440657" ) @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 e3a4fbd828..ae35a84d26 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,60 +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("hm") +@ObfuscatedName("it") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "Lmr;" - ) - @Export("fontPlain11") - static Font fontPlain11; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lgw;" + descriptor = "[Lhg;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lld;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 111236563 + intValue = 1377781691 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1803338355 + intValue = 2008251437 ) @Export("remaining") int remaining; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("brightness") double brightness; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1466254357 + intValue = 24561521 ) @Export("textureSize") int textureSize; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Llq;Llq;IDI)V" + descriptor = "(Lln;Lln;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); // L: 9 @@ -79,8 +74,8 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "120" + descriptor = "(I)I", + garbageValue = "-728191973" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -90,37 +85,37 @@ public class TextureProvider implements TextureLoader { for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36 Texture var5 = var3[var4]; // L: 37 - if (var5 != null && var5.fileIds != null) { // L: 39 - var1 += var5.fileIds.length; // L: 40 - int[] var6 = var5.fileIds; // L: 42 + if (var5 != null && var5.fileIds != null) { + var1 += var5.fileIds.length; + int[] var6 = var5.fileIds; - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 - int var8 = var6[var7]; // L: 44 - if (this.archive.method5876(var8)) { // L: 46 - ++var2; // L: 47 + for (int var7 = 0; var7 < var6.length; ++var7) { + int var8 = var6[var7]; + if (this.archive.method5864(var8)) { + ++var2; } } } } - if (var1 == 0) { // L: 55 + if (var1 == 0) { return 0; } else { - return var2 * 100 / var1; // L: 56 + return var2 * 100 / var1; } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; // L: 60 - this.clear(); // L: 61 + this.brightness = var1; + this.clear(); } // L: 62 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1057260959" + garbageValue = "1291576532" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -142,47 +137,47 @@ public class TextureProvider implements TextureLoader { } this.deque.addLast(var2); // L: 79 - var2.isLoaded = true; // L: 80 - return var2.pixels; // L: 81 + var2.isLoaded = true; + return var2.pixels; } } - return null; // L: 84 + return null; } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1770582594" + garbageValue = "-200927796" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1262216131" + garbageValue = "-1510277471" ) - public boolean vmethod4505(int var1) { - return this.textures[var1].field2276; // L: 93 + public boolean vmethod5096(int var1) { + return this.textures[var1].field2511; // L: 93 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "9" + descriptor = "(II)Z", + garbageValue = "-1828440657" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-76" + descriptor = "(S)V", + garbageValue = "-17643" ) @Export("clear") public void clear() { @@ -196,10 +191,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "81" + descriptor = "(II)V", + garbageValue = "-115024983" ) @Export("animate") public void animate(int var1) { @@ -213,13 +208,83 @@ public class TextureProvider implements TextureLoader { } // L: 116 - @ObfuscatedName("js") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1959927231" + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "-202742127" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 10575 + static boolean method4963(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 38 + boolean var3 = false; // L: 39 + boolean var4 = false; // L: 40 + int var5 = 0; // L: 41 + int var6 = var0.length(); // L: 42 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 43 + char var8 = var0.charAt(var7); // L: 44 + if (var7 == 0) { // L: 45 + if (var8 == '-') { // L: 46 + var3 = true; // L: 47 + continue; + } + + if (var8 == '+') { // L: 50 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 52 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 53 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 54 + return false; // L: 55 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 56 + return false; + } + + if (var3) { // L: 57 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 58 + if (var9 / var1 != var5) { // L: 59 + return false; + } + + var5 = var9; // L: 60 + var4 = true; // L: 61 + } + + return var4; // L: 63 + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(S)Ljava/lang/String;", + garbageValue = "1605" + ) + static String method4950() { + StringBuilder var0 = new StringBuilder(); // L: 80 + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0.append(var2.text).append('\n')) { // L: 81 87 + var2 = (Message)var1.next(); // L: 82 + if (var2.sender != null && !var2.sender.isEmpty()) { // L: 84 + var0.append(var2.sender).append(':'); // L: 85 + } + } + + return var0.toString(); // L: 90 } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 7799d65a35..34c194f4ab 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,132 +1,135 @@ +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("gy") +@ObfuscatedName("hu") @Implements("Tile") public final class Tile extends Node { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -673782605 + intValue = 554063901 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1121637331 + intValue = -1735268707 ) @Export("x") int x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 672656763 + intValue = 1320451453 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2008517881 + intValue = 409854947 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhj;" + descriptor = "Liv;" ) @Export("paint") SceneTilePaint paint; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lik;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Lij;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lio;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lhp;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lhy;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1077324961 + intValue = 888964959 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lhg;" + descriptor = "[Liy;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -399382975 + intValue = -1954145803 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 465941461 + intValue = 1615665333 ) @Export("minPlane") int minPlane; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("w") + @ObfuscatedName("t") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1139331751 + intValue = 1788944153 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -412230155 + intValue = -1042074251 ) - int field2300; - @ObfuscatedName("q") + int field2544; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -852311983 + intValue = -147563717 ) - int field2305; + int field2545; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 167595445 + intValue = 1316845431 ) - int field2318; - @ObfuscatedName("z") + int field2546; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhu;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -140,94 +143,54 @@ public final class Tile extends Node { this.y = var3; // L: 33 } // L: 34 - @ObfuscatedName("v") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-768783923" + descriptor = "(I)I", + garbageValue = "1950958863" ) - static void method3992() { - Tiles.Tiles_minPlane = 99; // L: 48 - Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49 - Tiles.Tiles_overlays = new byte[4][104][104]; // L: 50 - Tiles.Tiles_shapes = new byte[4][104][104]; // L: 51 - RunException.field4754 = new byte[4][104][104]; // L: 52 - DirectByteArrayCopier.field3277 = new int[4][105][105]; // L: 53 - GrandExchangeOfferNameComparator.field4010 = new byte[4][105][105]; // L: 54 - Widget.field3495 = new int[105][105]; // L: 55 - class4.Tiles_hue = new int[104]; // L: 56 - Login.Tiles_saturation = new int[104]; // L: 57 - WorldMapSectionType.Tiles_lightness = new int[104]; // L: 58 - class300.Tiles_hueMultiplier = new int[104]; // L: 59 - Tiles.field986 = new int[104]; // L: 60 - } // L: 61 + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 574 + if (PcmPlayer.garbageCollector == null || !PcmPlayer.garbageCollector.isValid()) { // L: 575 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 577 - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1788183956" - ) - static final void method3991(int var0) { - int[] var1 = MusicPatchNode2.sceneMinimapSprite.pixels; // L: 5467 - int var2 = var1.length; // L: 5468 - - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 5469 - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 5470 - var4 = (103 - var3) * 2048 + 24628; // L: 5471 - - for (var5 = 1; var5 < 103; ++var5) { // L: 5472 - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5473 - FriendSystem.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5474 - FriendSystem.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; // L: 5475 - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5478 - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5479 - MusicPatchNode2.sceneMinimapSprite.setRaster(); // L: 5480 - - int var6; - for (var5 = 1; var5 < 103; ++var5) { // L: 5481 - for (var6 = 1; var6 < 103; ++var6) { // L: 5482 - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5483 - class11.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5484 - class11.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; // L: 5487 - - for (var5 = 0; var5 < 104; ++var5) { // L: 5488 - for (var6 = 0; var6 < 104; ++var6) { // L: 5489 - long var7 = FriendSystem.scene.getFloorDecorationTag(class160.Client_plane, var5, var6); // L: 5490 - if (0L != var7) { // L: 5491 - int var9 = class121.Entity_unpackID(var7); // L: 5492 - int var10 = class116.getObjectDefinition(var9).mapIconId; // L: 5493 - if (var10 >= 0 && class19.WorldMapElement_get(var10).field1836) { // L: 5494 5495 - Client.mapIcons[Client.mapIconCount] = class19.WorldMapElement_get(var10).getSpriteBool(false); // L: 5498 - Client.mapIconXs[Client.mapIconCount] = var5; // L: 5499 - Client.mapIconYs[Client.mapIconCount] = var6; // L: 5500 - ++Client.mapIconCount; // L: 5501 + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 578 + if (var2.isValid()) { // L: 580 + PcmPlayer.garbageCollector = var2; // L: 581 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 582 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 583 } } + } catch (Throwable var11) { // L: 588 } } - SpotAnimationDefinition.rasterProvider.apply(); // L: 5506 - } // L: 5507 + if (PcmPlayer.garbageCollector != null) { // L: 590 + long var9 = class136.method2931(); // L: 591 + long var3 = PcmPlayer.garbageCollector.getCollectionTime(); // L: 592 + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 593 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 594 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 595 + if (var7 != 0L) { // L: 596 + var0 = (int)(var5 * 100L / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 598 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 599 + } + + return var0; // L: 601 + } + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "418213211" + ) + static void method4603(int var0) { + Client.oculusOrbState = var0; // L: 12603 + } // L: 12604 } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index fb7be1b10f..bdf69dc998 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,29 +1,28 @@ +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cu") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("u") - public static short[] field1281; - @ObfuscatedName("em") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "[Lqq;" ) - @Export("archive0") - static Archive archive0; + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 914537933 + intValue = -1512550431 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1079489497 + intValue = 1689491185 ) @Export("quantity") int quantity; @@ -31,30 +30,90 @@ public final class TileItem extends Renderable { TileItem() { } // L: 11 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lhx;", - garbageValue = "63" + descriptor = "(B)Liq;", + garbageValue = "103" ) @Export("getModel") protected final Model getModel() { - return class67.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return class19.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-902066173" + descriptor = "(I)Z", + garbageValue = "-1886709718" ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 - if (var1 != null) { // L: 64 - for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 - var1.ids[var2] = -1; // L: 66 - var1.quantities[var2] = 0; // L: 67 + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (class293.World_request == null) { // L: 31 + class293.World_request = VerticalAlignment.urlRequester.request(new URL(WorldMapElement.field1836)); + } else if (class293.World_request.isDone()) { // L: 33 + byte[] var0 = class293.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + DevicePcmPlayerProvider.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 47 + var3 = DevicePcmPlayerProvider.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); // L: 46 + } + + class127.sortWorlds(DevicePcmPlayerProvider.World_worlds, 0, DevicePcmPlayerProvider.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + class293.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + class293.World_request = null; // L: 57 + } + + return false; // L: 59 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIS)I", + garbageValue = "-26385" + ) + public static int method2393(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1980901442" + ) + static void method2395() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 36 + if (ArchiveDiskActionHandler.field3945 == 0) { // L: 37 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 38 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 39 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 41 } + ArchiveDiskActionHandler.field3945 = 600; // L: 43 } - } // L: 69 + } // L: 45 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lbe;", + garbageValue = "-99479259" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 618d6180da..125949d813 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,58 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bi") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("sy") - @ObfuscatedGetter( - intValue = 1069541605 - ) - static int field996; @ObfuscatedName("v") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -367367905 + intValue = -1996311103 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("Tiles_underlays") static byte[][][] Tiles_underlays; - @ObfuscatedName("l") - @Export("Tiles_overlays") - static byte[][][] Tiles_overlays; - @ObfuscatedName("n") - @Export("Tiles_shapes") - static byte[][][] Tiles_shapes; - @ObfuscatedName("j") - static int[] field986; - @ObfuscatedName("a") - static final int[] field988; - @ObfuscatedName("m") - static final int[] field989; + @ObfuscatedName("s") + static byte[][][] field983; @ObfuscatedName("q") + static int[][] field998; + @ObfuscatedName("p") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("g") static final int[] field990; + @ObfuscatedName("x") + static final int[] field989; + @ObfuscatedName("a") + static final int[] field992; @ObfuscatedName("y") - static final int[] field991; - @ObfuscatedName("z") - static final int[] field1000; - @ObfuscatedName("e") static final int[] field993; - @ObfuscatedName("t") + @ObfuscatedName("j") + static final int[] field997; + @ObfuscatedName("e") + static final int[] field995; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 468499867 + intValue = 1326469755 ) @Export("rndHue") static int rndHue; - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2107967973 + intValue = -1535844851 ) @Export("rndLightness") static int rndLightness; @@ -64,103 +58,65 @@ public final class Tiles { Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 Tiles_minPlane = 99; // L: 18 - field988 = new int[]{1, 2, 4, 8}; // L: 34 - field989 = new int[]{16, 32, 64, 128}; - field990 = new int[]{1, 0, -1, 0}; - field991 = new int[]{0, -1, 0, 1}; // L: 37 - field1000 = new int[]{1, -1, -1, 1}; // L: 38 - field993 = new int[]{-1, -1, 1, 1}; // L: 39 + field990 = new int[]{1, 2, 4, 8}; // L: 34 + field989 = new int[]{16, 32, 64, 128}; // L: 35 + field992 = new int[]{1, 0, -1, 0}; // L: 36 + field993 = new int[]{0, -1, 0, 1}; // L: 37 + field997 = new int[]{1, -1, -1, 1}; // L: 38 + field995 = new int[]{-1, -1, 1, 1}; // L: 39 rndHue = (int)(Math.random() * 17.0D) - 8; // L: 40 rndLightness = (int)(Math.random() * 33.0D) - 16; // L: 41 } - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)Lba;", - garbageValue = "0" + descriptor = "([BIIIIIIILhv;[Lgv;)V" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 - return var2.getMessage(var1); // L: 36 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "([BIIIIIIILgs;[Lgf;)V" - ) - static final void method2006(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); // L: 321 - int var11 = -1; // L: 322 + static final void method2015(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); // L: 298 + int var11 = -1; // L: 299 while (true) { - int var12 = var10.method7775(); // L: 324 - if (var12 == 0) { // L: 325 - return; // L: 352 + int var12 = var10.method7743(); // L: 301 + if (var12 == 0) { // L: 302 + return; // L: 329 } - var11 += var12; // L: 326 - int var13 = 0; // L: 327 + var11 += var12; // L: 303 + int var13 = 0; // L: 304 while (true) { - int var14 = var10.readUShortSmart(); // L: 329 - if (var14 == 0) { // L: 330 + int var14 = var10.readUShortSmart(); // L: 306 + if (var14 == 0) { // L: 307 break; } - var13 += var14 - 1; // L: 331 - int var15 = var13 & 63; // L: 332 - int var16 = var13 >> 6 & 63; // L: 333 - int var17 = var13 >> 12; // L: 334 - int var18 = var10.readUnsignedByte(); // L: 335 - int var19 = var18 >> 2; // L: 336 - int var20 = var18 & 3; // L: 337 - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 338 - ObjectComposition var21 = class116.getObjectDefinition(var11); // L: 339 - int var22 = var2 + class162.method3273(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 340 - int var23 = var3 + Clock.method3322(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 341 - if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 342 - int var24 = var1; // L: 343 - if ((Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 344 + var13 += var14 - 1; // L: 308 + int var15 = var13 & 63; // L: 309 + int var16 = var13 >> 6 & 63; // L: 310 + int var17 = var13 >> 12; // L: 311 + int var18 = var10.readUnsignedByte(); // L: 312 + int var19 = var18 >> 2; // L: 313 + int var20 = var18 & 3; // L: 314 + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 315 + ObjectComposition var21 = class146.getObjectDefinition(var11); // L: 316 + int var22 = var2 + StructComposition.method3611(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 317 + int var23 = var3 + class394.method7141(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 318 + if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 319 + int var24 = var1; // L: 320 + if ((Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 321 var24 = var1 - 1; } - CollisionMap var25 = null; // L: 345 - if (var24 >= 0) { // L: 346 + CollisionMap var25 = null; // L: 322 + if (var24 >= 0) { // L: 323 var25 = var9[var24]; } - WorldMapIcon_1.addObjects(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 347 + WorldMapElement.addObjects(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 324 } } } } } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-373872413" - ) - static final void method2040(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 11359 - if (var0 != Interpreter.clientPreferences.method2288()) { // L: 11360 - if (Interpreter.clientPreferences.method2288() == 0 && Client.currentTrackGroupId != -1) { // L: 11361 - WorldMapSection2.method4561(ArchiveLoader.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11362 - Client.field731 = false; // L: 11363 - } else if (var0 == 0) { // L: 11365 - WorldMapEvent.midiPcmStream.clear(); // L: 11367 - class273.musicPlayerStatus = 1; // L: 11368 - class147.musicTrackArchive = null; // L: 11369 - Client.field731 = false; // L: 11371 - } else if (class273.musicPlayerStatus != 0) { // L: 11374 - DevicePcmPlayerProvider.musicTrackVolume = var0; - } else { - WorldMapEvent.midiPcmStream.setPcmStreamVolume(var0); // L: 11375 - } - - Interpreter.clientPreferences.method2326(var0); // L: 11377 - } - - } // L: 11379 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index db8da3cdfd..cdd269de65 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,144 +4,150 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("mu") @Implements("Timer") public class Timer { + @ObfuscatedName("nf") + @ObfuscatedGetter( + intValue = -1068147205 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 4555750395140073021L + longValue = -3244593562421258965L ) - long field4185; - @ObfuscatedName("o") + long field4174; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -2846643341585363461L + longValue = 1641413866718548925L ) - long field4183; - @ObfuscatedName("h") - public boolean field4182; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 5666983759497851335L - ) - long field4189; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 796750526860624939L - ) - long field4186; - @ObfuscatedName("n") - @ObfuscatedGetter( - longValue = -3256458823420726931L - ) - long field4187; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 283694851 - ) - int field4188; + long field4172; + @ObfuscatedName("i") + public boolean field4179; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2009036561 + longValue = 7215038072955031607L ) - int field4184; - @ObfuscatedName("u") + long field4173; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 43489845 + longValue = -4614957419067559229L ) - int field4190; - @ObfuscatedName("r") + long field4175; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 425168073 + longValue = -584897100758161969L ) - int field4191; + long field4171; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 225650281 + ) + int field4177; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -648366881 + ) + int field4178; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -809978943 + ) + int field4176; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1244988383 + ) + int field4180; public Timer() { - this.field4185 = -1L; // L: 7 - this.field4183 = -1L; // L: 8 - this.field4182 = false; // L: 9 - this.field4189 = 0L; // L: 10 - this.field4186 = 0L; // L: 11 - this.field4187 = 0L; // L: 12 - this.field4188 = 0; // L: 13 - this.field4184 = 0; // L: 14 - this.field4190 = 0; // L: 15 - this.field4191 = 0; // L: 16 + this.field4174 = -1L; // L: 7 + this.field4172 = -1L; // L: 8 + this.field4179 = false; // L: 9 + this.field4173 = 0L; // L: 10 + this.field4175 = 0L; // L: 11 + this.field4171 = 0L; // L: 12 + this.field4177 = 0; // L: 13 + this.field4178 = 0; // L: 14 + this.field4176 = 0; // L: 15 + this.field4180 = 0; // L: 16 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2052102546" + descriptor = "(B)V", + garbageValue = "1" ) - public void method6594() { - this.field4185 = WorldMapSprite.method4989(); // L: 19 + public void method6574() { + this.field4174 = class136.method2931(); // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" + descriptor = "(I)V", + garbageValue = "369845371" ) - public void method6595() { - if (this.field4185 != -1L) { // L: 23 - this.field4186 = WorldMapSprite.method4989() - this.field4185; // L: 24 - this.field4185 = -1L; // L: 25 + public void method6562() { + if (this.field4174 != -1L) { // L: 23 + this.field4175 = class136.method2931() - this.field4174; // L: 24 + this.field4174 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-20934" + descriptor = "(II)V", + garbageValue = "-52559849" ) - public void method6596(int var1) { - this.field4183 = WorldMapSprite.method4989(); // L: 30 - this.field4188 = var1; // L: 31 + public void method6563(int var1) { + this.field4172 = class136.method2931(); // L: 30 + this.field4177 = var1; // L: 31 } // L: 32 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1987458157" + garbageValue = "-929974829" ) - public void method6597() { - if (this.field4183 != -1L) { // L: 35 - this.field4189 = WorldMapSprite.method4989() - this.field4183; // L: 36 - this.field4183 = -1L; // L: 37 + public void method6564() { + if (this.field4172 != -1L) { // L: 35 + this.field4173 = class136.method2931() - this.field4172; // L: 36 + this.field4172 = -1L; // L: 37 } - ++this.field4190; // L: 39 - this.field4182 = true; // L: 40 + ++this.field4176; // L: 39 + this.field4179 = true; // L: 40 } // L: 41 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "85953838" + descriptor = "(B)V", + garbageValue = "-127" ) - public void method6593() { - this.field4182 = false; // L: 44 - this.field4184 = 0; // L: 45 + public void method6580() { + this.field4179 = false; // L: 44 + this.field4178 = 0; // L: 45 } // L: 46 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-687283504" + garbageValue = "-1687652356" ) - public void method6598() { - this.method6597(); // L: 49 + public void method6566() { + this.method6564(); // L: 49 } // L: 50 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-893944716" + descriptor = "(Lpi;I)V", + garbageValue = "-598240073" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field4186; // L: 53 + long var2 = this.field4175; // L: 53 var2 /= 10L; // L: 55 if (var2 < 0L) { // L: 56 var2 = 0L; @@ -150,7 +156,7 @@ public class Timer { } var1.writeShort((int)var2); // L: 58 - long var4 = this.field4189; // L: 60 + long var4 = this.field4173; // L: 60 var4 /= 10L; // L: 62 if (var4 < 0L) { // L: 63 var4 = 0L; @@ -159,7 +165,7 @@ public class Timer { } var1.writeShort((int)var4); // L: 65 - long var6 = this.field4187; // L: 67 + long var6 = this.field4171; // L: 67 var6 /= 10L; // L: 69 if (var6 < 0L) { // L: 70 var6 = 0L; @@ -168,9 +174,9 @@ public class Timer { } var1.writeShort((int)var6); // L: 72 - var1.writeShort(this.field4188); // L: 74 - var1.writeShort(this.field4184); // L: 75 - var1.writeShort(this.field4190); // L: 76 - var1.writeShort(this.field4191); // L: 77 + var1.writeShort(this.field4177); // L: 74 + var1.writeShort(this.field4178); // L: 75 + var1.writeShort(this.field4176); // L: 76 + var1.writeShort(this.field4180); // L: 77 } // L: 78 } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 644c51c2db..01fb93dd83 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,5 +1,6 @@ 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; @@ -12,18 +13,24 @@ public class TriBool { ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lni;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lni;" ) @Export("TriBool_false") public static final TriBool TriBool_false; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 355454995 + ) + @Export("gameCyclesToDo") + static int gameCyclesToDo; static { TriBool_unknown = new TriBool(); // L: 4 @@ -34,50 +41,38 @@ public class TriBool { TriBool() { } // L: 8 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llu;IIIBZI)V", - garbageValue = "1922844254" + descriptor = "(IB)Lfc;", + garbageValue = "-12" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 223 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 224 - if (var8 == null) { // L: 225 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 226 - if (var8 == null) { // L: 227 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 228 - if (var8 != null) { // L: 229 - if (var5) { // L: 230 - var8.removeDual(); // L: 231 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 232 - --NetCache.NetCache_pendingWritesCount; // L: 233 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 234 - } - - } else { - if (!var5) { // L: 238 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 239 - if (var8 != null) { // L: 240 - return; - } - } - - var8 = new NetFileRequest(); // L: 242 - var8.archive = var0; // L: 243 - var8.crc = var3; // L: 244 - var8.padding = var4; // L: 245 - if (var5) { // L: 246 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 247 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 248 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 251 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 252 - ++NetCache.NetCache_pendingWritesCount; // L: 253 - } - - } + public static VarcInt method6839(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; + } else { + byte[] var2 = class384.VarcInt_archive.takeFile(19, var0); // L: 19 + var1 = new VarcInt(); // L: 20 + if (var2 != null) { // L: 21 + var1.method3414(new Buffer(var2)); } + + VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 22 + return var1; // L: 23 } - } // L: 236 255 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Ldf;", + garbageValue = "-468677079" + ) + static class118 method6838(int var0) { + class118 var1 = (class118)MusicPatchPcmStream.findEnumerated(class18.method258(), var0); // L: 35 + if (var1 == null) { + var1 = class118.field1433; // L: 36 + } + + return var1; // L: 37 + } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 076189c5e1..f34c01e398 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,93 +1,100 @@ import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("cw") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ley;" - ) - static ClanChannel field1344; - @ObfuscatedName("bo") - @ObfuscatedGetter( - intValue = -565666141 - ) - static int field1346; @ObfuscatedName("v") @Export("url") final URL url; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; // L: 115 - } // L: 116 + this.url = var1; // L: 114 + } // L: 115 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2022569902" + descriptor = "(B)Z", + garbageValue = "16" ) @Export("isDone") public boolean isDone() { - return this.isDone0; // L: 119 + return this.isDone0; // L: 118 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-892038744" + garbageValue = "1979081265" ) @Export("getResponse") public byte[] getResponse() { - return this.response0; // L: 123 + return this.response0; // L: 122 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "4111" - ) - public String method2546() { - return this.url.toString(); // L: 127 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIB)I", + descriptor = "(B)Ljava/lang/String;", garbageValue = "1" ) - static int method2545(int var0, int var1, int var2) { - return var0 << 28 | var1 << 14 | var2; // L: 34 + public String method2554() { + return this.url.toString(); // L: 126 } - @ObfuscatedName("ll") + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1489870449" + ) + public static void method2564() { + class54.reflectionChecks = new IterableNodeDeque(); // L: 24 + } // L: 25 + + @ObfuscatedName("ks") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "624212840" + garbageValue = "232574947" ) - static final void method2555(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { // L: 11753 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3056()) { // L: 11754 - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11755 - if (var2.rank == -1) { - PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 11757 - var3.packetBuffer.writeByte(3 + ItemLayer.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 11758 - var3.packetBuffer.writeByte(var0); // L: 11759 - var3.packetBuffer.writeShort(var1); // L: 11760 - var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 11761 - Client.packetWriter.addNode(var3); // L: 11762 - } - } + static void method2551(int var0, int var1) { + MenuAction var2 = Interpreter.tempMenuAction; // L: 11865 + if (var2 != null) { // L: 11867 + class9.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11868 } - } // L: 11756 11763 + + Interpreter.tempMenuAction = null; // L: 11871 + } // L: 11872 + + @ObfuscatedName("mr") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "1100" + ) + static void method2560() { + if (Client.field759 && GrandExchangeEvents.localPlayer != null) { // L: 12618 + int var0 = GrandExchangeEvents.localPlayer.pathX[0]; // L: 12619 + int var1 = GrandExchangeEvents.localPlayer.pathY[0]; // L: 12620 + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 12621 + return; + } + + class10.oculusOrbFocalPointX = GrandExchangeEvents.localPlayer.x; // L: 12622 + int var2 = WorldMapLabel.getTileHeight(GrandExchangeEvents.localPlayer.x, GrandExchangeEvents.localPlayer.y, class18.Client_plane) - Client.camFollowHeight; // L: 12623 + if (var2 < Decimator.field397) { // L: 12624 + Decimator.field397 = var2; + } + + ClientPacket.oculusOrbFocalPointY = GrandExchangeEvents.localPlayer.y; // L: 12625 + Client.field759 = false; // L: 12626 + } + + } // L: 12628 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 9b19f04e1e..6a317f0e4b 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -6,26 +6,19 @@ import java.util.LinkedList; import java.util.Queue; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("ck") @Implements("UrlRequester") public abstract class UrlRequester implements Runnable { - @ObfuscatedName("mn") - @ObfuscatedGetter( - intValue = -1967298029 - ) - @Export("menuHeight") - static int menuHeight; @ObfuscatedName("v") @Export("thread") final Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("requests") Queue requests; @@ -38,148 +31,147 @@ public abstract class UrlRequester implements Runnable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lct;I)V", - garbageValue = "-1783154457" + descriptor = "(Lcw;I)V", + garbageValue = "1977687936" ) - abstract void vmethod2538(UrlRequest var1) throws IOException; + abstract void vmethod2546(UrlRequest var1) throws IOException; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/net/URLConnection;B)V", + garbageValue = "28" + ) + void method2517(URLConnection var1) { + var1.setConnectTimeout(5000); // L: 49 + var1.setReadTimeout(5000); // L: 50 + var1.setUseCaches(false); // L: 51 + var1.setRequestProperty("Connection", "close"); // L: 52 + } // L: 53 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/net/URLConnection;Lcw;B)V", garbageValue = "4" ) - void method2524(URLConnection var1) { - var1.setConnectTimeout(5000); // L: 50 - var1.setReadTimeout(5000); // L: 51 - var1.setUseCaches(false); // L: 52 - var1.setRequestProperty("Connection", "close"); // L: 53 - } // L: 54 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;Lct;I)V", - garbageValue = "328398044" - ) - void method2515(URLConnection var1, UrlRequest var2) { - DataInputStream var3 = null; // L: 57 + void method2518(URLConnection var1, UrlRequest var2) { + DataInputStream var3 = null; // L: 56 try { - int var5 = var1.getContentLength(); // L: 60 - var3 = new DataInputStream(var1.getInputStream()); // L: 61 + int var5 = var1.getContentLength(); // L: 59 + var3 = new DataInputStream(var1.getInputStream()); // L: 60 byte[] var4; - if (var5 >= 0) { // L: 62 - var4 = new byte[var5]; // L: 63 - var3.readFully(var4); // L: 64 + if (var5 >= 0) { // L: 61 + var4 = new byte[var5]; // L: 62 + var3.readFully(var4); // L: 63 } else { - var4 = new byte[0]; // L: 67 - byte[] var6 = class355.ByteArrayPool_getArray(5000); // L: 68 + var4 = new byte[0]; // L: 66 + byte[] var6 = ArchiveDiskActionHandler.ByteArrayPool_getArray(5000); // L: 67 byte[] var8; - for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 69 70 74 - var8 = new byte[var4.length + var7]; // L: 71 - System.arraycopy(var4, 0, var8, 0, var4.length); // L: 72 - System.arraycopy(var6, 0, var8, var4.length, var7); // L: 73 + for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 68 69 73 + var8 = new byte[var4.length + var7]; // L: 70 + System.arraycopy(var4, 0, var8, 0, var4.length); // L: 71 + System.arraycopy(var6, 0, var8, var4.length, var7); // L: 72 } - ServerPacket.ByteArrayPool_release(var6); // L: 76 + UserComparator10.ByteArrayPool_release(var6); // L: 75 } - var2.response0 = var4; // L: 78 - } catch (IOException var10) { // L: 80 + var2.response0 = var4; // L: 77 + } catch (IOException var10) { // L: 79 } - if (var3 != null) { // L: 81 + if (var3 != null) { // L: 80 try { - var3.close(); // L: 83 - } catch (IOException var9) { // L: 85 + var3.close(); // L: 82 + } catch (IOException var9) { // L: 84 } } - } // L: 87 + } // L: 86 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lct;", - garbageValue = "1891707218" + descriptor = "(Ljava/net/URL;B)Lcw;", + garbageValue = "30" ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); // L: 90 - synchronized(this) { // L: 91 - this.requests.add(var2); // L: 92 - this.notify(); // L: 93 - return var2; // L: 95 + UrlRequest var2 = new UrlRequest(var1); // L: 89 + synchronized(this) { // L: 90 + this.requests.add(var2); // L: 91 + this.notify(); // L: 92 + return var2; // L: 94 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "28" + garbageValue = "73" ) @Export("close") public void close() { - this.isClosed = true; // L: 99 + this.isClosed = true; // L: 98 try { - synchronized(this) { // L: 101 - this.notify(); // L: 102 - } // L: 103 + synchronized(this) { // L: 100 + this.notify(); // L: 101 + } // L: 102 - this.thread.join(); // L: 104 - } catch (InterruptedException var4) { // L: 106 + this.thread.join(); // L: 103 + } catch (InterruptedException var4) { // L: 105 } - } // L: 107 + } // L: 106 public void run() { - while (!this.isClosed) { // L: 26 + while (!this.isClosed) { // L: 25 try { UrlRequest var1; - synchronized(this) { // L: 29 - var1 = (UrlRequest)this.requests.poll(); // L: 30 - if (var1 == null) { // L: 31 + synchronized(this) { // L: 28 + var1 = (UrlRequest)this.requests.poll(); // L: 29 + if (var1 == null) { // L: 30 try { - this.wait(); // L: 33 - } catch (InterruptedException var5) { // L: 35 + this.wait(); // L: 32 + } catch (InterruptedException var5) { // L: 34 } continue; } } - this.vmethod2538(var1); // L: 39 - } catch (Exception var7) { // L: 41 - class301.RunException_sendStackTrace((String)null, var7); // L: 42 + this.vmethod2546(var1); // L: 38 + } catch (Exception var7) { // L: 40 + Widget.RunException_sendStackTrace((String)null, var7); // L: 41 } } - } // L: 45 + } // L: 44 - @ObfuscatedName("f") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-106" + descriptor = "(III)V", + garbageValue = "-1814729991" ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 128 - int var2 = 0; // L: 129 + static final void method2537(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8618 + if (Client.showMouseOverText) { // L: 8619 + int var2 = GameBuild.method5773(); // L: 8620 + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8622 + var3 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8623 + var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + } else { + var3 = AbstractUserComparator.method6736(var2); // L: 8624 + } - for (int var3 = 0; var3 < var1; ++var3) { // L: 130 - var2 = (var2 << 5) - var2 + class123.charToByteCp1252(var0.charAt(var3)); + if (Client.menuOptionsCount > 2) { // L: 8625 + var3 = var3 + UserComparator9.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + RouteStrategy.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8626 + } } - - return var2; // L: 131 - } - - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2085317549" - ) - static void method2533(int var0) { - if (var0 != Client.loginState) { // L: 11960 - Client.loginState = var0; // L: 11961 - } - } // L: 11962 + } // L: 8627 } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 966ec87651..460e7edb5c 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nc") +@ObfuscatedName("nn") @Implements("User") public class User implements Comparable { - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqb;" ) @Export("username") Username username; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lqy;" + descriptor = "Lqb;" ) @Export("previousUsername") Username previousUsername; @@ -22,50 +22,50 @@ public class User implements Comparable { User() { } // L: 9 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnc;S)I", - garbageValue = "-8912" + descriptor = "(Lnn;I)I", + garbageValue = "842367957" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); // L: 32 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lqy;", - garbageValue = "1157869936" + descriptor = "(B)Lqb;", + garbageValue = "0" ) @Export("getUsername") public Username getUsername() { return this.username; // L: 12 } - @ObfuscatedName("ac") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-831214428" + garbageValue = "-348962548" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); // L: 16 17 } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1796686320" + garbageValue = "1206801353" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22 } - @ObfuscatedName("ay") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lqy;Lqy;I)V", - garbageValue = "1975154648" + descriptor = "(Lqb;Lqb;B)V", + garbageValue = "39" ) @Export("set") void set(Username var1, Username var2) { @@ -80,4 +80,14 @@ public class User implements Comparable { public int compareTo(Object var1) { return this.compareTo_user((User)var1); // L: 36 } + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "53251261" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 11175 + } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index a984b50690..4e60d400a6 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,7 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qd") +@ObfuscatedName("qh") @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("v") @@ -17,29 +17,19 @@ public class UserComparator1 implements Comparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnc;Lnc;I)I", - garbageValue = "-471042095" + descriptor = "(Lnn;Lnn;I)I", + garbageValue = "-206715996" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((User)var1, (User)var2); // L: 18 } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-889372526" - ) - public static void method8029() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90 - } // L: 91 + public boolean equals(Object var1) { + return super.equals(var1); // L: 22 + } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index a7415c5de9..b4772979bc 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -2,17 +2,10 @@ 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("dk") +@ObfuscatedName("dp") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("ap") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -23,8 +16,8 @@ public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;I)I", - garbageValue = "-86339846" + descriptor = "(Lnf;Lnf;I)I", + garbageValue = "-1424673720" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,42 +32,62 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("f") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "311319485" + descriptor = "([BI)V", + garbageValue = "1465062374" ) - public static int method2615(int var0) { - return class121.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 77 + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4159) { // L: 116 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 117 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4160) { // L: 120 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 121 + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4161) { // L: 124 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 125 + } else if (var0.length == 30000 && ByteArrayPool.field4163 < ByteArrayPool.field4152) { // L: 128 + ByteArrayPool.field4162[++ByteArrayPool.field4163 - 1] = var0; // L: 129 + } else { + if (BoundaryObject.ByteArrayPool_arrays != null) { // L: 132 + for (int var1 = 0; var1 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 133 + if (var0.length == FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var1] && class128.ByteArrayPool_altSizeArrayCounts[var1] < BoundaryObject.ByteArrayPool_arrays[var1].length) { // L: 134 + BoundaryObject.ByteArrayPool_arrays[var1][class128.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 135 + return; // L: 136 + } + } + } + + } + } // L: 118 122 126 130 140 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1291930273" + ) + static void method2622() { + ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 + } // L: 79 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "56" + ) + public static boolean method2629(int var0) { + return (var0 >> 31 & 1) != 0; // L: 41 } - @ObfuscatedName("c") + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "64" + descriptor = "(III)Lgt;", + garbageValue = "1713441982" ) - static int method2614(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1101 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.x; // L: 1103 - return 1; // L: 1104 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.y; // L: 1107 - return 1; // L: 1108 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.width; // L: 1111 - return 1; // L: 1112 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.height; // L: 1115 - return 1; // L: 1116 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119 - return 1; // L: 1120 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123 - return 1; // L: 1124 - } else { - return 2; // L: 1126 - } + static RouteStrategy method2623(int var0, int var1) { + Client.field783.approxDestinationX = var0; // L: 8598 + Client.field783.approxDestinationY = var1; // L: 8599 + Client.field783.approxDestinationSizeX = 1; // L: 8600 + Client.field783.approxDestinationSizeY = 1; // L: 8601 + return Client.field783; // L: 8602 } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index fff3a0a4a4..e854d84601 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,15 +4,9 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qa") +@ObfuscatedName("qr") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("uj") - @ObfuscatedSignature( - descriptor = "Lov;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -23,8 +17,8 @@ public class UserComparator2 implements Comparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnc;Lnc;I)I", - garbageValue = "988233292" + descriptor = "(Lnn;Lnn;I)I", + garbageValue = "812232162" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { @@ -38,107 +32,4 @@ public class UserComparator2 implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILbo;ZS)I", - garbageValue = "-23460" - ) - static int method8042(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 427 - return FontName.method7511(var0, var1, var2); - } else if (var0 < 1100) { // L: 428 - return class305.method5787(var0, var1, var2); - } else if (var0 < 1200) { // L: 429 - return class117.method2709(var0, var1, var2); - } else if (var0 < 1300) { // L: 430 - return WorldMapScaleHandler.method5134(var0, var1, var2); - } else if (var0 < 1400) { // L: 431 - return ItemLayer.method3896(var0, var1, var2); - } else if (var0 < 1500) { // L: 432 - return class193.method3879(var0, var1, var2); - } else if (var0 < 1600) { // L: 433 - return UserComparator10.method2614(var0, var1, var2); - } else if (var0 < 1700) { // L: 434 - return GameBuild.method5775(var0, var1, var2); - } else if (var0 < 1800) { // L: 435 - return GrandExchangeEvents.method5993(var0, var1, var2); - } else if (var0 < 1900) { // L: 436 - return class136.method2896(var0, var1, var2); - } else if (var0 < 2000) { // L: 437 - return SecureRandomCallable.method2064(var0, var1, var2); - } else if (var0 < 2100) { // L: 438 - return class305.method5787(var0, var1, var2); - } else if (var0 < 2200) { // L: 439 - return class117.method2709(var0, var1, var2); - } else if (var0 < 2300) { // L: 440 - return WorldMapScaleHandler.method5134(var0, var1, var2); - } else if (var0 < 2400) { // L: 441 - return ItemLayer.method3896(var0, var1, var2); - } else if (var0 < 2500) { // L: 442 - return class193.method3879(var0, var1, var2); - } else if (var0 < 2600) { // L: 443 - return SoundCache.method803(var0, var1, var2); - } else if (var0 < 2700) { // L: 444 - return Client.method1606(var0, var1, var2); - } else if (var0 < 2800) { // L: 445 - return class115.method2681(var0, var1, var2); - } else if (var0 < 2900) { // L: 446 - return class305.method5786(var0, var1, var2); - } else if (var0 < 3000) { // L: 447 - return SecureRandomCallable.method2064(var0, var1, var2); - } else if (var0 < 3200) { // L: 448 - return class17.method259(var0, var1, var2); - } else if (var0 < 3300) { // L: 449 - return DirectByteArrayCopier.method5540(var0, var1, var2); - } else if (var0 < 3400) { // L: 450 - return class119.method2741(var0, var1, var2); - } else if (var0 < 3500) { // L: 451 - return class14.method184(var0, var1, var2); - } else if (var0 < 3600) { // L: 452 - return FloorOverlayDefinition.method3773(var0, var1, var2); - } else if (var0 < 3700) { // L: 453 - return class271.method5256(var0, var1, var2); - } else if (var0 < 3800) { // L: 454 - return class132.method2861(var0, var1, var2); - } else if (var0 < 3900) { // L: 455 - return MusicPatchPcmStream.method5485(var0, var1, var2); - } else if (var0 < 4000) { // L: 456 - return Language.method6125(var0, var1, var2); - } else if (var0 < 4100) { - return class17.method280(var0, var1, var2); // L: 457 - } else if (var0 < 4200) { // L: 458 - return class19.method314(var0, var1, var2); - } else if (var0 < 4300) { // L: 459 - return UserComparator8.method2569(var0, var1, var2); - } else if (var0 < 5100) { // L: 460 - return DevicePcmPlayerProvider.method384(var0, var1, var2); - } else if (var0 < 5400) { // L: 461 - return ClanChannel.method3078(var0, var1, var2); - } else if (var0 < 5600) { // L: 462 - return WorldMapIcon_1.method4559(var0, var1, var2); - } else if (var0 < 5700) { // L: 463 - return JagexCache.method3227(var0, var1, var2); - } else if (var0 < 6300) { // L: 464 - return UserComparator4.method2567(var0, var1, var2); - } else if (var0 < 6600) { // L: 465 - return HitSplatDefinition.method3642(var0, var1, var2); - } else if (var0 < 6700) { // L: 466 - return class149.method3081(var0, var1, var2); - } else if (var0 < 6800) { // L: 467 - return Language.method6121(var0, var1, var2); - } else if (var0 < 6900) { // L: 468 - return MilliClock.method3293(var0, var1, var2); - } else if (var0 < 7000) { // L: 469 - return Language.method6132(var0, var1, var2); - } else if (var0 < 7100) { // L: 470 - return UserComparator5.method2595(var0, var1, var2); - } else if (var0 < 7200) { // L: 471 - return class239.method4999(var0, var1, var2); - } else if (var0 < 7300) { // L: 472 - return PcmPlayer.method770(var0, var1, var2); - } else { - return var0 < 7500 ? ModeWhere.method6144(var0, var1, var2) : 2; // L: 473 474 - } - } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 8be0a65d70..0b42c14a1e 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -2,6 +2,7 @@ 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("dg") @Implements("UserComparator3") @@ -16,8 +17,8 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;I)I", - garbageValue = "2079735474" + descriptor = "(Lnf;Lnf;B)I", + garbageValue = "-94" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,33 +33,216 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(IB)Lgs;", + garbageValue = "127" ) - public static boolean method2600(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 230 231 + public static HitSplatDefinition method2602(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52 + if (var1 != null) { // L: 53 + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 + var1 = new HitSplatDefinition(); // L: 55 + if (var2 != null) { // L: 56 + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 + return var1; // L: 58 + } } - @ObfuscatedName("ln") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkn;I)Lkn;", - garbageValue = "-750472197" + descriptor = "(ILbd;ZB)I", + garbageValue = "105" ) - static Widget method2601(Widget var0) { - int var1 = class270.method5241(WorldMapSection2.getWidgetFlags(var0)); // L: 11793 - if (var1 == 0) { // L: 11794 - return null; + static int method2607(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 858 + Widget var4; + if (var0 >= 2000) { // L: 860 + var0 -= 1000; // L: 861 + var4 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 862 + var3 = false; // L: 863 } else { - for (int var2 = 0; var2 < var1; ++var2) { // L: 11795 - var0 = HorizontalAlignment.getWidget(var0.parentId); // L: 11796 - if (var0 == null) { // L: 11797 - return null; + var4 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 865 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866 + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 867 + if (var11 >= 0 && var11 <= 9) { // L: 868 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 872 + return 1; // L: 873 + } else { + --class122.Interpreter_stringStackSize; // L: 869 + return 1; // L: 870 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875 + Interpreter.Interpreter_intStackSize -= 2; // L: 876 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 877 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 878 + var4.parent = ItemComposition.getWidgetChild(var11, var6); // L: 879 + return 1; // L: 880 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882 + var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 883 + return 1; // L: 884 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 887 + return 1; // L: 888 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890 + var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 891 + return 1; // L: 892 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894 + var4.dataText = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 895 + return 1; // L: 896 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898 + var4.spellActionName = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 899 + return 1; // L: 900 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902 + var4.actions = null; // L: 903 + return 1; // L: 904 + } else if (var0 == 1308) { // L: 906 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 907 + return 1; // L: 908 + } else if (var0 == 1309) { // L: 910 + --Interpreter.Interpreter_intStackSize; // L: 911 + return 1; // L: 912 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944 + Interpreter.Interpreter_intStackSize -= 2; // L: 945 + var5 = 10; // L: 946 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 947 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 948 + ArchiveDiskActionHandler.Widget_setKey(var4, var5, var8, var9); // L: 949 + return 1; // L: 950 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952 + Interpreter.Interpreter_intStackSize -= 3; // L: 953 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 954 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 955 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 956 + if (var11 >= 0 && var11 <= 9) { // L: 957 + EnumComposition.Widget_setKeyRate(var4, var11, var6, var7); // L: 960 + return 1; // L: 961 + } else { + throw new RuntimeException(); // L: 958 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963 + var5 = 10; // L: 964 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 965 + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 966 + EnumComposition.Widget_setKeyRate(var4, var5, var6, var7); // L: 967 + return 1; // L: 968 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970 + --Interpreter.Interpreter_intStackSize; // L: 971 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 972 + if (var11 >= 0 && var11 <= 9) { // L: 973 + class67.Widget_setKeyIgnoreHeld(var4, var11); // L: 976 + return 1; // L: 977 + } else { + throw new RuntimeException(); // L: 974 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979 + var5 = 10; // L: 980 + class67.Widget_setKeyIgnoreHeld(var4, var5); // L: 981 + return 1; // L: 982 + } else { + return 2; // L: 984 + } + } else { + byte[] var10 = null; // L: 915 + var8 = null; // L: 916 + if (var3) { // L: 917 + Interpreter.Interpreter_intStackSize -= 10; // L: 918 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921 + } + + if (var7 > 0) { // L: 923 + var10 = new byte[var7 / 2]; // L: 924 + var8 = new byte[var7 / 2]; // L: 925 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; // L: 927 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; // L: 928 + } + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 933 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 934 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 935 + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 937 + if (var7 >= 0 && var7 <= 9) { // L: 938 + ArchiveDiskActionHandler.Widget_setKey(var4, var7, var10, var8); // L: 941 + return 1; // L: 942 + } else { + throw new RuntimeException(); // L: 939 + } + } + } + } + } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "485258649" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class18.Client_plane][var0][var1]; // L: 8007 + if (var2 == null) { // L: 8008 + ArchiveLoader.scene.removeGroundItemPile(class18.Client_plane, var0, var1); // L: 8009 + } else { + long var3 = -99999999L; // L: 8012 + TileItem var5 = null; // L: 8013 + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8014 8015 8023 + ItemComposition var7 = class19.ItemDefinition_get(var6.id); // L: 8016 + long var11 = (long)var7.price; // L: 8017 + if (var7.isStackable == 1) { // L: 8018 + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { // L: 8019 + var3 = var11; // L: 8020 + var5 = var6; // L: 8021 } } - return var0; // L: 11799 + if (var5 == null) { // L: 8025 + ArchiveLoader.scene.removeGroundItemPile(class18.Client_plane, var0, var1); // L: 8026 + } else { + var2.addLast(var5); // L: 8029 + TileItem var13 = null; // L: 8030 + TileItem var8 = null; // L: 8031 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8032 8033 8038 + if (var5.id != var6.id) { // L: 8034 + if (var13 == null) { // L: 8035 + var13 = var6; + } + + if (var6.id != var13.id && var8 == null) { // L: 8036 + var8 = var6; + } + } + } + + long var9 = GameObject.calculateTag(var0, var1, 3, false, 0); // L: 8040 + ArchiveLoader.scene.newGroundItemPile(class18.Client_plane, var0, var1, WorldMapLabel.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class18.Client_plane), var5, var9, var13, var8); // L: 8041 + } } - } + } // L: 8010 8027 8042 } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 1b147acae9..c9d058072f 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -3,9 +3,8 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ce") +@ObfuscatedName("cx") @Implements("UserComparator4") public class UserComparator4 implements Comparator { @ObfuscatedName("v") @@ -18,137 +17,19 @@ public class UserComparator4 implements Comparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;B)I", - garbageValue = "99" + descriptor = "(Lnf;Lnf;B)I", + garbageValue = "66" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "109147349" - ) - static int method2563(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 258 - return NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var2 ? class291.NetCache_responseArchiveBuffer.offset * 99 / (class291.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1 : 0; // L: 259 260 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "78" - ) - public static int method2566(int var0) { - if (var0 > 0) { // L: 183 - return 1; - } else { - return var0 < 0 ? -1 : 0; // L: 184 185 - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "2116886203" - ) - static int method2567(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3845 - class295.Interpreter_intStackSize -= 2; // L: 3846 - Client.field745 = (short)FaceNormal.method4313(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]); // L: 3847 - if (Client.field745 <= 0) { // L: 3848 - Client.field745 = 256; - } - - Client.field706 = (short)FaceNormal.method4313(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 3849 - if (Client.field706 <= 0) { // L: 3850 - Client.field706 = 256; - } - - return 1; // L: 3851 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3853 - class295.Interpreter_intStackSize -= 2; // L: 3854 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3855 - if (Client.zoomHeight <= 0) { // L: 3856 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3857 - if (Client.zoomWidth <= 0) { // L: 3858 - Client.zoomWidth = 320; - } - - return 1; // L: 3859 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3861 - class295.Interpreter_intStackSize -= 4; // L: 3862 - Client.field562 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3863 - if (Client.field562 <= 0) { // L: 3864 - Client.field562 = 1; - } - - Client.field750 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3865 - if (Client.field750 <= 0) { // L: 3866 - Client.field750 = 32767; - } else if (Client.field750 < Client.field562) { // L: 3867 - Client.field750 = Client.field562; - } - - Client.field751 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3868 - if (Client.field751 <= 0) { // L: 3869 - Client.field751 = 1; - } - - Client.field752 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 3870 - if (Client.field752 <= 0) { // L: 3871 - Client.field752 = 32767; - } else if (Client.field752 < Client.field751) { // L: 3872 - Client.field752 = Client.field751; - } - - return 1; // L: 3873 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3875 - if (Client.viewportWidget != null) { // L: 3876 - Language.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3877 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3878 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3879 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3882 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3883 - } - - return 1; // L: 3885 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3887 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3888 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3889 - return 1; // L: 3890 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3892 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = GraphicsObject.method1865(Client.field745); // L: 3893 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = GraphicsObject.method1865(Client.field706); // L: 3894 - return 1; // L: 3895 - } else if (var0 == 6220) { // L: 3897 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3898 - return 1; // L: 3899 - } else if (var0 == 6221) { // L: 3901 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3902 - return 1; // L: 3903 - } else if (var0 == 6222) { // L: 3905 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class4.canvasWidth; // L: 3906 - return 1; // L: 3907 - } else if (var0 == 6223) { // L: 3909 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class309.canvasHeight; // L: 3910 - return 1; // L: 3911 - } else { - return 2; // L: 3913 - } + public boolean equals(Object var1) { + return super.equals(var1); // L: 22 } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index f6f83fa946..2ff0b9b49e 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,24 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("dd") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("do") - @Export("mouseCam") - static boolean mouseCam; @ObfuscatedName("v") @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;I)I", - garbageValue = "-1157970116" + descriptor = "(Lnf;Lnf;I)I", + garbageValue = "-2036334399" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,72 +36,57 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lfq;", - garbageValue = "-2066827638" + descriptor = "(IIIB)Lqi;", + garbageValue = "-28" ) - public static Clock method2592() { - try { - return new NanoClock(); // L: 8 - } catch (Throwable var1) { // L: 10 - return new MilliClock(); // L: 11 - } + static SpritePixels method2599(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 + long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41 + return (SpritePixels)var3.get(var4); // L: 43 } - @ObfuscatedName("az") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-966652469" + descriptor = "(Lln;Lln;B)V", + garbageValue = "0" ) - static int method2595(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4547 - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4551 - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4555 - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4559 - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4563 - if (var0 != 7031 && var0 != 7032) { // L: 4567 - if (var0 == 7033) { // L: 4572 - --ChatChannel.Interpreter_stringStackSize; // L: 4573 - return 1; // L: 4574 - } else if (var0 != 7036 && var0 != 7037) { // L: 4576 - if (var0 == 7038) { // L: 4580 - --class295.Interpreter_intStackSize; // L: 4581 - return 1; // L: 4582 - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4584 - return 2; // L: 4588 - } else { - --class295.Interpreter_intStackSize; // L: 4585 - return 1; // L: 4586 - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 4577 - return 1; // L: 4578 - } - } else { - --ChatChannel.Interpreter_stringStackSize; // L: 4568 - --class295.Interpreter_intStackSize; // L: 4569 - return 1; // L: 4570 - } - } else { - --class295.Interpreter_intStackSize; // L: 4564 - return 1; // L: 4565 - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 4560 - return 1; // L: 4561 - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 4556 - return 1; // L: 4557 - } - } else { - class295.Interpreter_intStackSize -= 3; // L: 4552 - return 1; // L: 4553 - } + public static void method2592(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 32 + HealthBarDefinition.field1863 = var1; // L: 33 + } // L: 34 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(III)Lbd;", + garbageValue = "121897231" + ) + static Script method2600(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 56 + if (var2 != null) { // L: 57 + return var2; // L: 58 } else { - class295.Interpreter_intStackSize -= 5; // L: 4548 - return 1; // L: 4549 + String var3 = String.valueOf(var0); // L: 60 + int var4 = class152.archive12.getGroupId(var3); // L: 61 + if (var4 == -1) { // L: 62 + return null; // L: 63 + } else { + byte[] var5 = class152.archive12.takeFileFlat(var4); // L: 65 + if (var5 != null) { // L: 66 + if (var5.length <= 1) { // L: 67 + return null; // L: 68 + } + + var2 = PcmPlayer.newScript(var5); // L: 70 + if (var2 != null) { // L: 71 + Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 72 + return var2; // L: 73 + } + } + + return null; // L: 76 + } } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index f2fae1aeeb..d63f8d7662 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -16,8 +16,8 @@ public class UserComparator6 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;B)I", - garbageValue = "114" + descriptor = "(Lnf;Lnf;B)I", + garbageValue = "-108" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,52 +32,37 @@ public class UserComparator6 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "551180200" + descriptor = "(IB)Lgi;", + garbageValue = "-4" ) - static final int method2631(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 970 - int var4 = var0 & var2 - 1; // L: 971 - int var5 = var1 / var2; // L: 972 - int var6 = var1 & var2 - 1; // L: 973 - int var7 = Language.method6137(var3, var5); // L: 974 - int var8 = Language.method6137(var3 + 1, var5); // L: 975 - int var9 = Language.method6137(var3, var5 + 1); // L: 976 - int var10 = Language.method6137(var3 + 1, var5 + 1); // L: 977 - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 980 - int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 981 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 986 - int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 987 - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 992 - int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 993 - return var15; // L: 995 + public static VarbitComposition method2643(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28 + if (var1 != null) { // L: 29 + return var1; + } else { + byte[] var2 = class11.VarbitDefinition_archive.takeFile(14, var0); // L: 30 + var1 = new VarbitComposition(); // L: 31 + if (var2 != null) { // L: 32 + var1.decode(new Buffer(var2)); + } + + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } } - @ObfuscatedName("gv") + @ObfuscatedName("lv") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-328819266" + descriptor = "([BII)V", + garbageValue = "1110458768" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field529 = 0L; // L: 3924 - if (var0 >= 2) { // L: 3925 - Client.isResizable = true; - } else { - Client.isResizable = false; // L: 3926 + static void method2646(byte[] var0, int var1) { + if (Client.randomDatData == null) { // L: 12567 + Client.randomDatData = new byte[24]; } - if (ReflectionCheck.getWindowedMode() == 1) { // L: 3927 - UserComparator10.client.setMaxCanvasSize(765, 503); // L: 3928 - } else { - UserComparator10.client.setMaxCanvasSize(7680, 2160); // L: 3931 - } - - if (Client.gameState >= 25) { // L: 3933 - class17.method228(); - } - - } // L: 3934 + class350.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 12568 + } // L: 12569 } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 1e34b18143..8d5a78bb28 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,18 +1,11 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dj") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1212274935 - ) - static int field1354; @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -23,8 +16,8 @@ public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;I)I", - garbageValue = "-2106279349" + descriptor = "(Lnf;Lnf;I)I", + garbageValue = "1628043901" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -41,68 +34,22 @@ public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "2" + descriptor = "(Lln;Lln;Lln;B)V", + garbageValue = "1" ) - static void method2584(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 - var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 - } // L: 40 + public static void method2590(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 + class282.field3261 = var1; // L: 47 + class349.HitSplatDefinition_fontsArchive = var2; // L: 48 + } // L: 49 - @ObfuscatedName("h") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49 - if (0L == var0 % 37L) { // L: 50 - return null; - } else { - int var2 = 0; // L: 51 - - for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 52 53 55 - ++var2; // L: 54 - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 57 58 67 - long var6 = var0; // L: 59 - var0 /= 37L; // L: 60 - var8 = class349.base37Table[(int)(var6 - var0 * 37L)]; // L: 61 - if (var8 == '_') { // L: 62 - int var9 = var5.length() - 1; // L: 63 - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 64 - var8 = 160; // L: 65 - } - } - - var5.reverse(); // L: 69 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70 - return var5.toString(); // L: 71 - } - } else { - return null; - } - } - - @ObfuscatedName("fg") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1287758348" + descriptor = "(IB)Lfe;", + garbageValue = "-59" ) - static final void method2577() { - if (class345.ClanChat_inClanChat) { // L: 3372 - if (class230.friendsChat != null) { // L: 3373 - class230.friendsChat.sort(); // L: 3374 - } - - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3377 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3378 - var1.clearIsInFriendsChat(); // L: 3379 - } - - class345.ClanChat_inClanChat = false; // L: 3382 - } - - } // L: 3384 + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63 + } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 5ccd6accf6..cc246fd742 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -2,17 +2,16 @@ 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("dd") +@ObfuscatedName("dr") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("ik") + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "[Lqx;" + descriptor = "Llx;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; + @Export("archive1") + static Archive archive1; @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -23,8 +22,8 @@ public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;I)I", - garbageValue = "155176144" + descriptor = "(Lnf;Lnf;I)I", + garbageValue = "1968732766" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -43,278 +42,50 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpy;I)V", - garbageValue = "-1723249342" + descriptor = "(Ldt;[F[FB)V", + garbageValue = "-60" ) - static final void method2575(PacketBuffer var0) { - int var1 = 0; // L: 89 - var0.importIndex(); // L: 90 - - byte[] var10000; - int var2; - int var4; - int var5; - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 91 - var5 = Players.Players_indices[var2]; // L: 92 - if ((Players.field1288[var5] & 1) == 0) { // L: 93 - if (var1 > 0) { // L: 94 - --var1; // L: 95 - var10000 = Players.field1288; // L: 96 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 99 - if (var4 == 0) { // L: 100 - var1 = NPCComposition.method3491(var0); // L: 101 - var10000 = Players.field1288; // L: 102 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - WorldMapLabelSize.readPlayerUpdate(var0, var5); // L: 105 - } - } + static void method2574(class117 var0, float[] var1, float[] var2) { + if (var0 != null) { // L: 285 + var0.field1422 = var1[0]; // L: 288 + float var3 = var1[3] - var1[0]; // L: 289 + float var4 = var2[3] - var2[0]; // L: 290 + float var5 = var1[1] - var1[0]; // L: 291 + float var6 = 0.0F; // L: 292 + float var7 = 0.0F; // L: 293 + if (0.0D != (double)var5) { // L: 294 + var6 = (var2[1] - var2[0]) / var5; // L: 295 } + + var5 = var1[3] - var1[2]; // L: 297 + if ((double)var5 != 0.0D) { // L: 298 + var7 = (var2[3] - var2[2]) / var5; // L: 299 + } + + float var8 = 1.0F / (var3 * var3); // L: 301 + float var9 = var3 * var6; // L: 302 + float var10 = var3 * var7; // L: 303 + var0.field1415[0] = (var9 + var10 - var4 - var4) * var8 / var3; // L: 304 + var0.field1415[1] = var8 * (var4 + var4 + var4 - var9 - var9 - var10); // L: 305 + var0.field1415[2] = var6; // L: 306 + var0.field1415[3] = var2[0]; // L: 307 } + } // L: 286 308 - var0.exportIndex(); // L: 108 - if (var1 != 0) { // L: 109 - throw new RuntimeException(); // L: 110 - } else { - var0.importIndex(); // L: 112 - - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 113 - var5 = Players.Players_indices[var2]; // L: 114 - if ((Players.field1288[var5] & 1) != 0) { // L: 115 - if (var1 > 0) { // L: 116 - --var1; // L: 117 - var10000 = Players.field1288; // L: 118 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 121 - if (var4 == 0) { // L: 122 - var1 = NPCComposition.method3491(var0); // L: 123 - var10000 = Players.field1288; // L: 124 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - WorldMapLabelSize.readPlayerUpdate(var0, var5); // L: 127 - } - } - } - } - - var0.exportIndex(); // L: 130 - if (var1 != 0) { // L: 131 - throw new RuntimeException(); // L: 132 - } else { - var0.importIndex(); // L: 134 - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 135 - var5 = Players.Players_emptyIndices[var2]; // L: 136 - if ((Players.field1288[var5] & 1) != 0) { // L: 137 - if (var1 > 0) { // L: 138 - --var1; // L: 139 - var10000 = Players.field1288; // L: 140 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 143 - if (var4 == 0) { // L: 144 - var1 = NPCComposition.method3491(var0); // L: 145 - var10000 = Players.field1288; // L: 146 - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (class9.updateExternalPlayer(var0, var5)) { // L: 149 - var10000 = Players.field1288; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); // L: 152 - if (var1 != 0) { // L: 153 - throw new RuntimeException(); // L: 154 - } else { - var0.importIndex(); // L: 156 - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 157 - var5 = Players.Players_emptyIndices[var2]; // L: 158 - if ((Players.field1288[var5] & 1) == 0) { // L: 159 - if (var1 > 0) { // L: 160 - --var1; // L: 161 - var10000 = Players.field1288; // L: 162 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 165 - if (var4 == 0) { // L: 166 - var1 = NPCComposition.method3491(var0); // L: 167 - var10000 = Players.field1288; // L: 168 - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (class9.updateExternalPlayer(var0, var5)) { // L: 171 - var10000 = Players.field1288; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); // L: 174 - if (var1 != 0) { // L: 175 - throw new RuntimeException(); // L: 176 - } else { - Players.Players_count = 0; // L: 178 - Players.Players_emptyIdxCount = 0; // L: 179 - - for (var2 = 1; var2 < 2048; ++var2) { // L: 180 - var10000 = Players.field1288; // L: 181 - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var3 = Client.players[var2]; // L: 182 - if (var3 != null) { // L: 183 - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 184 - } - } - - } - } - } - } - } // L: 186 - - @ObfuscatedName("ab") + @ObfuscatedName("gt") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "572992012" + descriptor = "(Lcb;I)V", + garbageValue = "1404835546" ) - static int method2569(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3429 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class67.ItemDefinition_get(var3).name; // L: 3430 - return 1; // L: 3431 - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 3433 - class295.Interpreter_intStackSize -= 2; // L: 3434 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3435 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3436 - var5 = class67.ItemDefinition_get(var3); // L: 3437 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3439 - } - - return 1; // L: 3440 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442 - class295.Interpreter_intStackSize -= 2; // L: 3443 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3444 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3445 - var5 = class67.ItemDefinition_get(var3); // L: 3446 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3448 - } - - return 1; // L: 3449 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3452 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).price; // L: 3453 - return 1; // L: 3454 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3457 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458 - return 1; // L: 3459 - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3462 - var7 = class67.ItemDefinition_get(var3); // L: 3463 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3465 - } - - return 1; // L: 3466 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3469 - var7 = class67.ItemDefinition_get(var3); // L: 3470 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3472 - } - - return 1; // L: 3473 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3476 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477 - return 1; // L: 3478 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3481 - var7 = class67.ItemDefinition_get(var3); // L: 3482 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3484 - } - - return 1; // L: 3485 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3488 - var7 = class67.ItemDefinition_get(var3); // L: 3489 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3491 - } - - return 1; // L: 3492 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494 - String var6 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3495 - var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3496 - class13.findItemDefinitions(var6, var4 == 1); // L: 3497 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = PendingSpawn.foundItemIdCount; // L: 3498 - return 1; // L: 3499 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506 - MouseRecorder.foundItemIndex = 0; // L: 3507 - return 1; // L: 3508 - } else if (var0 == 4213) { // L: 3510 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3511 - var4 = class67.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512 - if (var4 == -1) { // L: 3513 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4; // L: 3514 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517 - } - - return 1; // L: 3519 - } else { - return 2; // L: 3521 - } - } else { - if (class14.foundItemIds != null && MouseRecorder.foundItemIndex < PendingSpawn.foundItemIdCount) { // L: 3502 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class14.foundItemIds[++MouseRecorder.foundItemIndex - 1] & '\uffff'; // L: 3503 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 3504 - } - } - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1574231542" - ) - static void method2576(int var0, int var1) { - ScriptFrame.method1083(PacketWriter.tempMenuAction, var0, var1); // L: 11239 - PacketWriter.tempMenuAction = null; // L: 11240 - } // L: 11241 + static final void method2578(Actor var0) { + int var1 = Math.max(1, var0.field1143 - Client.cycle); // L: 4055 + int var2 = var0.field1150 * 64 + var0.field1129 * 128; // L: 4056 + int var3 = var0.field1150 * 64 + var0.field1160 * 128; // L: 4057 + var0.x += (var2 - var0.x) / var1; // L: 4058 + var0.y += (var3 - var0.y) / var1; // L: 4059 + var0.field1179 = 0; // L: 4060 + var0.orientation = var0.field1135; // L: 4061 + } // L: 4062 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index be3c6a0e6c..6d389b9dc5 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,17 +1,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dj") +@ObfuscatedName("de") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "Lci;" + @ObfuscatedName("fi") + @ObfuscatedGetter( + intValue = -976382879 ) - @Export("urlRequester") - static UrlRequester urlRequester; + @Export("js5Port") + static int js5Port; @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -22,8 +24,8 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnl;Lnl;B)I", - garbageValue = "71" + descriptor = "(Lnf;Lnf;I)I", + garbageValue = "-1564138205" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -35,6 +37,373 @@ public class UserComparator9 extends AbstractUserComparator { } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-27" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ldt;FZI)F", + garbageValue = "1213299067" + ) + static float method2616(class117 var0, float var1, boolean var2) { + float var3 = 0.0F; // L: 199 + if (var0 != null && var0.method2715() != 0) { // L: 200 + float var4 = (float)var0.field1411[0].field1373; // L: 203 + float var5 = (float)var0.field1411[var0.method2715() - 1].field1373; // L: 204 + float var6 = var5 - var4; // L: 205 + if (0.0D == (double)var6) { // L: 206 + return var0.field1411[0].field1376; // L: 207 + } else { + float var7 = 0.0F; // L: 209 + if (var1 > var5) { // L: 210 + var7 = (var1 - var5) / var6; // L: 211 + } else { + var7 = (var1 - var4) / var6; // L: 214 + } + + double var8 = (double)((int)var7); // L: 216 + float var10 = Math.abs((float)((double)var7 - var8)); // L: 217 + float var11 = var10 * var6; // L: 218 + var8 = Math.abs(1.0D + var8); // L: 219 + double var12 = var8 / 2.0D; // L: 220 + double var14 = (double)((int)var12); // L: 221 + var10 = (float)(var12 - var14); // L: 222 + float var16; + float var17; + if (var2) { // L: 225 + if (var0.field1409 == class116.field1401) { // L: 226 + if (0.0D != (double)var10) { // L: 227 + var11 += var4; // L: 228 + } else { + var11 = var5 - var11; // L: 231 + } + } else if (var0.field1409 != class116.field1400 && var0.field1409 != class116.field1406) { // L: 234 + if (var0.field1409 == class116.field1399) { // L: 237 + var11 = var4 - var1; // L: 238 + var16 = var0.field1411[0].field1371; // L: 239 + var17 = var0.field1411[0].field1377; // L: 240 + var3 = var0.field1411[0].field1376; // L: 241 + if ((double)var16 != 0.0D) { // L: 242 + var3 -= var17 * var11 / var16; // L: 243 + } + + return var3; // L: 245 + } + } else { + var11 = var5 - var11; // L: 235 + } + } else if (var0.field1410 == class116.field1401) { // L: 249 + if (0.0D != (double)var10) { // L: 250 + var11 = var5 - var11; // L: 251 + } else { + var11 += var4; // L: 254 + } + } else if (var0.field1410 != class116.field1400 && var0.field1410 != class116.field1406) { // L: 257 + if (var0.field1410 == class116.field1399) { // L: 260 + var11 = var1 - var5; // L: 261 + var16 = var0.field1411[var0.method2715() - 1].field1369; // L: 262 + var17 = var0.field1411[var0.method2715() - 1].field1374; // L: 263 + var3 = var0.field1411[var0.method2715() - 1].field1376; // L: 264 + if ((double)var16 != 0.0D) { // L: 265 + var3 += var11 * var17 / var16; // L: 266 + } + + return var3; // L: 268 + } + } else { + var11 += var4; // L: 258 + } + + var3 = class10.method92(var0, var11); // L: 271 + float var18; + if (var2 && var0.field1409 == class116.field1406) { // L: 273 + var18 = var0.field1411[var0.method2715() - 1].field1376 - var0.field1411[0].field1376; // L: 274 + var3 = (float)((double)var3 - (double)var18 * var8); // L: 275 + } else if (!var2 && var0.field1410 == class116.field1406) { // L: 277 + var18 = var0.field1411[var0.method2715() - 1].field1376 - var0.field1411[0].field1376; // L: 278 + var3 = (float)((double)var3 + (double)var18 * var8); // L: 279 + } + + return var3; // L: 281 + } + } else { + return var3; // L: 201 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "2" + ) + static int method2621(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 612 + Widget var3; + if (var0 >= 2000) { // L: 613 + var0 -= 1000; // L: 614 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 615 + var3 = class127.getWidget(var4); // L: 616 + } else { + var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 618 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 619 + Interpreter.Interpreter_intStackSize -= 2; // L: 620 + var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 621 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 622 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 623 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 624 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 625 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 626 + var3.scrollY = 0; + } + + class346.invalidateWidget(var3); // L: 627 + return 1; // L: 628 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 630 + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 631 + class346.invalidateWidget(var3); // L: 632 + return 1; // L: 633 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 635 + var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 636 + class346.invalidateWidget(var3); // L: 637 + return 1; // L: 638 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 640 + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 641 + class346.invalidateWidget(var3); // L: 642 + return 1; // L: 643 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 645 + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 646 + class346.invalidateWidget(var3); // L: 647 + return 1; // L: 648 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 650 + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 651 + class346.invalidateWidget(var3); // L: 652 + return 1; // L: 653 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 655 + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 656 + class346.invalidateWidget(var3); // L: 657 + return 1; // L: 658 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 660 + var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 661 + class346.invalidateWidget(var3); // L: 662 + return 1; // L: 663 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 665 + var3.modelType = 1; // L: 666 + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 667 + class346.invalidateWidget(var3); // L: 668 + return 1; // L: 669 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 671 + Interpreter.Interpreter_intStackSize -= 6; // L: 672 + var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 673 + var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 674 + var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 675 + var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 676 + var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 677 + var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; // L: 678 + class346.invalidateWidget(var3); // L: 679 + return 1; // L: 680 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 682 + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 683 + if (var8 != var3.sequenceId) { // L: 684 + var3.sequenceId = var8; // L: 685 + var3.modelFrame = 0; // L: 686 + var3.modelFrameCycle = 0; // L: 687 + class346.invalidateWidget(var3); // L: 688 + } + + return 1; // L: 690 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 692 + var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 693 + class346.invalidateWidget(var3); // L: 694 + return 1; // L: 695 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 697 + String var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 698 + if (!var7.equals(var3.text)) { // L: 699 + var3.text = var7; // L: 700 + class346.invalidateWidget(var3); // L: 701 + } + + return 1; // L: 703 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 705 + var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 706 + class346.invalidateWidget(var3); // L: 707 + return 1; // L: 708 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 710 + Interpreter.Interpreter_intStackSize -= 3; // L: 711 + var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 712 + var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 713 + var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 714 + class346.invalidateWidget(var3); // L: 715 + return 1; // L: 716 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 718 + var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 719 + class346.invalidateWidget(var3); // L: 720 + return 1; // L: 721 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 723 + var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 724 + class346.invalidateWidget(var3); // L: 725 + return 1; // L: 726 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 728 + var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 729 + class346.invalidateWidget(var3); // L: 730 + return 1; // L: 731 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 733 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 734 + class346.invalidateWidget(var3); // L: 735 + return 1; // L: 736 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 738 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 739 + class346.invalidateWidget(var3); // L: 740 + return 1; // L: 741 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 743 + Interpreter.Interpreter_intStackSize -= 2; // L: 744 + var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 745 + var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 746 + class346.invalidateWidget(var3); // L: 747 + if (var4 != -1 && var3.type == 0) { // L: 748 + AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 749 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 751 + class268.resumePauseWidget(var3.id, var3.childIndex); // L: 752 + Client.meslayerContinueWidget = var3; // L: 753 + class346.invalidateWidget(var3); // L: 754 + return 1; // L: 755 + } else if (var0 == 1122) { // L: 757 + var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 758 + class346.invalidateWidget(var3); // L: 759 + return 1; // L: 760 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 762 + var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 763 + class346.invalidateWidget(var3); // L: 764 + return 1; // L: 765 + } else if (var0 == 1124) { // L: 767 + var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 768 + class346.invalidateWidget(var3); // L: 769 + return 1; // L: 770 + } else if (var0 == 1125) { // L: 772 + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 773 + FillMode var6 = (FillMode)MusicPatchPcmStream.findEnumerated(class291.FillMode_values(), var8); // L: 774 + if (var6 != null) { // L: 775 + var3.fillMode = var6; // L: 776 + class346.invalidateWidget(var3); // L: 777 + } + + return 1; // L: 779 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 781 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 782 + var3.field3369 = var5; // L: 783 + return 1; // L: 784 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 786 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 787 + var3.modelTransparency = var5; // L: 788 + return 1; // L: 789 + } else if (var0 == 1128) { // L: 791 + Interpreter.Interpreter_intStackSize -= 2; // L: 792 + return 1; // L: 793 + } else if (var0 == 1129) { // L: 795 + var3.field3487 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 796 + class346.invalidateWidget(var3); // L: 797 + return 1; // L: 798 + } else if (var0 == 1130) { // L: 800 + var3.method5618(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize], VerticalAlignment.urlRequester, MusicPatchPcmStream.method5456()); // L: 801 + return 1; // L: 802 + } else if (var0 == 1131) { // L: 804 + Interpreter.Interpreter_intStackSize -= 2; // L: 805 + var3.method5722(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 806 + return 1; // L: 807 + } else if (var0 == 1132) { // L: 809 + var3.method5672(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 810 + return 1; // L: 811 + } else { + return 2; // L: 813 + } + } + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "74" + ) + static final int method2615(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 891 + int var4 = var0 & var2 - 1; // L: 892 + int var5 = var1 / var2; // L: 893 + int var6 = var1 & var2 - 1; // L: 894 + int var7 = class293.method5599(var3, var5); // L: 895 + int var8 = class293.method5599(var3 + 1, var5); // L: 896 + int var9 = class293.method5599(var3, var5 + 1); // L: 897 + int var10 = class293.method5599(var3 + 1, var5 + 1); // L: 898 + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 901 + int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 902 + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 907 + int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); // L: 908 + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 913 + int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 914 + return var15; // L: 916 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lky;I)I", + garbageValue = "-1509768740" + ) + static int method2617(Widget var0) { + if (var0.type != 11) { // L: 1227 + --class122.Interpreter_stringStackSize; // L: 1228 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 1229 + return 1; // L: 1230 + } else { + String var1 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1232 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var0.method5623(var1); // L: 1233 + return 1; // L: 1234 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1180428712" + ) + protected static final void method2619() { + class431.clock.mark(); // L: 429 + + int var0; + for (var0 = 0; var0 < 32; ++var0) { // L: 430 + GameEngine.graphicsTickTimes[var0] = 0L; + } + + for (var0 = 0; var0 < 32; ++var0) { // L: 431 + GameEngine.clientTickTimes[var0] = 0L; + } + + TriBool.gameCyclesToDo = 0; // L: 432 + } // L: 433 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 91b3f9a692..f7e9d14204 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nd") +@ObfuscatedName("nv") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2095812297 + intValue = -962501009 ) @Export("capacity") final int capacity; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 315027613 + intValue = -1469945805 ) @Export("size") int size; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lnc;" + descriptor = "[Lnn;" ) @Export("array") User[] array; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("comparator") Comparator comparator; @@ -49,24 +49,24 @@ public abstract class UserList { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lnc;", - garbageValue = "-1289438305" + descriptor = "(I)Lnn;", + garbageValue = "-2105397576" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Lnc;", - garbageValue = "-1075861644" + descriptor = "(II)[Lnn;", + garbageValue = "1888809026" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "53" + garbageValue = "-126" ) @Export("clear") public void clear() { @@ -76,30 +76,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); // L: 27 } // L: 28 - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-7" + descriptor = "(I)I", + garbageValue = "-1142855250" ) @Export("getSize") public int getSize() { return this.size; // L: 31 } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-33" + descriptor = "(S)Z", + garbageValue = "15215" ) @Export("isFull") public boolean isFull() { - return this.capacity == this.size; // L: 35 + return this.size == this.capacity; // L: 35 } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lqy;B)Z", - garbageValue = "40" + descriptor = "(Lqb;I)Z", + garbageValue = "-2040208013" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("ab") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lqy;I)Lnc;", - garbageValue = "-1870974615" + descriptor = "(Lqb;I)Lnn;", + garbageValue = "85985954" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47 } - @ObfuscatedName("aa") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lqy;I)Lnc;", - garbageValue = "1018627440" + descriptor = "(Lqb;I)Lnn;", + garbageValue = "-723468130" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 52 + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52 } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lqy;I)Lnc;", - garbageValue = "-927262844" + descriptor = "(Lqb;I)Lnn;", + garbageValue = "1714959015" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57 } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lqy;B)Z", - garbageValue = "3" + descriptor = "(Lqb;I)Z", + garbageValue = "1454726576" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("as") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lnc;I)V", - garbageValue = "639467139" + descriptor = "(Lnn;I)V", + garbageValue = "1184769229" ) @Export("remove") final void remove(User var1) { @@ -171,34 +171,38 @@ public abstract class UserList { } } // L: 72 - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqy;I)Lnc;", - garbageValue = "455290371" + descriptor = "(Lqb;B)Lnn;", + garbageValue = "72" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 75 } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lqy;Lqy;I)Lnc;", - garbageValue = "1062950692" + descriptor = "(Lqb;Lqb;I)Lnn;", + garbageValue = "155101250" ) @Export("addLast") User addLast(Username var1, Username var2) { - User var3 = this.newInstance(); // L: 80 - var3.set(var1, var2); // L: 81 - this.arrayAddLast(var3); // L: 82 - this.mapPut(var3); // L: 83 - return var3; // L: 84 + if (this.getByCurrentUsername(var1) != null) { // L: 79 + throw new IllegalStateException(); + } else { + User var3 = this.newInstance(); // L: 80 + var3.set(var1, var2); // L: 81 + this.arrayAddLast(var3); // L: 82 + this.mapPut(var3); // L: 83 + return var3; // L: 84 + } } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II)Lnc;", - garbageValue = "-1217975743" + descriptor = "(II)Lnn;", + garbageValue = "1336383728" ) @Export("get") public final User get(int var1) { @@ -209,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1123073588" + descriptor = "(B)V", + garbageValue = "71" ) @Export("sort") public final void sort() { @@ -224,10 +228,10 @@ public abstract class UserList { } // L: 99 - @ObfuscatedName("ah") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lnc;Lqy;Lqy;B)V", - garbageValue = "-36" + descriptor = "(Lnn;Lqb;Lqb;I)V", + garbageValue = "2114154350" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -236,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); // L: 104 } // L: 105 - @ObfuscatedName("am") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lnc;B)I", - garbageValue = "13" + descriptor = "(Lnn;I)I", + garbageValue = "1398600558" ) @Export("indexOf") final int indexOf(User var1) { @@ -252,10 +256,10 @@ public abstract class UserList { return -1; // L: 111 } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lnc;I)V", - garbageValue = "2034975080" + descriptor = "(Lnn;I)V", + garbageValue = "2123373059" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -263,186 +267,75 @@ public abstract class UserList { throw new IllegalStateException(); } else { if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); + this.previousUsernamesMap.remove(var1.previousUsername); // L: 116 } } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Lnc;B)V", - garbageValue = "-30" - ) - @Export("arrayAddLast") - final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; - } + } // L: 117 @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lnc;I)V", - garbageValue = "1365835101" + descriptor = "(Lnn;B)V", + garbageValue = "0" + ) + @Export("arrayAddLast") + final void arrayAddLast(User var1) { + this.array[++this.size - 1] = var1; // L: 120 + } // L: 121 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lnn;B)V", + garbageValue = "1" ) @Export("mapPut") final void mapPut(User var1) { this.usernamesMap.put(var1.username, var1); // L: 124 if (var1.previousUsername != null) { // L: 125 User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 126 - if (var2 != null && var2 != var1) { - var2.previousUsername = null; + if (var2 != null && var2 != var1) { // L: 127 + var2.previousUsername = null; // L: 128 } } - } + } // L: 131 - @ObfuscatedName("ag") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1802337929" + garbageValue = "1984344824" ) @Export("arrayRemove") final void arrayRemove(int var1) { - --this.size; - if (var1 < this.size) { - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); + --this.size; // L: 134 + if (var1 < this.size) { // L: 135 + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 136 } } // L: 138 - @ObfuscatedName("af") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2047830543" + garbageValue = "633444578" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; - } + this.comparator = null; // L: 144 + } // L: 145 - @ObfuscatedName("ap") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "6" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "-2147310039" ) @Export("addComparator") public final void addComparator(Comparator var1) { - if (this.comparator == null) { - this.comparator = var1; - } else if (this.comparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.comparator).addComparator(var1); + if (this.comparator == null) { // L: 148 + this.comparator = var1; // L: 149 + } else if (this.comparator instanceof AbstractUserComparator) { // L: 151 + ((AbstractUserComparator)this.comparator).addComparator(var1); // L: 152 } } // L: 154 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Llq;IIB)[Lql;", - garbageValue = "10" - ) - public static SpritePixels[] method6853(AbstractArchive var0, int var1, int var2) { - return !GrandExchangeEvent.method6045(var0, var1, var2) ? null : class435.method7695(); // L: 50 51 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lna;FFFI)F", - garbageValue = "-1623285058" - ) - static float method6823(class389 var0, float var1, float var2, float var3) { - float var4 = MidiPcmStream.method5405(var0.field4363, var0.field4366, var1); // L: 116 - if (Math.abs(var4) < class114.field1396) { // L: 117 - return var1; - } else { - float var5 = MidiPcmStream.method5405(var0.field4363, var0.field4366, var2); // L: 118 - if (Math.abs(var5) < class114.field1396) { // L: 119 - return var2; - } else { - float var6 = 0.0F; // L: 120 - float var7 = 0.0F; // L: 121 - float var8 = 0.0F; // L: 122 - float var13 = 0.0F; // L: 127 - boolean var14 = true; // L: 128 - boolean var15 = false; // L: 129 - - do { - var15 = false; // L: 131 - if (var14) { // L: 132 - var6 = var1; // L: 133 - var13 = var4; // L: 134 - var7 = var2 - var1; // L: 135 - var8 = var7; // L: 136 - var14 = false; // L: 137 - } - - if (Math.abs(var13) < Math.abs(var5)) { // L: 139 - var1 = var2; // L: 140 - var2 = var6; // L: 141 - var6 = var1; // L: 142 - var4 = var5; // L: 143 - var5 = var13; // L: 144 - var13 = var4; // L: 145 - } - - float var16 = class114.field1394 * Math.abs(var2) + var3 * 0.5F; // L: 147 - float var17 = 0.5F * (var6 - var2); // L: 148 - boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149 - if (var18) { // L: 150 - if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151 - float var12 = var5 / var4; // L: 156 - float var9; - float var10; - if (var6 == var1) { // L: 157 - var9 = 2.0F * var17 * var12; // L: 158 - var10 = 1.0F - var12; // L: 159 - } else { - var10 = var4 / var13; // L: 162 - float var11 = var5 / var13; // L: 163 - var9 = ((var10 - var11) * var10 * var17 * 2.0F - (var11 - 1.0F) * (var2 - var1)) * var12; // L: 164 - var10 = (var12 - 1.0F) * (var10 - 1.0F) * (var11 - 1.0F); // L: 165 - } - - if ((double)var9 > 0.0D) { // L: 167 - var10 = -var10; - } else { - var9 = -var9; // L: 168 - } - - var12 = var8; // L: 169 - var8 = var7; // L: 170 - if (var9 * 2.0F < var17 * 3.0F * var10 - Math.abs(var10 * var16) && var9 < Math.abs(var12 * 0.5F * var10)) { // L: 171 - var7 = var9 / var10; // L: 172 - } else { - var7 = var17; // L: 175 - var8 = var17; // L: 176 - } - } else { - var7 = var17; // L: 152 - var8 = var17; // L: 153 - } - - var1 = var2; // L: 179 - var4 = var5; // L: 180 - if (Math.abs(var7) > var16) { // L: 181 - var2 += var7; - } else if ((double)var17 > 0.0D) { // L: 182 - var2 += var16; - } else { - var2 -= var16; // L: 183 - } - - var5 = MidiPcmStream.method5405(var0.field4363, var0.field4366, var2); // L: 184 - if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185 - var14 = true; // L: 186 - var15 = true; // L: 187 - } else { - var15 = true; // L: 190 - } - } - } while(var15); - - return var2; // L: 194 - } - } - } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 7000249268..41082d84ea 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,96 +3,96 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qy") +@ObfuscatedName("qb") @Implements("Username") public class Username implements Comparable { @ObfuscatedName("v") @Export("name") String name; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lpa;)V" + descriptor = "(Ljava/lang/String;Lpe;)V" ) public Username(String var1, LoginType var2) { this.name = var1; // L: 16 - this.cleanName = class394.method7212(var1, var2); // L: 17 + this.cleanName = class196.method3900(var1, var2); // L: 17 } // L: 18 public Username(String var1) { this.name = var1; // L: 11 - this.cleanName = class394.method7212(var1, LoginType.oldscape); // L: 12 + this.cleanName = class196.method3900(var1, LoginType.oldscape); // L: 12 } // L: 13 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1993634630" + garbageValue = "1852169176" ) @Export("getName") public String getName() { return this.name; // L: 21 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1462775212" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "0" ) - public String method8362() { + public String method8243() { return this.cleanName; // L: 25 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1183298433" + descriptor = "(B)Z", + garbageValue = "125" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; // L: 29 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lqy;B)I", - garbageValue = "75" + descriptor = "(Lqb;I)I", + garbageValue = "1960668931" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 56 - return var1.cleanName == null ? 0 : 1; // L: 57 58 + if (this.cleanName == null) { // L: 53 + return var1.cleanName == null ? 0 : 1; // L: 54 55 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 60 61 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 57 58 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 34 - Username var2 = (Username)var1; // L: 35 - if (this.cleanName == null) { - return var2.cleanName == null; // L: 36 - } else if (var2.cleanName == null) { // L: 37 + if (var1 instanceof Username) { // L: 33 + Username var2 = (Username)var1; // L: 34 + if (this.cleanName == null) { // L: 35 + return var2.cleanName == null; + } else if (var2.cleanName == null) { // L: 36 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 38 39 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 37 38 } } else { - return false; // L: 41 + return false; // L: 40 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 46 47 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 44 45 } public String toString() { - return this.getName(); // L: 52 + return this.getName(); // L: 49 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 65 + return this.compareToTyped((Username)var1); // L: 62 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index ec9e33cc38..3d86985dc8 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("nv") +@ObfuscatedName("np") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("lr") + @ObfuscatedName("la") @ObfuscatedSignature( - descriptor = "(B)Lqy;", - garbageValue = "4" + descriptor = "(I)Lqb;", + garbageValue = "529633925" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 4afcf36e04..3bd76ec116 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -4,128 +4,125 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gi") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; @ObfuscatedName("n") - static final int[] field1983; - @ObfuscatedName("h") + static final int[] field1970; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -603401275 + intValue = -775301691 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -902508973 + intValue = 1129048987 ) @Export("startBit") public int startBit; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1508398865 + intValue = 153132931 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field1983 = new int[32]; // L: 15 + field1970 = new int[32]; // L: 15 int var0 = 2; // L: 18 for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field1983[var1] = var0 - 1; // L: 20 + field1970[var1] = var0 - 1; // L: 20 var0 += var0; // L: 21 } } // L: 23 - @ObfuscatedName("v") + VarbitComposition() { + } // L: 25 + + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "58" + descriptor = "(Lpi;I)V", + garbageValue = "391271030" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 27 - if (var2 == 0) { // L: 28 - return; // L: 31 + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 == 0) { // L: 40 + return; // L: 43 } - this.decodeNext(var1, var2); // L: 29 + this.decodeNext(var1, var2); // L: 41 } } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "-96" + descriptor = "(Lpi;II)V", + garbageValue = "-467631265" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 34 - this.baseVar = var1.readUnsignedShort(); // L: 35 - this.startBit = var1.readUnsignedByte(); // L: 36 - this.endBit = var1.readUnsignedByte(); // L: 37 + if (var2 == 1) { // L: 46 + this.baseVar = var1.readUnsignedShort(); // L: 47 + this.startBit = var1.readUnsignedByte(); // L: 48 + this.endBit = var1.readUnsignedByte(); // L: 49 } - } // L: 40 + } // L: 52 - @ObfuscatedName("o") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "(Ldi;FI)F", - garbageValue = "-1168558464" + descriptor = "(IIII)V", + garbageValue = "-1670747147" ) - static float method3555(class117 var0, float var1) { - if (var0 == null) { // L: 161 - return 0.0F; // L: 162 + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5402 + int var3 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - var2; // L: 5407 + var0 -= WorldMapLabelSize.cameraX; // L: 5408 + var3 -= ItemContainer.cameraY; // L: 5409 + var1 -= class154.cameraZ; // L: 5410 + int var4 = Rasterizer3D.Rasterizer3D_sine[class147.cameraPitch]; // L: 5411 + int var5 = Rasterizer3D.Rasterizer3D_cosine[class147.cameraPitch]; // L: 5412 + int var6 = Rasterizer3D.Rasterizer3D_sine[class21.cameraYaw]; // L: 5413 + int var7 = Rasterizer3D.Rasterizer3D_cosine[class21.cameraYaw]; // L: 5414 + int var8 = var0 * var7 + var6 * var1 >> 16; // L: 5415 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5416 + var0 = var8; // L: 5417 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 5418 + var1 = var5 * var1 + var3 * var4 >> 16; // L: 5419 + if (var1 >= 50) { // L: 5421 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5422 + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 5423 + } else { + Client.viewportTempX = -1; // L: 5426 + Client.viewportTempY = -1; // L: 5427 + } + } else { - float var2; - if (var0.field1432 == var1) { // L: 165 - var2 = 0.0F; // L: 166 - } else if (var1 == var0.field1433) { // L: 168 - var2 = 1.0F; // L: 169 - } else { - var2 = (var1 - var0.field1432) / (var0.field1433 - var0.field1432); // L: 172 - } - - float var3; - if (var0.field1438) { // L: 175 - var3 = var2; // L: 176 - } else { - float[] var4 = new float[]{var0.field1440[0] - var2, var0.field1440[1], var0.field1440[2], var0.field1440[3]}; // L: 179 180 181 182 183 - float[] var5 = new float[5]; // L: 184 - int var6 = class154.method3129(var4, 3, 0.0F, true, 1.0F, true, var5); // L: 185 - if (var6 == 1) { // L: 186 - var3 = var5[0]; // L: 187 - } else { - var3 = 0.0F; // L: 190 - } - } - - return (var0.field1435[1] + (var0.field1435[3] * var3 + var0.field1435[2]) * var3) * var3 + var0.field1435[0]; // L: 193 + Client.viewportTempX = -1; // L: 5403 + Client.viewportTempY = -1; // L: 5404 } - } + } // L: 5405 5429 - @ObfuscatedName("u") + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "13" + descriptor = "(I)I", + garbageValue = "1667758885" ) - public static boolean method3561(int var0) { - return (var0 >> 31 & 1) != 0; // L: 41 + static final int method3578() { + float var0 = 200.0F * ((float)class131.clientPreferences.method2240() - 0.5F); // L: 11994 + return 100 - Math.round(var0); // L: 11995 } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 0d8b78d7a3..ed67ee9090 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,24 +1,30 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("fc") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("uy") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Llf;" ) - @Export("VarcInt_archive") - public static AbstractArchive VarcInt_archive; - @ObfuscatedName("o") + public static class326 field1841; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("VarcInt_cached") - public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("h") + static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("ho") + @ObfuscatedGetter( + intValue = -248717599 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("i") @Export("persist") public boolean persist; @@ -26,35 +32,35 @@ public class VarcInt extends DualNode { VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public VarcInt() { + VarcInt() { this.persist = false; // L: 12 - } + } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-81" + descriptor = "(Lpi;I)V", + garbageValue = "-400441754" ) - public void method3386(Buffer var1) { + void method3414(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 20 - if (var2 == 0) { // L: 21 - return; // L: 24 + int var2 = var1.readUnsignedByte(); // L: 28 + if (var2 == 0) { // L: 29 + return; // L: 32 } - this.method3387(var1, var2); // L: 22 + this.method3407(var1, var2); // L: 30 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "141297465" + descriptor = "(Lpi;IB)V", + garbageValue = "114" ) - void method3387(Buffer var1, int var2) { - if (var2 == 2) { // L: 27 - this.persist = true; // L: 28 + void method3407(Buffer var1, int var2) { + if (var2 == 2) { // L: 35 + this.persist = true; // L: 36 } - } // L: 31 + } // L: 39 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index eed6e2cabb..0011d2e829 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -1,9 +1,6 @@ import java.io.EOFException; -import java.io.File; -import java.io.RandomAccessFile; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; import net.runelite.mapping.Export; @@ -12,1083 +9,381 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@Deprecated -@ObfuscatedName("cm") +@ObfuscatedName("cj") @Implements("Varcs") public class Varcs { - @ObfuscatedName("h") + @ObfuscatedName("ai") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("hc") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 1381253271 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("i") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("map") Map map; - /** @deprecated */ - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("strings") String[] strings; @ObfuscatedName("n") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 2946805821198805637L + longValue = 9211291169100794773L ) - long field1307; + long field1296; Varcs() { - this.unwrittenChanges = false; - int var1 = FloorOverlayDefinition.archive2.getGroupFileCount(19); - this.map = new HashMap(); - this.intsPersistence = new boolean[var1]; + this.unwrittenChanges = false; // L: 22 + int var1 = class10.archive2.getGroupFileCount(19); // L: 26 + this.map = new HashMap(); // L: 27 + this.intsPersistence = new boolean[var1]; // L: 28 int var2; - for (var2 = 0; var2 < var1; ++var2) { // L: 32 - VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); - VarcInt var3; - if (var4 != null) { - var3 = var4; - } else { - byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); - var4 = new VarcInt(); // L: 41 - if (var5 != null) { - var4.method3386(new Buffer(var5)); - } - - VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 43 - var3 = var4; // L: 44 - } - - this.intsPersistence[var2] = var3.persist; // L: 47 + for (var2 = 0; var2 < var1; ++var2) { // L: 29 + VarcInt var3 = TriBool.method6839(var2); // L: 30 + this.intsPersistence[var2] = var3.persist; // L: 31 } - var2 = 0; // L: 49 - if (FloorOverlayDefinition.archive2.method5829(15)) { // L: 50 - var2 = FloorOverlayDefinition.archive2.getGroupFileCount(15); // L: 51 + var2 = 0; // L: 33 + if (class10.archive2.method5824(15)) { // L: 34 + var2 = class10.archive2.getGroupFileCount(15); // L: 35 } - this.strings = new String[var2]; // L: 53 - this.read(); // L: 54 - } // L: 55 + this.strings = new String[var2]; // L: 37 + this.read(); // L: 38 + } // L: 39 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "533278034" + garbageValue = "-1258010190" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 58 - if (this.intsPersistence[var1]) { // L: 59 + this.map.put(var1, var2); // L: 42 + if (this.intsPersistence[var1]) { // L: 43 this.unwrittenChanges = true; } - } // L: 60 + } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1614865457" + descriptor = "(IS)I", + garbageValue = "-20847" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 63 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 64 65 67 + Object var2 = this.map.get(var1); // L: 47 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1697457193" + garbageValue = "1112436939" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 71 - } // L: 72 + this.map.put(var1, var2); // L: 55 + } // L: 56 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "2144710049" + garbageValue = "-1225749706" ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(var1); // L: 75 - return var2 instanceof String ? (String)var2 : ""; // L: 76 77 79 + Object var2 = this.map.get(var1); // L: 59 + return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 } - /** @deprecated */ - @Deprecated - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "2070749528" + garbageValue = "-974893641" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 84 - } // L: 85 + this.strings[var1] = var2; // L: 67 + } // L: 68 - /** @deprecated */ - @Deprecated @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "554707928" + garbageValue = "852602780" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; // L: 89 + return this.strings[var1]; // L: 71 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1036049158" + descriptor = "(B)V", + garbageValue = "41" ) @Export("clearTransient") void clearTransient() { int var1; - for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 93 - if (!this.intsPersistence[var1]) { // L: 94 - this.map.remove(var1); // L: 95 + for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 75 + if (!this.intsPersistence[var1]) { // L: 76 + this.map.remove(var1); // L: 77 } } - for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 98 - this.strings[var1] = null; // L: 99 + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 80 + this.strings[var1] = null; // L: 81 } - } // L: 101 + } // L: 83 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZI)Lpr;", - garbageValue = "-444552079" + descriptor = "(ZI)Lph;", + garbageValue = "291389659" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return ReflectionCheck.getPreferencesFile("2", Login.field917.name, var1); // L: 104 + return ModeWhere.getPreferencesFile("2", Messages.field1305.name, var1); // L: 86 } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-729376145" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 108 + AccessFile var1 = this.getPreferencesFile(true); // L: 90 try { - int var2 = 3; // L: 110 - int var3 = 0; // L: 111 - Iterator var4 = this.map.entrySet().iterator(); // L: 112 + int var2 = 3; // L: 92 + int var3 = 0; // L: 93 + Iterator var4 = this.map.entrySet().iterator(); // L: 94 while (var4.hasNext()) { - Entry var5 = (Entry)var4.next(); // L: 113 - int var6 = (Integer)var5.getKey(); // L: 115 - if (this.intsPersistence[var6]) { // L: 116 - Object var7 = var5.getValue(); // L: 117 - var2 += 3; // L: 118 - if (var7 instanceof Integer) { // L: 119 + Entry var5 = (Entry)var4.next(); // L: 95 + int var6 = (Integer)var5.getKey(); // L: 97 + if (this.intsPersistence[var6]) { // L: 98 + Object var7 = var5.getValue(); // L: 99 + var2 += 3; // L: 100 + if (var7 instanceof Integer) { // L: 101 var2 += 4; - } else if (var7 instanceof String) { // L: 120 - var2 += ItemLayer.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { // L: 102 + var2 += class425.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; // L: 121 + ++var3; // L: 103 } } - Buffer var33 = new Buffer(var2); // L: 125 - var33.writeByte(2); // L: 126 - var33.writeShort(var3); // L: 127 - Iterator var34 = this.map.entrySet().iterator(); // L: 128 + Buffer var27 = new Buffer(var2); // L: 107 + var27.writeByte(2); // L: 108 + var27.writeShort(var3); // L: 109 + Iterator var28 = this.map.entrySet().iterator(); // L: 110 - label186: + label147: while (true) { - Entry var21; - int var22; + Entry var16; + int var17; do { - if (!var34.hasNext()) { - var1.write(var33.array, 0, var33.offset); // L: 192 - break label186; + if (!var28.hasNext()) { + var1.write(var27.array, 0, var27.offset); // L: 140 + break label147; } - var21 = (Entry)var34.next(); // L: 129 - var22 = (Integer)var21.getKey(); // L: 131 - } while(!this.intsPersistence[var22]); // L: 132 + var16 = (Entry)var28.next(); // L: 111 + var17 = (Integer)var16.getKey(); // L: 113 + } while(!this.intsPersistence[var17]); // L: 114 - var33.writeShort(var22); // L: 133 - Object var8 = var21.getValue(); // L: 134 - Class var10 = var8.getClass(); // L: 136 - class431[] var11 = new class431[]{class431.field4598, class431.field4595, class431.field4600}; // L: 141 - class431[] var12 = var11; // L: 143 - int var13 = 0; + var27.writeShort(var17); // L: 115 + Object var8 = var16.getValue(); // L: 116 + Class var10 = var8.getClass(); // L: 118 + class431[] var11 = class431.method7584(); // L: 121 + int var12 = 0; class431 var9; - class431 var14; while (true) { - if (var13 >= var12.length) { - var9 = null; // L: 154 + if (var12 >= var11.length) { + var9 = null; // L: 132 break; } - var14 = var12[var13]; // L: 145 - if (var10 == var14.field4599) { // L: 147 - var9 = var14; // L: 148 - break; // L: 149 + class431 var13 = var11[var12]; // L: 123 + if (var10 == var13.field4593) { // L: 125 + var9 = var13; // L: 126 + break; // L: 127 } - ++var13; // L: 144 + ++var12; // L: 122 } - var33.writeByte(var9.field4594); // L: 157 - Class var23 = var8.getClass(); // L: 160 - class431[] var15 = new class431[]{class431.field4598, class431.field4595, class431.field4600}; // L: 167 - class431[] var16 = var15; // L: 169 - int var17 = 0; - - while (true) { - if (var17 >= var16.length) { - var14 = null; // L: 180 - break; - } - - class431 var18 = var16[var17]; // L: 171 - if (var23 == var18.field4599) { // L: 173 - var14 = var18; // L: 174 - break; // L: 175 - } - - ++var17; // L: 170 - } - - if (var14 == null) { // L: 183 - throw new IllegalArgumentException(); - } - - class427 var35 = var14.field4596; // L: 184 - var35.vmethod7681(var8, var33); // L: 187 + var27.writeByte(var9.field4596); // L: 135 + class431.method7579(var8, var27); // L: 136 } - } catch (Exception var31) { // L: 194 + } catch (Exception var25) { // L: 142 } finally { try { - var1.close(); // L: 197 - } catch (Exception var30) { // L: 199 + var1.close(); // L: 145 + } catch (Exception var24) { // L: 147 } } - this.unwrittenChanges = false; // L: 201 - this.field1307 = WorldMapSprite.method4989(); // L: 202 + this.unwrittenChanges = false; // L: 149 + this.field1296 = class136.method2931(); // L: 150 + } // L: 151 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1780086074" + ) + @Export("read") + void read() { + AccessFile var1 = this.getPreferencesFile(false); // L: 154 + + label226: { + try { + byte[] var2 = new byte[(int)var1.length()]; // L: 156 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 157 158 161 + var4 = var1.read(var2, var3, var2.length - var3); // L: 159 + if (var4 == -1) { // L: 160 + throw new EOFException(); + } + } + + Buffer var14 = new Buffer(var2); // L: 163 + if (var14.array.length - var14.offset >= 1) { // L: 164 + int var15 = var14.readUnsignedByte(); // L: 165 + if (var15 >= 0 && var15 <= 2) { // L: 166 + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { // L: 167 + var16 = var14.readUnsignedShort(); // L: 168 + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label226; + } + + var8 = var14.readUnsignedShort(); // L: 170 + var9 = var14.readUnsignedByte(); // L: 171 + class431 var10 = (class431)MusicPatchPcmStream.findEnumerated(class431.method7584(), var9); // L: 172 + Object var11 = var10.method7581(var14); // L: 173 + if (this.intsPersistence[var8]) { // L: 174 + this.map.put(var8, var11); // L: 175 + } + + ++var7; // L: 169 + } + } else { + var16 = var14.readUnsignedShort(); // L: 180 + + for (var7 = 0; var7 < var16; ++var7) { // L: 181 + var8 = var14.readUnsignedShort(); // L: 182 + var9 = var14.readInt(); // L: 183 + if (this.intsPersistence[var8]) { // L: 184 + this.map.put(var8, var9); // L: 185 + } + } + + var7 = var14.readUnsignedShort(); // L: 188 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label226; + } + + var14.readUnsignedShort(); // L: 190 + var14.readStringCp1252NullTerminated(); // L: 191 + ++var8; // L: 189 + } + } + } + + return; // L: 200 + } + } catch (Exception var25) { // L: 195 + break label226; + } finally { + try { + var1.close(); // L: 198 + } catch (Exception var24) { + } + + } + + return; + } + + this.unwrittenChanges = false; // L: 202 } // L: 203 @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2035245594" - ) - @Export("read") - void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 206 - - label212: { - try { - byte[] var2 = new byte[(int)var1.length()]; // L: 208 - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 209 210 213 - var4 = var1.read(var2, var3, var2.length - var3); // L: 211 - if (var4 == -1) { // L: 212 - throw new EOFException(); - } - } - - Buffer var15 = new Buffer(var2); // L: 215 - if (var15.array.length - var15.offset >= 1) { - int var16 = var15.readUnsignedByte(); // L: 217 - if (var16 < 0 || var16 > 2) { - return; // L: 218 - } - - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { // L: 219 - var17 = var15.readUnsignedShort(); // L: 220 - var7 = 0; - - while (true) { - if (var7 >= var17) { - break label212; - } - - var8 = var15.readUnsignedShort(); // L: 222 - var9 = var15.readUnsignedByte(); // L: 223 - class431[] var10 = new class431[]{class431.field4598, class431.field4595, class431.field4600}; // L: 226 - class431 var11 = (class431)ChatChannel.findEnumerated(var10, var9); // L: 228 - Object var12 = var11.method7671(var15); // L: 229 - if (this.intsPersistence[var8]) { // L: 230 - this.map.put(var8, var12); // L: 231 - } - - ++var7; // L: 221 - } - } else { - var17 = var15.readUnsignedShort(); // L: 236 - - for (var7 = 0; var7 < var17; ++var7) { // L: 237 - var8 = var15.readUnsignedShort(); // L: 238 - var9 = var15.readInt(); // L: 239 - if (this.intsPersistence[var8]) { // L: 240 - this.map.put(var8, var9); // L: 241 - } - } - - var7 = var15.readUnsignedShort(); // L: 244 - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label212; - } - - var15.readUnsignedShort(); // L: 246 - var15.readStringCp1252NullTerminated(); // L: 247 - ++var8; // L: 245 - } - } - } - } catch (Exception var26) { // L: 251 - break label212; - } finally { - try { - var1.close(); // L: 254 - } catch (Exception var25) { // L: 256 - } - - } - - return; // L: 216 - } - - this.unwrittenChanges = false; // L: 258 - } // L: 259 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "673207891" + garbageValue = "2021693946" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1307 < WorldMapSprite.method4989() - 60000L) { // L: 262 - this.write(); // L: 263 + if (this.unwrittenChanges && this.field1296 < class136.method2931() - 60000L) { // L: 206 + this.write(); // L: 207 } - } // L: 265 + } // L: 209 - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "14" + garbageValue = "-23" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 268 + return this.unwrittenChanges; // L: 212 } - @ObfuscatedName("v") + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-899497514" + descriptor = "(I)V", + garbageValue = "1953067165" ) - @Export("getFile") - public static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 16 - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 17 - if (var1 != null) { // L: 18 - return var1; - } else { - File var2 = new File(class17.FileSystem_cacheDir, var0); // L: 19 - RandomAccessFile var3 = null; // L: 20 + static void method2463() { + int var0 = Players.Players_count; // L: 4773 + int[] var1 = Players.Players_indices; // L: 4774 - try { - File var4 = new File(var2.getParent()); // L: 22 - if (!var4.exists()) { // L: 23 - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); // L: 24 - int var5 = var3.read(); // L: 25 - var3.seek(0L); // L: 26 - var3.write(var5); // L: 27 - var3.seek(0L); // L: 28 - var3.close(); // L: 29 - FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30 - return var2; // L: 31 - } - } catch (Exception var8) { - try { - if (var3 != null) { // L: 35 - var3.close(); // L: 36 - var3 = null; // L: 37 - } - } catch (Exception var7) { // L: 40 - } - - throw new RuntimeException(); // L: 42 - } + for (int var2 = 0; var2 < var0; ++var2) { // L: 4775 + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4776 + ArchiveLoader.addPlayerToScene(Client.players[var1[var2]], true); // L: 4777 } } + + } // L: 4779 + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "7" + ) + static boolean method2441() { + return (Client.drawPlayerNames & 1) != 0; // L: 4853 } - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-620948182" - ) - static final void method2462(boolean var0) { - if (var0) { // L: 2660 - Client.field516 = Login.field903 ? class124.field1509 : class124.field1511; // L: 2661 - } else { - LinkedHashMap var1 = Interpreter.clientPreferences.parameters; // L: 2664 - String var3 = Login.Login_username; // L: 2666 - int var4 = var3.length(); // L: 2668 - int var5 = 0; // L: 2669 - - for (int var6 = 0; var6 < var4; ++var6) { // L: 2670 - var5 = (var5 << 5) - var5 + var3.charAt(var6); - } - - Client.field516 = var1.containsKey(var5) ? class124.field1516 : class124.field1510; // L: 2673 - } - - } // L: 2675 - - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "([Lkn;IIIIIIII)V", - garbageValue = "-2083182413" - ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { // L: 10585 - Widget var9 = var0[var8]; // L: 10586 - if (var9 != null && var9.parentId == var1 && (var9.method5637() || WorldMapSection2.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 10587 10588 10589 - if (var9.isIf3) { // L: 10590 - if (class263.isComponentHidden(var9)) { // L: 10591 - continue; - } - } else if (var9.type == 0 && var9 != Player.mousedOverWidgetIf1 && class263.isComponentHidden(var9)) { // L: 10594 - continue; - } - - if (var9.type == 11 && var9.method5694(UserComparator9.urlRequester)) { // L: 10596 10597 - class290.invalidateWidget(var9); // L: 10598 - GrandExchangeEvents.revalidateWidgetScroll(var9.children, var9, true); // L: 10599 - if (var9.field3408 != null) { // L: 10600 - ScriptEvent var10 = new ScriptEvent(); // L: 10601 - var10.widget = var9; // L: 10602 - var10.args = var9.field3408; // L: 10603 - Client.scriptEvents.addFirst(var10); // L: 10604 - } - } - - int var26 = var9.x + var6; // L: 10608 - int var11 = var7 + var9.y; // L: 10609 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 10614 - var12 = var2; // L: 10615 - var13 = var3; // L: 10616 - var14 = var4; // L: 10617 - var15 = var5; // L: 10618 - } else { - int var16; - if (var9.type == 9) { // L: 10620 - var16 = var26; // L: 10621 - var17 = var11; // L: 10622 - var18 = var26 + var9.width; // L: 10623 - int var19 = var11 + var9.height; // L: 10624 - if (var18 < var26) { // L: 10625 - var16 = var18; // L: 10627 - var18 = var26; // L: 10628 - } - - if (var19 < var11) { // L: 10630 - var17 = var19; // L: 10632 - var19 = var11; // L: 10633 - } - - ++var18; // L: 10635 - ++var19; // L: 10636 - var12 = var16 > var2 ? var16 : var2; // L: 10637 - var13 = var17 > var3 ? var17 : var3; // L: 10638 - var14 = var18 < var4 ? var18 : var4; // L: 10639 - var15 = var19 < var5 ? var19 : var5; // L: 10640 - } else { - var16 = var26 + var9.width; // L: 10643 - var17 = var11 + var9.height; // L: 10644 - var12 = var26 > var2 ? var26 : var2; // L: 10645 - var13 = var11 > var3 ? var11 : var3; // L: 10646 - var14 = var16 < var4 ? var16 : var4; // L: 10647 - var15 = var17 < var5 ? var17 : var5; // L: 10648 - } - } - - if (var9 == Client.clickedWidget) { // L: 10650 - Client.field671 = true; // L: 10651 - Client.field596 = var26; // L: 10652 - Client.field673 = var11; // L: 10653 - } - - boolean var34 = false; // L: 10655 - if (var9.field3432) { // L: 10656 - switch(Client.field652) { // L: 10657 - case 0: - var34 = true; // L: 10659 - case 1: - default: - break; - case 2: - if (Client.field653 == var9.id >>> 16) { // L: 10662 - var34 = true; // L: 10663 - } - break; - case 3: - if (var9.id == Client.field653) { // L: 10667 - var34 = true; // L: 10668 - } - } - } - - if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10673 - if (var9.isIf3) { // L: 10674 - ScriptEvent var27; - if (var9.noClickThrough) { // L: 10675 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10676 - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10677 - if (var27.isMouseInputEvent) { // L: 10678 - var27.remove(); // L: 10679 - var27.widget.containsMouse = false; // L: 10680 - } - } - - if (class136.widgetDragDuration == 0) { // L: 10683 - Client.clickedWidget = null; // L: 10684 - Client.clickedWidgetParent = null; // L: 10685 - } - - if (!Client.isMenuOpen) { // L: 10687 - VarpDefinition.addCancelMenuEntry(); // L: 10688 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10692 10693 - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10694 - if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 10695 - var27.remove(); // L: 10696 - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; // L: 10702 - var18 = MouseHandler.MouseHandler_y; // L: 10703 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10704 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10705 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10706 - } - - boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10708 - if (var9.contentType == 1337) { // L: 10709 - if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 10710 - class132.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 10713 - Script.checkIfMinimapClicked(var9, var26, var11); // L: 10714 - } else { - if (var9.contentType == 1400) { // L: 10717 - ClanChannel.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 10718 - } - - if (!Client.isMenuOpen && var35) { // L: 10720 - if (var9.contentType == 1400) { // L: 10721 - ClanChannel.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 10722 - } else { - WorldMapLabelSize.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 10725 - } - } - - boolean var21; - int var29; - if (var34) { // L: 10728 - for (int var20 = 0; var20 < var9.field3422.length; ++var20) { // L: 10729 - var21 = false; // L: 10730 - boolean var28 = false; // L: 10731 - if (!var21 && var9.field3422[var20] != null) { // L: 10732 - for (var29 = 0; var29 < var9.field3422[var20].length; ++var29) { // L: 10733 - boolean var24 = false; // L: 10734 - if (var9.field3406 != null) { // L: 10735 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3422[var20][var29]]; // L: 10736 - } - - if (class273.method5267(var9.field3422[var20][var29]) || var24) { // L: 10738 - var21 = true; // L: 10739 - if (var9.field3406 != null && var9.field3406[var20] > Client.cycle) { // L: 10740 - break; - } - - byte var33 = var9.field3423[var20][var29]; // L: 10741 - if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10742 10743 10744 10745 10746 - var28 = true; // L: 10748 - break; - } - } - } - } - - if (var28) { // L: 10754 - if (var20 < 10) { // L: 10755 - Message.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 10756 - class120.Widget_runOnTargetLeave(); // L: 10757 - ApproximateRouteStrategy.selectSpell(var9.id, var9.childIndex, WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var9)), var9.itemId); // L: 10758 - Client.selectedSpellActionName = InvDefinition.Widget_getSpellActionName(var9); // L: 10759 - if (Client.selectedSpellActionName == null) { // L: 10760 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + ChatChannel.colorStartTag(16777215); // L: 10761 - } - - var29 = var9.field3424[var20]; // L: 10763 - if (var9.field3406 == null) { // L: 10764 - var9.field3406 = new int[var9.field3422.length]; - } - - if (var9.field3425 == null) { // L: 10765 - var9.field3425 = new int[var9.field3422.length]; - } - - if (var29 != 0) { // L: 10766 - if (var9.field3406[var20] == 0) { // L: 10767 - var9.field3406[var20] = var29 + Client.cycle + var9.field3425[var20]; - } else { - var9.field3406[var20] = var29 + Client.cycle; // L: 10768 - } - } else { - var9.field3406[var20] = Integer.MAX_VALUE; // L: 10770 - } - } - - if (!var21 && var9.field3406 != null) { // L: 10772 10773 - var9.field3406[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 10777 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10778 - var35 = true; - } else { - var35 = false; // L: 10779 - } - - boolean var36 = false; // L: 10780 - if ((MouseHandler.MouseHandler_currentButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 10781 - var36 = true; - } - - var21 = false; // L: 10782 - if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10783 - var21 = true; - } - - int[] var22; - if (var21) { // L: 10784 - PcmPlayer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 10785 - if (var9.type == 11 && var9.method5623(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY)) { // L: 10786 - switch(var9.method5656()) { // L: 10787 - case 0: - class11.openURL(var9.method5647(), true, false); // L: 10804 - break; - case 1: - if (class355.method6620(WorldMapSection2.getWidgetFlags(var9))) { // L: 10789 - var22 = var9.method5686(); // L: 10790 - if (var22 != null) { // L: 10791 - PacketBufferNode var23 = ItemContainer.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 10792 - var23.packetBuffer.writeIntME(var22[0]); // L: 10793 - var23.packetBuffer.method7795(var9.childIndex); // L: 10794 - var23.packetBuffer.method7806(var22[1]); // L: 10795 - var23.packetBuffer.method7746(var9.method5699()); // L: 10796 - var23.packetBuffer.method7806(var22[2]); // L: 10797 - var23.packetBuffer.writeInt(var9.id); // L: 10798 - Client.packetWriter.addNode(var23); // L: 10799 - } - } - } - } - } - - if (var9.contentType == 1400) { // L: 10809 - ClanChannel.worldMap.method7305(var17, var18, var35 & var36, var35 & var21); // L: 10810 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class162.method3276(WorldMapSection2.getWidgetFlags(var9))) { // L: 10812 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 10813 - Client.field668 = true; // L: 10814 - Client.field669 = var26; // L: 10815 - Client.field628 = var11; // L: 10816 - } - - if (var9.hasListener) { // L: 10818 - ScriptEvent var37; - if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10819 - var37 = new ScriptEvent(); // L: 10820 - var37.isMouseInputEvent = true; // L: 10821 - var37.widget = var9; // L: 10822 - var37.mouseY = Client.mouseWheelRotation; // L: 10823 - var37.args = var9.onScroll; // L: 10824 - Client.scriptEvents.addFirst(var37); // L: 10825 - } - - if (Client.clickedWidget != null || FloorDecoration.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10827 - var21 = false; // L: 10828 - var36 = false; // L: 10829 - var35 = false; // L: 10830 - } - - if (!var9.isClicked && var21) { // L: 10832 - var9.isClicked = true; // L: 10833 - if (var9.onClick != null) { // L: 10834 - var37 = new ScriptEvent(); // L: 10835 - var37.isMouseInputEvent = true; // L: 10836 - var37.widget = var9; // L: 10837 - var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 10838 - var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10839 - var37.args = var9.onClick; // L: 10840 - Client.scriptEvents.addFirst(var37); // L: 10841 - } - } - - if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 10844 10845 - var37 = new ScriptEvent(); // L: 10846 - var37.isMouseInputEvent = true; // L: 10847 - var37.widget = var9; // L: 10848 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10849 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10850 - var37.args = var9.onClickRepeat; // L: 10851 - Client.scriptEvents.addFirst(var37); // L: 10852 - } - - if (var9.isClicked && !var36) { // L: 10855 - var9.isClicked = false; // L: 10856 - if (var9.onRelease != null) { // L: 10857 - var37 = new ScriptEvent(); // L: 10858 - var37.isMouseInputEvent = true; // L: 10859 - var37.widget = var9; // L: 10860 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10861 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10862 - var37.args = var9.onRelease; // L: 10863 - Client.field695.addFirst(var37); // L: 10864 - } - } - - if (var36 && var9.onHold != null) { // L: 10867 10868 - var37 = new ScriptEvent(); // L: 10869 - var37.isMouseInputEvent = true; // L: 10870 - var37.widget = var9; // L: 10871 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10872 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10873 - var37.args = var9.onHold; // L: 10874 - Client.scriptEvents.addFirst(var37); // L: 10875 - } - - if (!var9.containsMouse && var35) { // L: 10878 - var9.containsMouse = true; // L: 10879 - if (var9.onMouseOver != null) { // L: 10880 - var37 = new ScriptEvent(); // L: 10881 - var37.isMouseInputEvent = true; // L: 10882 - var37.widget = var9; // L: 10883 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10884 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10885 - var37.args = var9.onMouseOver; // L: 10886 - Client.scriptEvents.addFirst(var37); // L: 10887 - } - } - - if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 10890 10891 - var37 = new ScriptEvent(); // L: 10892 - var37.isMouseInputEvent = true; // L: 10893 - var37.widget = var9; // L: 10894 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10895 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10896 - var37.args = var9.onMouseRepeat; // L: 10897 - Client.scriptEvents.addFirst(var37); // L: 10898 - } - - if (var9.containsMouse && !var35) { // L: 10901 - var9.containsMouse = false; // L: 10902 - if (var9.onMouseLeave != null) { // L: 10903 - var37 = new ScriptEvent(); // L: 10904 - var37.isMouseInputEvent = true; // L: 10905 - var37.widget = var9; // L: 10906 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10907 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10908 - var37.args = var9.onMouseLeave; // L: 10909 - Client.field695.addFirst(var37); // L: 10910 - } - } - - if (var9.onTimer != null) { // L: 10913 - var37 = new ScriptEvent(); // L: 10914 - var37.widget = var9; // L: 10915 - var37.args = var9.onTimer; // L: 10916 - Client.field694.addFirst(var37); // L: 10917 - } - - ScriptEvent var25; - int var39; - int var40; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3391) { // L: 10919 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3391 <= 32) { // L: 10920 - label827: - for (var40 = var9.field3391; var40 < Client.changedVarpCount; ++var40) { // L: 10927 - var29 = Client.changedVarps[var40 & 31]; // L: 10928 - - for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 10929 - if (var29 == var9.varTransmitTriggers[var39]) { // L: 10930 - var25 = new ScriptEvent(); // L: 10931 - var25.widget = var9; // L: 10932 - var25.args = var9.onVarTransmit; // L: 10933 - Client.scriptEvents.addFirst(var25); // L: 10934 - break label827; // L: 10935 - } - } - } - } else { - var37 = new ScriptEvent(); // L: 10921 - var37.widget = var9; // L: 10922 - var37.args = var9.onVarTransmit; // L: 10923 - Client.scriptEvents.addFirst(var37); // L: 10924 - } - - var9.field3391 = Client.changedVarpCount; // L: 10940 - } - - if (var9.onInvTransmit != null && Client.field746 > var9.field3355) { // L: 10942 - if (var9.invTransmitTriggers != null && Client.field746 - var9.field3355 <= 32) { // L: 10943 - label803: - for (var40 = var9.field3355; var40 < Client.field746; ++var40) { // L: 10950 - var29 = Client.changedItemContainers[var40 & 31]; // L: 10951 - - for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 10952 - if (var29 == var9.invTransmitTriggers[var39]) { // L: 10953 - var25 = new ScriptEvent(); // L: 10954 - var25.widget = var9; // L: 10955 - var25.args = var9.onInvTransmit; // L: 10956 - Client.scriptEvents.addFirst(var25); // L: 10957 - break label803; // L: 10958 - } - } - } - } else { - var37 = new ScriptEvent(); // L: 10944 - var37.widget = var9; // L: 10945 - var37.args = var9.onInvTransmit; // L: 10946 - Client.scriptEvents.addFirst(var37); // L: 10947 - } - - var9.field3355 = Client.field746; // L: 10963 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3387) { // L: 10965 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3387 <= 32) { // L: 10966 - label779: - for (var40 = var9.field3387; var40 < Client.changedSkillsCount; ++var40) { // L: 10973 - var29 = Client.changedSkills[var40 & 31]; // L: 10974 - - for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 10975 - if (var29 == var9.statTransmitTriggers[var39]) { // L: 10976 - var25 = new ScriptEvent(); // L: 10977 - var25.widget = var9; // L: 10978 - var25.args = var9.onStatTransmit; // L: 10979 - Client.scriptEvents.addFirst(var25); // L: 10980 - break label779; // L: 10981 - } - } - } - } else { - var37 = new ScriptEvent(); // L: 10967 - var37.widget = var9; // L: 10968 - var37.args = var9.onStatTransmit; // L: 10969 - Client.scriptEvents.addFirst(var37); // L: 10970 - } - - var9.field3387 = Client.changedSkillsCount; // L: 10986 - } - - if (Client.chatCycle > var9.field3481 && var9.onChatTransmit != null) { // L: 10988 - var37 = new ScriptEvent(); // L: 10989 - var37.widget = var9; // L: 10990 - var37.args = var9.onChatTransmit; // L: 10991 - Client.scriptEvents.addFirst(var37); // L: 10992 - } - - if (Client.field685 > var9.field3481 && var9.onFriendTransmit != null) { // L: 10994 - var37 = new ScriptEvent(); // L: 10995 - var37.widget = var9; // L: 10996 - var37.args = var9.onFriendTransmit; // L: 10997 - Client.scriptEvents.addFirst(var37); // L: 10998 - } - - if (Client.field726 > var9.field3481 && var9.onClanTransmit != null) { // L: 11000 - var37 = new ScriptEvent(); // L: 11001 - var37.widget = var9; // L: 11002 - var37.args = var9.onClanTransmit; // L: 11003 - Client.scriptEvents.addFirst(var37); // L: 11004 - } - - if (Client.field687 > var9.field3481 && var9.field3395 != null) { // L: 11006 - var37 = new ScriptEvent(); // L: 11007 - var37.widget = var9; // L: 11008 - var37.args = var9.field3395; // L: 11009 - Client.scriptEvents.addFirst(var37); // L: 11010 - } - - if (Client.field749 > var9.field3481 && var9.field3461 != null) { // L: 11012 - var37 = new ScriptEvent(); // L: 11013 - var37.widget = var9; // L: 11014 - var37.args = var9.field3461; // L: 11015 - Client.scriptEvents.addFirst(var37); // L: 11016 - } - - if (Client.field689 > var9.field3481 && var9.onStockTransmit != null) { // L: 11018 - var37 = new ScriptEvent(); // L: 11019 - var37.widget = var9; // L: 11020 - var37.args = var9.onStockTransmit; // L: 11021 - Client.scriptEvents.addFirst(var37); // L: 11022 - } - - if (Client.field572 > var9.field3481 && var9.field3468 != null) { // L: 11024 - var37 = new ScriptEvent(); // L: 11025 - var37.widget = var9; // L: 11026 - var37.args = var9.field3468; // L: 11027 - Client.scriptEvents.addFirst(var37); // L: 11028 - } - - if (Client.field762 > var9.field3481 && var9.onMiscTransmit != null) { // L: 11030 - var37 = new ScriptEvent(); // L: 11031 - var37.widget = var9; // L: 11032 - var37.args = var9.onMiscTransmit; // L: 11033 - Client.scriptEvents.addFirst(var37); // L: 11034 - } - - var9.field3481 = Client.cycleCntr; // L: 11036 - if (var9.onKey != null) { // L: 11037 - for (var40 = 0; var40 < Client.field713; ++var40) { // L: 11038 - ScriptEvent var38 = new ScriptEvent(); // L: 11039 - var38.widget = var9; // L: 11040 - var38.keyTyped = Client.field568[var40]; // L: 11041 - var38.keyPressed = Client.field716[var40]; // L: 11042 - var38.args = var9.onKey; // L: 11043 - Client.scriptEvents.addFirst(var38); // L: 11044 - } - } - - ScriptEvent var32; - if (var9.field3457 != null) { // L: 11047 - var22 = class65.method1869(); // L: 11048 - - for (var29 = 0; var29 < var22.length; ++var29) { // L: 11049 - var32 = new ScriptEvent(); // L: 11050 - var32.widget = var9; // L: 11051 - var32.keyTyped = var22[var29]; // L: 11052 - var32.args = var9.field3457; // L: 11053 - Client.scriptEvents.addFirst(var32); // L: 11054 - } - } - - if (var9.field3458 != null) { // L: 11057 - var22 = class166.method3311(); // L: 11058 - - for (var29 = 0; var29 < var22.length; ++var29) { // L: 11059 - var32 = new ScriptEvent(); // L: 11060 - var32.widget = var9; // L: 11061 - var32.keyTyped = var22[var29]; // L: 11062 - var32.args = var9.field3458; // L: 11063 - Client.scriptEvents.addFirst(var32); // L: 11064 - } - } - } - } - - if (!var9.isIf3) { // L: 11069 - if (Client.clickedWidget != null || FloorDecoration.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11070 - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11071 - if (var9.mouseOverRedirect >= 0) { // L: 11072 - Player.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - Player.mousedOverWidgetIf1 = var9; // L: 11073 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11075 - class160.field1750 = var9; // L: 11076 - } - - if (var9.scrollHeight > var9.height) { // L: 11078 - BuddyRankComparator.method2624(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 11080 - updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11081 - if (var9.children != null) { // L: 11082 - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11083 - if (var30 != null) { // L: 11084 - if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11085 - for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11086 - if (var31.isMouseInputEvent) { // L: 11087 - var31.remove(); // L: 11088 - var31.widget.containsMouse = false; // L: 11089 - } - } - - if (class136.widgetDragDuration == 0) { // L: 11092 - Client.clickedWidget = null; // L: 11093 - Client.clickedWidgetParent = null; // L: 11094 - } - - if (!Client.isMenuOpen) { // L: 11096 - VarpDefinition.addCancelMenuEntry(); // L: 11097 - } - } - - ItemComposition.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11100 - } - } - } - } - } - } - - } // L: 11104 } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 1bdb5961a1..1f948ee1d3 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,47 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fb") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("VarpDefinition_archive") public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -883300141 + intValue = -18460315 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("VarpDefinition_cached") - static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("hx") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1588811347 - ) - static int field1819; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Laq;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("id") - @ObfuscatedSignature( - descriptor = "[Lql;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1180145881 + intValue = -2056271889 ) @Export("type") public int type; @@ -57,27 +43,27 @@ public class VarpDefinition extends DualNode { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-59" + descriptor = "(Lpi;I)V", + garbageValue = "856991189" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 29 if (var2 == 0) { // L: 30 return; // L: 33 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 31 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "24" + descriptor = "(Lpi;II)V", + garbageValue = "2104717847" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -87,69 +73,626 @@ public class VarpDefinition extends DualNode { } // L: 38 - @ObfuscatedName("o") + @ObfuscatedName("je") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-319794716" + descriptor = "([Lky;IIIIIIII)V", + garbageValue = "2009471440" ) - public static byte[] method3353(Object var0, boolean var1) { - if (var0 == null) { // L: 21 - return null; - } else if (var0 instanceof byte[]) { // L: 22 - byte[] var3 = (byte[])((byte[])var0); // L: 23 - return var1 ? class359.method6624(var3) : var3; // L: 24 - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 - return var2.get(); // L: 29 - } else { - throw new IllegalArgumentException(); // L: 31 - } - } + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { // L: 11189 + Widget var9 = var0[var8]; // L: 11190 + if (var9 != null && var9.parentId == var1 && (var9.method5617() || class326.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 11191 11192 11193 + if (var9.isIf3) { // L: 11194 + if (class1.isComponentHidden(var9)) { // L: 11195 + continue; + } + } else if (var9.type == 0 && var9 != DevicePcmPlayerProvider.mousedOverWidgetIf1 && class1.isComponentHidden(var9)) { // L: 11198 + continue; + } - @ObfuscatedName("fp") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" - ) - static final void method3345() { - int[] var0 = Players.Players_indices; // L: 3434 + if (var9.type == 11 && var9.method5629(VerticalAlignment.urlRequester)) { // L: 11200 11201 + class346.invalidateWidget(var9); // L: 11202 + AbstractByteArrayCopier.revalidateWidgetScroll(var9.children, var9, true); // L: 11203 + if (var9.field3462 != null) { // L: 11204 + ScriptEvent var10 = new ScriptEvent(); // L: 11205 + var10.widget = var9; // L: 11206 + var10.args = var9.field3462; // L: 11207 + Client.scriptEvents.addFirst(var10); // L: 11208 + } + } - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3435 - Player var4 = Client.players[var0[var1]]; // L: 3436 - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3437 - --var4.overheadTextCyclesRemaining; // L: 3438 - if (var4.overheadTextCyclesRemaining == 0) { // L: 3439 - var4.overheadText = null; + int var26 = var9.x + var6; // L: 11212 + int var11 = var7 + var9.y; // L: 11213 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 11218 + var12 = var2; // L: 11219 + var13 = var3; // L: 11220 + var14 = var4; // L: 11221 + var15 = var5; // L: 11222 + } else { + int var16; + if (var9.type == 9) { // L: 11224 + var16 = var26; // L: 11225 + var17 = var11; // L: 11226 + var18 = var26 + var9.width; // L: 11227 + int var19 = var11 + var9.height; // L: 11228 + if (var18 < var26) { // L: 11229 + var16 = var18; // L: 11231 + var18 = var26; // L: 11232 + } + + if (var19 < var11) { // L: 11234 + var17 = var19; // L: 11236 + var19 = var11; // L: 11237 + } + + ++var18; // L: 11239 + ++var19; // L: 11240 + var12 = var16 > var2 ? var16 : var2; // L: 11241 + var13 = var17 > var3 ? var17 : var3; // L: 11242 + var14 = var18 < var4 ? var18 : var4; // L: 11243 + var15 = var19 < var5 ? var19 : var5; // L: 11244 + } else { + var16 = var26 + var9.width; // L: 11247 + var17 = var11 + var9.height; // L: 11248 + var12 = var26 > var2 ? var26 : var2; // L: 11249 + var13 = var11 > var3 ? var11 : var3; // L: 11250 + var14 = var16 < var4 ? var16 : var4; // L: 11251 + var15 = var17 < var5 ? var17 : var5; // L: 11252 + } + } + + if (var9 == Client.clickedWidget) { // L: 11254 + Client.field687 = true; // L: 11255 + Client.field688 = var26; // L: 11256 + Client.field757 = var11; // L: 11257 + } + + boolean var34 = false; // L: 11259 + if (var9.field3414) { // L: 11260 + switch(Client.field668) { // L: 11261 + case 0: + var34 = true; // L: 11268 + case 1: + default: + break; + case 2: + if (Client.field628 == var9.id >>> 16) { // L: 11271 + var34 = true; // L: 11272 + } + break; + case 3: + if (var9.id == Client.field628) { // L: 11263 + var34 = true; // L: 11264 + } + } + } + + if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11277 + if (var9.isIf3) { // L: 11278 + ScriptEvent var27; + if (var9.noClickThrough) { // L: 11279 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11280 + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11281 + if (var27.isMouseInputEvent) { // L: 11282 + var27.remove(); // L: 11283 + var27.widget.containsMouse = false; // L: 11284 + } + } + + if (class124.widgetDragDuration == 0) { // L: 11287 + Client.clickedWidget = null; // L: 11288 + Client.clickedWidgetParent = null; // L: 11289 + } + + if (!Client.isMenuOpen) { // L: 11291 + ByteArrayPool.addCancelMenuEntry(); // L: 11292 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11296 11297 + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11298 + if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 11299 + var27.remove(); // L: 11300 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 11306 + var18 = MouseHandler.MouseHandler_y; // L: 11307 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11308 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11309 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11310 + } + + boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11312 + if (var9.contentType == 1337) { // L: 11313 + if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 11314 + ClanMate.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 11317 + class14.checkIfMinimapClicked(var9, var26, var11); // L: 11318 + } else { + if (var9.contentType == 1400) { // L: 11321 + ScriptFrame.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 11322 + } + + if (!Client.isMenuOpen && var35) { // L: 11324 + if (var9.contentType == 1400) { // L: 11325 + ScriptFrame.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 11326 + } else { + class138.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 11329 + } + } + + boolean var21; + int var29; + if (var34) { // L: 11332 + for (int var20 = 0; var20 < var9.field3415.length; ++var20) { // L: 11333 + var21 = false; // L: 11334 + boolean var28 = false; // L: 11335 + if (!var21 && var9.field3415[var20] != null) { // L: 11336 + for (var29 = 0; var29 < var9.field3415[var20].length; ++var29) { // L: 11337 + boolean var24 = false; // L: 11338 + if (var9.field3484 != null) { // L: 11339 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3415[var20][var29]]; // L: 11340 + } + + if (ArchiveLoader.method2062(var9.field3415[var20][var29]) || var24) { // L: 11342 + var21 = true; // L: 11343 + if (var9.field3484 != null && var9.field3484[var20] > Client.cycle) { // L: 11344 + break; + } + + byte var33 = var9.field3485[var20][var29]; // L: 11345 + if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11346 11347 11348 11349 11350 + var28 = true; // L: 11352 + break; + } + } + } + } + + if (var28) { // L: 11358 + if (var20 < 10) { // L: 11359 + WorldMapLabelSize.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 11360 + FriendSystem.Widget_runOnTargetLeave(); // L: 11361 + Renderable.selectSpell(var9.id, var9.childIndex, WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var9)), var9.itemId); // L: 11362 + Client.selectedSpellActionName = class152.Widget_getSpellActionName(var9); // L: 11363 + if (Client.selectedSpellActionName == null) { // L: 11364 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + UserComparator9.colorStartTag(16777215); // L: 11365 + } + + var29 = var9.field3417[var20]; // L: 11367 + if (var9.field3484 == null) { // L: 11368 + var9.field3484 = new int[var9.field3415.length]; + } + + if (var9.field3418 == null) { // L: 11369 + var9.field3418 = new int[var9.field3415.length]; + } + + if (var29 != 0) { // L: 11370 + if (var9.field3484[var20] == 0) { // L: 11371 + var9.field3484[var20] = var29 + Client.cycle + var9.field3418[var20]; + } else { + var9.field3484[var20] = var29 + Client.cycle; // L: 11372 + } + } else { + var9.field3484[var20] = Integer.MAX_VALUE; // L: 11374 + } + } + + if (!var21 && var9.field3484 != null) { // L: 11376 11377 + var9.field3484[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 11381 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11382 + var35 = true; + } else { + var35 = false; // L: 11383 + } + + boolean var36 = false; // L: 11384 + if ((MouseHandler.MouseHandler_currentButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 11385 + var36 = true; + } + + var21 = false; // L: 11386 + if ((MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11387 + var21 = true; + } + + int[] var22; + if (var21) { // L: 11388 + ParamComposition.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 11389 + if (var9.type == 11 && var9.method5721(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY)) { // L: 11390 + switch(var9.method5625()) { // L: 11391 + case 0: + class391.openURL(var9.method5627(), true, false); // L: 11393 + break; + case 1: + if (ParamComposition.method3596(class326.getWidgetFlags(var9))) { // L: 11396 + var22 = var9.method5628(); // L: 11397 + if (var22 != null) { // L: 11398 + PacketBufferNode var23 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2975, Client.packetWriter.isaacCipher); // L: 11399 + var23.packetBuffer.writeIntME(var22[0]); // L: 11400 + var23.packetBuffer.method7710(var9.childIndex); // L: 11401 + var23.packetBuffer.method7721(var22[1]); // L: 11402 + var23.packetBuffer.method7723(var9.method5647()); // L: 11403 + var23.packetBuffer.method7721(var22[2]); // L: 11404 + var23.packetBuffer.writeInt(var9.id); // L: 11405 + Client.packetWriter.addNode(var23); // L: 11406 + } + } + } + } + } + + if (var9.contentType == 1400) { // L: 11413 + ScriptFrame.worldMap.method7217(var17, var18, var35 & var36, var35 & var21); // L: 11414 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && DirectByteArrayCopier.method5516(class326.getWidgetFlags(var9))) { // L: 11416 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 11417 + Client.field696 = true; // L: 11418 + Client.field773 = var26; // L: 11419 + Client.field686 = var11; // L: 11420 + } + + if (var9.hasListener) { // L: 11422 + ScriptEvent var37; + if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11423 + var37 = new ScriptEvent(); // L: 11424 + var37.isMouseInputEvent = true; // L: 11425 + var37.widget = var9; // L: 11426 + var37.mouseY = Client.mouseWheelRotation; // L: 11427 + var37.args = var9.onScroll; // L: 11428 + Client.scriptEvents.addFirst(var37); // L: 11429 + } + + if (Client.clickedWidget != null || class142.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11431 + var21 = false; // L: 11432 + var36 = false; // L: 11433 + var35 = false; // L: 11434 + } + + if (!var9.isClicked && var21) { // L: 11436 + var9.isClicked = true; // L: 11437 + if (var9.onClick != null) { // L: 11438 + var37 = new ScriptEvent(); // L: 11439 + var37.isMouseInputEvent = true; // L: 11440 + var37.widget = var9; // L: 11441 + var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 11442 + var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11443 + var37.args = var9.onClick; // L: 11444 + Client.scriptEvents.addFirst(var37); // L: 11445 + } + } + + if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 11448 11449 + var37 = new ScriptEvent(); // L: 11450 + var37.isMouseInputEvent = true; // L: 11451 + var37.widget = var9; // L: 11452 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11453 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11454 + var37.args = var9.onClickRepeat; // L: 11455 + Client.scriptEvents.addFirst(var37); // L: 11456 + } + + if (var9.isClicked && !var36) { // L: 11459 + var9.isClicked = false; // L: 11460 + if (var9.onRelease != null) { // L: 11461 + var37 = new ScriptEvent(); // L: 11462 + var37.isMouseInputEvent = true; // L: 11463 + var37.widget = var9; // L: 11464 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11465 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11466 + var37.args = var9.onRelease; // L: 11467 + Client.field711.addFirst(var37); // L: 11468 + } + } + + if (var36 && var9.onHold != null) { // L: 11471 11472 + var37 = new ScriptEvent(); // L: 11473 + var37.isMouseInputEvent = true; // L: 11474 + var37.widget = var9; // L: 11475 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11476 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11477 + var37.args = var9.onHold; // L: 11478 + Client.scriptEvents.addFirst(var37); // L: 11479 + } + + if (!var9.containsMouse && var35) { // L: 11482 + var9.containsMouse = true; // L: 11483 + if (var9.onMouseOver != null) { // L: 11484 + var37 = new ScriptEvent(); // L: 11485 + var37.isMouseInputEvent = true; // L: 11486 + var37.widget = var9; // L: 11487 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11488 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11489 + var37.args = var9.onMouseOver; // L: 11490 + Client.scriptEvents.addFirst(var37); // L: 11491 + } + } + + if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 11494 11495 + var37 = new ScriptEvent(); // L: 11496 + var37.isMouseInputEvent = true; // L: 11497 + var37.widget = var9; // L: 11498 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11499 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11500 + var37.args = var9.onMouseRepeat; // L: 11501 + Client.scriptEvents.addFirst(var37); // L: 11502 + } + + if (var9.containsMouse && !var35) { // L: 11505 + var9.containsMouse = false; // L: 11506 + if (var9.onMouseLeave != null) { // L: 11507 + var37 = new ScriptEvent(); // L: 11508 + var37.isMouseInputEvent = true; // L: 11509 + var37.widget = var9; // L: 11510 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11511 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11512 + var37.args = var9.onMouseLeave; // L: 11513 + Client.field711.addFirst(var37); // L: 11514 + } + } + + if (var9.onTimer != null) { // L: 11517 + var37 = new ScriptEvent(); // L: 11518 + var37.widget = var9; // L: 11519 + var37.args = var9.onTimer; // L: 11520 + Client.field710.addFirst(var37); // L: 11521 + } + + ScriptEvent var25; + int var39; + int var40; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3479) { // L: 11523 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3479 <= 32) { // L: 11524 + label825: + for (var40 = var9.field3479; var40 < Client.changedVarpCount; ++var40) { // L: 11531 + var29 = Client.changedVarps[var40 & 31]; // L: 11532 + + for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 11533 + if (var29 == var9.varTransmitTriggers[var39]) { // L: 11534 + var25 = new ScriptEvent(); // L: 11535 + var25.widget = var9; // L: 11536 + var25.args = var9.onVarTransmit; // L: 11537 + Client.scriptEvents.addFirst(var25); // L: 11538 + break label825; // L: 11539 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 11525 + var37.widget = var9; // L: 11526 + var37.args = var9.onVarTransmit; // L: 11527 + Client.scriptEvents.addFirst(var37); // L: 11528 + } + + var9.field3479 = Client.changedVarpCount; // L: 11544 + } + + if (var9.onInvTransmit != null && Client.field695 > var9.field3480) { // L: 11546 + if (var9.invTransmitTriggers != null && Client.field695 - var9.field3480 <= 32) { // L: 11547 + label801: + for (var40 = var9.field3480; var40 < Client.field695; ++var40) { // L: 11554 + var29 = Client.changedItemContainers[var40 & 31]; // L: 11555 + + for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 11556 + if (var29 == var9.invTransmitTriggers[var39]) { // L: 11557 + var25 = new ScriptEvent(); // L: 11558 + var25.widget = var9; // L: 11559 + var25.args = var9.onInvTransmit; // L: 11560 + Client.scriptEvents.addFirst(var25); // L: 11561 + break label801; // L: 11562 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 11548 + var37.widget = var9; // L: 11549 + var37.args = var9.onInvTransmit; // L: 11550 + Client.scriptEvents.addFirst(var37); // L: 11551 + } + + var9.field3480 = Client.field695; // L: 11567 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3433) { // L: 11569 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3433 <= 32) { // L: 11570 + label777: + for (var40 = var9.field3433; var40 < Client.changedSkillsCount; ++var40) { // L: 11577 + var29 = Client.changedSkills[var40 & 31]; // L: 11578 + + for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 11579 + if (var29 == var9.statTransmitTriggers[var39]) { // L: 11580 + var25 = new ScriptEvent(); // L: 11581 + var25.widget = var9; // L: 11582 + var25.args = var9.onStatTransmit; // L: 11583 + Client.scriptEvents.addFirst(var25); // L: 11584 + break label777; // L: 11585 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 11571 + var37.widget = var9; // L: 11572 + var37.args = var9.onStatTransmit; // L: 11573 + Client.scriptEvents.addFirst(var37); // L: 11574 + } + + var9.field3433 = Client.changedSkillsCount; // L: 11590 + } + + if (Client.chatCycle > var9.field3478 && var9.onChatTransmit != null) { // L: 11592 + var37 = new ScriptEvent(); // L: 11593 + var37.widget = var9; // L: 11594 + var37.args = var9.onChatTransmit; // L: 11595 + Client.scriptEvents.addFirst(var37); // L: 11596 + } + + if (Client.field701 > var9.field3478 && var9.onFriendTransmit != null) { // L: 11598 + var37 = new ScriptEvent(); // L: 11599 + var37.widget = var9; // L: 11600 + var37.args = var9.onFriendTransmit; // L: 11601 + Client.scriptEvents.addFirst(var37); // L: 11602 + } + + if (Client.field702 > var9.field3478 && var9.onClanTransmit != null) { // L: 11604 + var37 = new ScriptEvent(); // L: 11605 + var37.widget = var9; // L: 11606 + var37.args = var9.onClanTransmit; // L: 11607 + Client.scriptEvents.addFirst(var37); // L: 11608 + } + + if (Client.field703 > var9.field3478 && var9.field3454 != null) { // L: 11610 + var37 = new ScriptEvent(); // L: 11611 + var37.widget = var9; // L: 11612 + var37.args = var9.field3454; // L: 11613 + Client.scriptEvents.addFirst(var37); // L: 11614 + } + + if (Client.field755 > var9.field3478 && var9.field3455 != null) { // L: 11616 + var37 = new ScriptEvent(); // L: 11617 + var37.widget = var9; // L: 11618 + var37.args = var9.field3455; // L: 11619 + Client.scriptEvents.addFirst(var37); // L: 11620 + } + + if (Client.field705 > var9.field3478 && var9.onStockTransmit != null) { // L: 11622 + var37 = new ScriptEvent(); // L: 11623 + var37.widget = var9; // L: 11624 + var37.args = var9.onStockTransmit; // L: 11625 + Client.scriptEvents.addFirst(var37); // L: 11626 + } + + if (Client.field706 > var9.field3478 && var9.field3432 != null) { // L: 11628 + var37 = new ScriptEvent(); // L: 11629 + var37.widget = var9; // L: 11630 + var37.args = var9.field3432; // L: 11631 + Client.scriptEvents.addFirst(var37); // L: 11632 + } + + if (Client.field707 > var9.field3478 && var9.onMiscTransmit != null) { // L: 11634 + var37 = new ScriptEvent(); // L: 11635 + var37.widget = var9; // L: 11636 + var37.args = var9.onMiscTransmit; // L: 11637 + Client.scriptEvents.addFirst(var37); // L: 11638 + } + + var9.field3478 = Client.cycleCntr; // L: 11640 + if (var9.onKey != null) { // L: 11641 + for (var40 = 0; var40 < Client.field731; ++var40) { // L: 11642 + ScriptEvent var38 = new ScriptEvent(); // L: 11643 + var38.widget = var9; // L: 11644 + var38.keyTyped = Client.field733[var40]; // L: 11645 + var38.keyPressed = Client.field732[var40]; // L: 11646 + var38.args = var9.onKey; // L: 11647 + Client.scriptEvents.addFirst(var38); // L: 11648 + } + } + + ScriptEvent var32; + if (var9.field3416 != null) { // L: 11651 + var22 = FontName.method7414(); // L: 11652 + + for (var29 = 0; var29 < var22.length; ++var29) { // L: 11653 + var32 = new ScriptEvent(); // L: 11654 + var32.widget = var9; // L: 11655 + var32.keyTyped = var22[var29]; // L: 11656 + var32.args = var9.field3416; // L: 11657 + Client.scriptEvents.addFirst(var32); // L: 11658 + } + } + + if (var9.field3451 != null) { // L: 11661 + var22 = class118.method2748(); // L: 11662 + + for (var29 = 0; var29 < var22.length; ++var29) { // L: 11663 + var32 = new ScriptEvent(); // L: 11664 + var32.widget = var9; // L: 11665 + var32.keyTyped = var22[var29]; // L: 11666 + var32.args = var9.field3451; // L: 11667 + Client.scriptEvents.addFirst(var32); // L: 11668 + } + } + } + } + + if (!var9.isIf3) { // L: 11673 + if (Client.clickedWidget != null || class142.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11674 + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11675 + if (var9.mouseOverRedirect >= 0) { // L: 11676 + DevicePcmPlayerProvider.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + DevicePcmPlayerProvider.mousedOverWidgetIf1 = var9; // L: 11677 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11679 + GrandExchangeOfferOwnWorldComparator.field486 = var9; // L: 11680 + } + + if (var9.scrollHeight > var9.height) { // L: 11682 + class129.method2861(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 11684 + updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11685 + if (var9.children != null) { // L: 11686 + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11687 + if (var30 != null) { // L: 11688 + if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11689 + for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11690 + if (var31.isMouseInputEvent) { // L: 11691 + var31.remove(); // L: 11692 + var31.widget.containsMouse = false; // L: 11693 + } + } + + if (class124.widgetDragDuration == 0) { // L: 11696 + Client.clickedWidget = null; // L: 11697 + Client.clickedWidgetParent = null; // L: 11698 + } + + if (!Client.isMenuOpen) { // L: 11700 + ByteArrayPool.addCancelMenuEntry(); // L: 11701 + } + } + + Language.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11704 + } + } + } } } } - for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3442 - int var2 = Client.npcIndices[var1]; // L: 3443 - NPC var3 = Client.npcs[var2]; // L: 3444 - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3445 - --var3.overheadTextCyclesRemaining; // L: 3446 - if (var3.overheadTextCyclesRemaining == 0) { // L: 3447 - var3.overheadText = null; - } - } - } - - } // L: 3450 - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1906831681" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - class268.method5228(); // L: 8019 - Client.menuActions[0] = "Cancel"; // L: 8020 - Client.menuTargets[0] = ""; // L: 8021 - Client.menuOpcodes[0] = 1006; // L: 8022 - Client.menuShiftClick[0] = false; // L: 8023 - Client.menuOptionsCount = 1; // L: 8024 - } // L: 8025 + } // L: 11708 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 31eafd3fc7..94ea37af6a 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,35 +1,22 @@ +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("kd") +@ObfuscatedName("kg") @Implements("Varps") public class Varps { - @ObfuscatedName("ux") - @ObfuscatedGetter( - longValue = 7968788616048025071L - ) - static long field3287; - @ObfuscatedName("qu") - @ObfuscatedSignature( - descriptor = "Lqv;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; @ObfuscatedName("v") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("al") - @Export("hasFocus") - protected static boolean hasFocus; static { Varps_masks = new int[32]; // L: 6 @@ -43,4 +30,49 @@ public class Varps { Varps_temp = new int[4000]; // L: 16 Varps_main = new int[4000]; // L: 17 } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lff;III)Lay;", + garbageValue = "-1753293698" + ) + public static final PcmPlayer method5523(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { // L: 53 + if (var2 < 256) { // L: 54 + var2 = 256; + } + + try { + PcmPlayer var3 = class384.pcmPlayerProvider.player(); // L: 56 + var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 57 + var3.field289 = var2; // L: 58 + var3.init(); // L: 59 + var3.capacity = (var2 & -1024) + 1024; // L: 60 + if (var3.capacity > 16384) { // L: 61 + var3.capacity = 16384; + } + + var3.open(var3.capacity); // L: 62 + if (PcmPlayer.field295 > 0 && class6.soundSystem == null) { // L: 63 + class6.soundSystem = new SoundSystem(); // L: 64 + WorldMapSection1.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65 + WorldMapSection1.soundSystemExecutor.scheduleAtFixedRate(class6.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66 + } + + if (class6.soundSystem != null) { // L: 68 + if (class6.soundSystem.players[var1] != null) { // L: 69 + throw new IllegalArgumentException(); + } + + class6.soundSystem.players[var1] = var3; // L: 70 + } + + return var3; // L: 72 + } catch (Throwable var4) { // L: 74 + return new PcmPlayer(); // L: 75 + } + } else { + throw new IllegalArgumentException(); + } + } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index cb279a1e3c..fc50a138f2 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -1,37 +1,40 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("il") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("l") - @Export("cacheDir") - public static File cacheDir; + @ObfuscatedName("fr") + @ObfuscatedGetter( + intValue = 648708493 + ) + static int field2816; + @ObfuscatedName("fk") + static int[] field2817; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -359767671 + intValue = -1023458973 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 396508261 + intValue = 476237239 ) @Export("y") int y; - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -194088213 + intValue = 443287667 ) @Export("z") int z; - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1595742309 + intValue = -1525628645 ) @Export("magnitude") int magnitude; @@ -40,90 +43,12 @@ public class VertexNormal { } // L: 9 @ObfuscatedSignature( - descriptor = "(Lhf;)V" + descriptor = "(Lil;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 this.y = var1.y; // L: 13 - this.z = var1.z; - this.magnitude = var1.magnitude; + this.z = var1.z; // L: 14 + this.magnitude = var1.magnitude; // L: 15 } // L: 16 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Ljx;", - garbageValue = "-37714344" - ) - static LoginPacket[] method4495() { - return new LoginPacket[]{LoginPacket.field3133, LoginPacket.field3134, LoginPacket.field3135, LoginPacket.field3137, LoginPacket.field3132, LoginPacket.field3136}; // L: 22 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "-338837319" - ) - public static void method4496(Huffman var0) { - class282.huffman = var0; // L: 14 - } // L: 15 - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "77" - ) - static void method4498() { - if (Client.renderSelf) { // L: 4288 - class166.addPlayerToScene(class19.localPlayer, false); // L: 4289 - } - - } // L: 4291 - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "11" - ) - static void method4497(int var0, String var1) { - int var2 = Players.Players_count; // L: 9001 - int[] var3 = Players.Players_indices; // L: 9002 - boolean var4 = false; // L: 9003 - Username var5 = new Username(var1, class83.loginType); // L: 9004 - - for (int var6 = 0; var6 < var2; ++var6) { // L: 9005 - Player var7 = Client.players[var3[var6]]; // L: 9006 - if (var7 != null && var7 != class19.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9007 - PacketBufferNode var8; - if (var0 == 1) { // L: 9008 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9010 - var8.packetBuffer.method7795(var3[var6]); // L: 9011 - var8.packetBuffer.method7786(0); // L: 9012 - Client.packetWriter.addNode(var8); // L: 9013 - } else if (var0 == 4) { // L: 9015 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 9017 - var8.packetBuffer.method7787(0); // L: 9018 - var8.packetBuffer.writeShort(var3[var6]); // L: 9019 - Client.packetWriter.addNode(var8); // L: 9020 - } else if (var0 == 6) { // L: 9022 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2903, Client.packetWriter.isaacCipher); // L: 9024 - var8.packetBuffer.method7791(var3[var6]); // L: 9025 - var8.packetBuffer.writeByte(0); // L: 9026 - Client.packetWriter.addNode(var8); // L: 9027 - } else if (var0 == 7) { // L: 9029 - var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 9031 - var8.packetBuffer.writeShort(var3[var6]); // L: 9032 - var8.packetBuffer.method7786(0); // L: 9033 - Client.packetWriter.addNode(var8); // L: 9034 - } - - var4 = true; // L: 9036 - break; - } - } - - if (!var4) { // L: 9040 - Login.addGameMessage(4, "", "Unable to find " + var1); - } - - } // L: 9041 } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 995644d1bf..d562dd9fda 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,54 +4,103 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@Deprecated -@ObfuscatedName("fm") +@ObfuscatedName("fg") @Implements("VerticalAlignment") public enum VerticalAlignment implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfg;" ) - field1947(2, 0), - @ObfuscatedName("o") + field1935(2, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfg;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(0, 1), - @ObfuscatedName("h") + VerticalAlignment_centered(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfg;" ) - field1944(1, 2); + field1932(0, 2); - @ObfuscatedName("k") - public static short[] field1950; - @ObfuscatedName("g") + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "Lfx;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "Lck;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1431612301 + intValue = 609598821 ) @Export("value") public final int value; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1666832407 + intValue = -2060500087 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; // L: 14 - this.id = var4; // L: 15 - } // L: 16 + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 20 + return this.id; // L: 23 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lbb;Lbb;IZIZI)I", + garbageValue = "-1569793930" + ) + static int method3538(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = SpriteMask.compareWorlds(var0, var1, var2, var3); // L: 199 + if (var6 != 0) { // L: 200 + return var3 ? -var6 : var6; // L: 201 + } else if (var4 == -1) { // L: 204 + return 0; + } else { + int var7 = SpriteMask.compareWorlds(var0, var1, var4, var5); // L: 205 + return var5 ? -var7 : var7; // L: 206 + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lgj;I)Z", + garbageValue = "1046018492" + ) + static boolean method3539(ObjectComposition var0) { + if (var0.transforms != null) { // L: 585 + int[] var1 = var0.transforms; // L: 587 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 588 + int var3 = var1[var2]; // L: 589 + ObjectComposition var4 = class146.getObjectDefinition(var3); // L: 591 + if (var4.mapIconId != -1) { // L: 592 + return true; // L: 593 + } + } + } else if (var0.mapIconId != -1) { // L: 599 + return true; // L: 600 + } + + return false; // L: 602 } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index ae023cc77c..1366e5daa7 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,144 +1,236 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hl") +@ObfuscatedName("in") @Implements("ViewportMouse") public class ViewportMouse { + @ObfuscatedName("st") + @ObfuscatedSignature( + descriptor = "Lay;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; @ObfuscatedName("v") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2033898479 + intValue = 1903287325 ) @Export("ViewportMouse_x") public static int ViewportMouse_x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1837760981 + intValue = 322199893 ) @Export("ViewportMouse_y") public static int ViewportMouse_y; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("ViewportMouse_false0") public static boolean ViewportMouse_false0; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -601964039 + intValue = -431054751 ) - static int field2577; - @ObfuscatedName("f") + static int field2802; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -914077727 + intValue = -1402550959 ) - static int field2581; - @ObfuscatedName("u") + static int field2805; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -175114873 + intValue = -276012747 ) - static int field2579; - @ObfuscatedName("j") + static int field2804; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lqi;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 755934233 + intValue = -1834346387 + ) + static int field2808; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 291985385 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("go") - @ObfuscatedSignature( - descriptor = "Lmr;" - ) - @Export("fontPlain12") - static Font fontPlain12; static { ViewportMouse_isInViewport = false; // L: 4 ViewportMouse_x = 0; // L: 5 ViewportMouse_y = 0; // L: 6 ViewportMouse_false0 = false; // L: 7 - ViewportMouse_entityCount = 0; + ViewportMouse_entityCount = 0; // L: 17 ViewportMouse_entityTags = new long[1000]; // L: 18 } - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "2056272392" + descriptor = "([BI)Lmd;", + garbageValue = "-2081497331" ) - static final boolean method4463(char var0) { - if (Character.isISOControl(var0)) { // L: 16 - return false; - } else if (NetFileRequest.isAlphaNumeric(var0)) { // L: 17 - return true; + static Font method5090(byte[] var0) { + if (var0 == null) { // L: 188 + return null; } else { - char[] var1 = class422.field4564; // L: 19 - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { // L: 20 - var3 = var1[var2]; // L: 21 - if (var0 == var3) { // L: 22 - return true; - } - } - - var1 = class422.field4562; // L: 26 - - for (var2 = 0; var2 < var1.length; ++var2) { // L: 27 - var3 = var1[var2]; // L: 28 - if (var0 == var3) { - return true; // L: 29 - } - } - - return false; // L: 32 + Font var1 = new Font(var0, class451.SpriteBuffer_xOffsets, class271.SpriteBuffer_yOffsets, class451.SpriteBuffer_spriteWidths, class451.SpriteBuffer_spriteHeights, NetFileRequest.SpriteBuffer_spritePalette, FriendLoginUpdate.SpriteBuffer_pixels); // L: 189 + ArchiveDiskActionHandler.method5813(); // L: 190 + return var1; // L: 191 } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "-1245654487" + descriptor = "(ILbd;ZB)I", + garbageValue = "-41" ) - static void method4493(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(AccessFile.JagexCache_locationFile, "rw", 10000L); // L: 133 - Buffer var3 = new Buffer(500); // L: 134 - var3.writeByte(3); // L: 135 - var3.writeByte(var1 != null ? 1 : 0); // L: 136 - var3.writeCESU8(var0.getPath()); // L: 137 - if (var1 != null) { - var3.writeCESU8(""); // L: 138 + static int method5089(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2124 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; // L: 2125 + return 1; // L: 2126 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2128 + Interpreter.Interpreter_intStackSize -= 2; // L: 2129 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2130 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2131 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.method2093(var3, var4); // L: 2132 + return 1; // L: 2133 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2135 + Interpreter.Interpreter_intStackSize -= 2; // L: 2136 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2137 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2138 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class385.ItemContainer_getCount(var3, var4); // L: 2139 + return 1; // L: 2140 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2142 + Interpreter.Interpreter_intStackSize -= 2; // L: 2143 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2144 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2145 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.method1910(var3, var4); // L: 2146 + return 1; // L: 2147 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2149 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2150 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Script.getInvDefinition(var3).size; // L: 2151 + return 1; // L: 2152 + } else if (var0 == ScriptOpcodes.STAT) { // L: 2154 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2155 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2156 + return 1; // L: 2157 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2159 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2160 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2161 + return 1; // L: 2162 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2164 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2165 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2166 + return 1; // L: 2167 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 2169 + var3 = class18.Client_plane; // L: 2170 + var4 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 2171 + var5 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 2172 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2173 + return 1; // L: 2174 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 2176 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2177 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2178 + return 1; // L: 2179 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2181 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2182 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2183 + return 1; // L: 2184 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 2186 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2187 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2188 + return 1; // L: 2189 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2191 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2192 + return 1; // L: 2193 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2195 + Interpreter.Interpreter_intStackSize -= 2; // L: 2196 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2197 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2198 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.method2093(var3, var4); // L: 2199 + return 1; // L: 2200 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2202 + Interpreter.Interpreter_intStackSize -= 2; // L: 2203 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2204 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2205 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class385.ItemContainer_getCount(var3, var4); // L: 2206 + return 1; // L: 2207 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2209 + Interpreter.Interpreter_intStackSize -= 2; // L: 2210 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2211 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2212 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.method1910(var3, var4); // L: 2213 + return 1; // L: 2214 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2216 + if (Client.staffModLevel >= 2) { // L: 2217 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2218 + } + + return 1; // L: 2219 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2221 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2222 + return 1; // L: 2223 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2225 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; // L: 2226 + return 1; // L: 2227 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2229 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2230 + return 1; // L: 2231 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2233 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; // L: 2234 + return 1; // L: 2235 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2237 + if (Client.playerMod) { // L: 2238 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2239 + } + + return 1; // L: 2240 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2242 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2243 + return 1; // L: 2244 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2246 + Interpreter.Interpreter_intStackSize -= 4; // L: 2247 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2248 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2249 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2250 + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2251 + var3 += var4 << 14; // L: 2252 + var3 += var5 << 28; // L: 2253 + var3 += var6; // L: 2254 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 2255 + return 1; // L: 2256 + } else if (var0 == 3326) { // L: 2258 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field508; // L: 2259 + return 1; // L: 2260 + } else if (var0 == 3327) { // L: 2262 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field509; // L: 2263 + return 1; // L: 2264 + } else { + return 2; // L: 2266 + } } - - var2.write(var3.array, 0, var3.offset); // L: 139 - var2.close(); // L: 140 - } catch (IOException var4) { // L: 142 - var4.printStackTrace(); // L: 143 } - - } // L: 145 - - @ObfuscatedName("kg") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "115" - ) - static final int method4492() { - float var0 = 200.0F * ((float)Interpreter.clientPreferences.method2266() - 0.5F); // L: 11347 - return 100 - Math.round(var0); // L: 11348 } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index d4e2000bec..e141d14fc7 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,122 +2,122 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ag") +@ObfuscatedName("ax") @Implements("VorbisCodebook") public class VorbisCodebook { @ObfuscatedName("v") @Export("dimensions") int dimensions; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("entries") int entries; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("g") - int[] field360; - @ObfuscatedName("l") - float[][] field358; + @ObfuscatedName("f") + int[] field353; + @ObfuscatedName("b") + float[][] field350; @ObfuscatedName("n") @Export("keys") int[] keys; VorbisCodebook() { - VorbisSample.readBits(24); // L: 22 - this.dimensions = VorbisSample.readBits(16); // L: 23 - this.entries = VorbisSample.readBits(24); // L: 24 - this.lengthMap = new int[this.entries]; // L: 25 - boolean var1 = VorbisSample.readBit() != 0; // L: 26 + VorbisSample.readBits(24); // L: 41 + this.dimensions = VorbisSample.readBits(16); // L: 42 + this.entries = VorbisSample.readBits(24); // L: 43 + this.lengthMap = new int[this.entries]; // L: 44 + boolean var1 = VorbisSample.readBit() != 0; // L: 45 int var2; int var3; int var5; - if (var1) { // L: 27 - var2 = 0; // L: 28 + if (var1) { // L: 46 + var2 = 0; // L: 47 - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 - int var4 = VorbisSample.readBits(class326.iLog(this.entries - var2)); // L: 31 + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 + int var4 = VorbisSample.readBits(class143.iLog(this.entries - var2)); // L: 50 - for (var5 = 0; var5 < var4; ++var5) { // L: 32 + for (var5 = 0; var5 < var4; ++var5) { // L: 51 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; // L: 37 + boolean var14 = VorbisSample.readBit() != 0; // L: 56 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 38 - if (var14 && VorbisSample.readBit() == 0) { // L: 39 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 + if (var14 && VorbisSample.readBit() == 0) { // L: 58 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40 + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 } } } - this.method991(); // L: 43 - var2 = VorbisSample.readBits(4); // L: 44 - if (var2 > 0) { // L: 45 - float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 - float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47 - var5 = VorbisSample.readBits(4) + 1; // L: 48 - boolean var6 = VorbisSample.readBit() != 0; // L: 49 + this.method987(); // L: 62 + var2 = VorbisSample.readBits(4); // L: 63 + if (var2 > 0) { // L: 64 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 66 + var5 = VorbisSample.readBits(4) + 1; // L: 67 + boolean var6 = VorbisSample.readBit() != 0; // L: 68 int var7; - if (var2 == 1) { // L: 51 + if (var2 == 1) { // L: 70 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; // L: 52 + var7 = this.entries * this.dimensions; // L: 71 } - this.field360 = new int[var7]; // L: 53 + this.field353 = new int[var7]; // L: 72 int var8; - for (var8 = 0; var8 < var7; ++var8) { // L: 54 - this.field360[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 73 + this.field353[var8] = VorbisSample.readBits(var5); } - this.field358 = new float[this.entries][this.dimensions]; // L: 55 + this.field350 = new float[this.entries][this.dimensions]; // L: 74 float var9; int var10; int var11; - if (var2 == 1) { // L: 56 - for (var8 = 0; var8 < this.entries; ++var8) { // L: 57 - var9 = 0.0F; // L: 58 - var10 = 1; // L: 59 + if (var2 == 1) { // L: 75 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 76 + var9 = 0.0F; // L: 77 + var10 = 1; // L: 78 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 - int var12 = var8 / var10 % var7; // L: 61 - float var13 = (float)this.field360[var12] * var16 + var15 + var9; // L: 62 - this.field358[var8][var11] = var13; // L: 63 - if (var6) { // L: 64 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 + int var12 = var8 / var10 % var7; // L: 80 + float var13 = (float)this.field353[var12] * var16 + var15 + var9; // L: 81 + this.field350[var8][var11] = var13; // L: 82 + if (var6) { // L: 83 var9 = var13; } - var10 *= var7; // L: 65 + var10 *= var7; // L: 84 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { // L: 70 - var9 = 0.0F; // L: 71 - var10 = var8 * this.dimensions; // L: 72 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 89 + var9 = 0.0F; // L: 90 + var10 = var8 * this.dimensions; // L: 91 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 - float var17 = (float)this.field360[var10] * var16 + var15 + var9; // L: 74 - this.field358[var8][var11] = var17; // L: 75 - if (var6) { // L: 76 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 + float var17 = (float)this.field353[var10] * var16 + var15 + var9; // L: 93 + this.field350[var8][var11] = var17; // L: 94 + if (var6) { // L: 95 var9 = var17; } - ++var10; // L: 77 + ++var10; // L: 96 } } } } - } // L: 82 + } // L: 101 - @ObfuscatedName("o") - void method991() { - int[] var1 = new int[this.entries]; // L: 85 - int[] var2 = new int[33]; // L: 87 + @ObfuscatedName("c") + void method987() { + int[] var1 = new int[this.entries]; // L: 104 + int[] var2 = new int[33]; // L: 106 int var3; int var4; @@ -126,109 +126,132 @@ public class VorbisCodebook { int var7; int var8; int var10; - for (var3 = 0; var3 < this.entries; ++var3) { // L: 88 - var4 = this.lengthMap[var3]; // L: 89 - if (var4 != 0) { // L: 90 - var5 = 1 << 32 - var4; // L: 91 - var6 = var2[var4]; // L: 92 - var1[var3] = var6; // L: 93 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 107 + var4 = this.lengthMap[var3]; // L: 108 + if (var4 != 0) { // L: 109 + var5 = 1 << 32 - var4; // L: 110 + var6 = var2[var4]; // L: 111 + var1[var3] = var6; // L: 112 int var12; - if ((var6 & var5) != 0) { // L: 95 - var7 = var2[var4 - 1]; // L: 96 + if ((var6 & var5) != 0) { // L: 114 + var7 = var2[var4 - 1]; // L: 115 } else { - var7 = var6 | var5; // L: 99 + var7 = var6 | var5; // L: 118 - for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100 - var12 = var2[var8]; // L: 101 - if (var12 != var6) { // L: 102 + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119 + var12 = var2[var8]; // L: 120 + if (var12 != var6) { // L: 121 break; } - var10 = 1 << 32 - var8; // L: 103 - if ((var12 & var10) != 0) { // L: 104 - var2[var8] = var2[var8 - 1]; // L: 105 - break; // L: 106 + var10 = 1 << 32 - var8; // L: 122 + if ((var12 & var10) != 0) { // L: 123 + var2[var8] = var2[var8 - 1]; // L: 124 + break; // L: 125 } - var2[var8] = var12 | var10; // L: 109 + var2[var8] = var12 | var10; // L: 128 } } - var2[var4] = var7; // L: 115 + var2[var4] = var7; // L: 134 - for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116 - var12 = var2[var8]; // L: 117 - if (var12 == var6) { // L: 118 + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135 + var12 = var2[var8]; // L: 136 + if (var12 == var6) { // L: 137 var2[var8] = var7; } } } } - this.keys = new int[8]; // L: 122 - int var11 = 0; // L: 123 + this.keys = new int[8]; // L: 141 + int var11 = 0; // L: 142 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 124 - var4 = this.lengthMap[var3]; // L: 125 - if (var4 != 0) { // L: 126 - var5 = var1[var3]; // L: 127 - var6 = 0; // L: 128 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 143 + var4 = this.lengthMap[var3]; // L: 144 + if (var4 != 0) { // L: 145 + var5 = var1[var3]; // L: 146 + var6 = 0; // L: 147 - for (var7 = 0; var7 < var4; ++var7) { // L: 129 - var8 = Integer.MIN_VALUE >>> var7; // L: 130 - if ((var5 & var8) != 0) { // L: 131 - if (this.keys[var6] == 0) { // L: 132 + for (var7 = 0; var7 < var4; ++var7) { // L: 148 + var8 = Integer.MIN_VALUE >>> var7; // L: 149 + if ((var5 & var8) != 0) { // L: 150 + if (this.keys[var6] == 0) { // L: 151 this.keys[var6] = var11; } - var6 = this.keys[var6]; // L: 133 + var6 = this.keys[var6]; // L: 152 } else { - ++var6; // L: 136 + ++var6; // L: 155 } - if (var6 >= this.keys.length) { // L: 138 - int[] var9 = new int[this.keys.length * 2]; // L: 139 + if (var6 >= this.keys.length) { // L: 157 + int[] var9 = new int[this.keys.length * 2]; // L: 158 - for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140 + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 var9[var10] = this.keys[var10]; } - this.keys = var9; // L: 141 + this.keys = var9; // L: 160 } - var8 >>>= 1; // L: 143 + var8 >>>= 1; // L: 162 } - this.keys[var6] = ~var3; // L: 145 - if (var6 >= var11) { // L: 146 + this.keys[var6] = ~var3; // L: 164 + if (var6 >= var11) { // L: 165 var11 = var6 + 1; } } } - } // L: 148 + } // L: 167 - @ObfuscatedName("h") - int method999() { + @ObfuscatedName("i") + int method988() { int var1; - for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 + for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171 } - return ~this.keys[var1]; // L: 153 + return ~this.keys[var1]; // L: 172 } - @ObfuscatedName("g") - float[] method1005() { - return this.field358[this.method999()]; // L: 157 + @ObfuscatedName("f") + float[] method989() { + return this.field350[this.method988()]; // L: 176 } @ObfuscatedName("v") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; JagexCache.method3206(var2, var1) > var0; --var2) { // L: 16 17 - } + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 - return var2; // L: 18 + while (true) { + int var4 = var2; // L: 19 + int var5 = var1; // L: 20 + + int var6; + for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 + if ((var5 & 1) != 0) { // L: 24 + var6 *= var4; + } + + var4 *= var4; // L: 25 + } + + int var3; + if (var5 == 1) { // L: 28 + var3 = var6 * var4; // L: 29 + } else { + var3 = var6; // L: 32 + } + + if (var3 <= var0) { // L: 34 + return var2; // L: 37 + } + + --var2; // L: 35 + } } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 7cda3bdcb0..233e208b44 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("as") +@ObfuscatedName("an") @Implements("VorbisFloor") public class VorbisFloor { @ObfuscatedName("v") - static final int[] field276; - @ObfuscatedName("o") + static final int[] field263; + @ObfuscatedName("c") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; + @ObfuscatedName("o") + static int[] field256; @ObfuscatedName("r") - static int[] field274; - @ObfuscatedName("k") - static int[] field268; - @ObfuscatedName("x") - static boolean[] field278; - @ObfuscatedName("h") - int[] field269; - @ObfuscatedName("g") + static int[] field266; + @ObfuscatedName("p") + static boolean[] field265; + @ObfuscatedName("i") + int[] field258; + @ObfuscatedName("f") @Export("multiplier") int multiplier; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("partitionClassList") int[] partitionClassList; @ObfuscatedName("n") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("subclassBooks") int[][] subclassBooks; static { - field276 = new int[]{256, 128, 86, 64}; // L: 8 + field263 = new int[]{256, 128, 86, 64}; // L: 8 VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9 } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field269 = new int[var5]; // L: 137 - this.field269[0] = 0; // L: 138 - this.field269[1] = 1 << var4; // L: 139 + this.field258 = new int[var5]; // L: 137 + this.field258[0] = 0; // L: 138 + this.field258[1] = 1 << var4; // L: 139 var5 = 2; // L: 140 for (var6 = 0; var6 < var2; ++var6) { // L: 141 var7 = this.partitionClassList[var6]; // L: 142 for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field269[var5++] = VorbisSample.readBits(var4); + this.field258[var5++] = VorbisSample.readBits(var4); } } - if (field274 == null || field274.length < var5) { // L: 145 - field274 = new int[var5]; // L: 146 - field268 = new int[var5]; // L: 147 - field278 = new boolean[var5]; // L: 148 + if (field256 == null || field256.length < var5) { // L: 145 + field256 = new int[var5]; // L: 146 + field266 = new int[var5]; // L: 147 + field265 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("h") - int method696(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("i") + int method666(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; // L: 50 int var7 = var3 - var1; // L: 51 int var8 = var6 < 0 ? -var6 : var6; // L: 52 @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("g") - void method697(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("f") + void method672(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; // L: 59 int var8 = var3 - var1; // L: 60 int var9 = var7 < 0 ? -var7 : var7; // L: 61 @@ -153,31 +153,31 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 - int var4 = field274[var1]; // L: 85 - int var5 = field268[var1]; // L: 86 - boolean var6 = field278[var1]; // L: 87 + int var4 = field256[var1]; // L: 85 + int var5 = field266[var1]; // L: 86 + boolean var6 = field265[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field274[var7]; // L: 89 + int var8 = field256[var7]; // L: 89 if (var8 < var4) { // L: 90 - field274[var3] = var8; // L: 91 - field268[var3] = field268[var7]; // L: 92 - field278[var3] = field278[var7]; // L: 93 + field256[var3] = var8; // L: 91 + field266[var3] = field266[var7]; // L: 92 + field265[var3] = field265[var7]; // L: 93 ++var3; // L: 94 - field274[var7] = field274[var3]; // L: 95 - field268[var7] = field268[var3]; // L: 96 - field278[var7] = field278[var3]; // L: 97 + field256[var7] = field256[var3]; // L: 95 + field266[var7] = field266[var3]; // L: 96 + field265[var7] = field265[var3]; // L: 97 } } - field274[var3] = var4; // L: 100 - field268[var3] = var5; // L: 101 - field278[var3] = var6; // L: 102 + field256[var3] = var4; // L: 100 + field266[var3] = var5; // L: 101 + field265[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } @@ -190,17 +190,17 @@ public class VorbisFloor { if (!var1) { // L: 154 return false; } else { - int var2 = this.field269.length; // L: 155 + int var2 = this.field258.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field274[var3] = this.field269[var3]; + field256[var3] = this.field258[var3]; } - var3 = field276[this.multiplier - 1]; // L: 157 - int var4 = class326.iLog(var3 - 1); // L: 158 - field268[0] = VorbisSample.readBits(var4); // L: 159 - field268[1] = VorbisSample.readBits(var4); // L: 160 + var3 = field263[this.multiplier - 1]; // L: 157 + int var4 = class143.iLog(var3 - 1); // L: 158 + field266[0] = VorbisSample.readBits(var4); // L: 159 + field266[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; // L: 166 int var11 = 0; // L: 167 if (var9 > 0) { // L: 168 - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method999(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method988(); } for (int var12 = 0; var12 < var8; ++var12) { // L: 169 int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 var11 >>>= var9; // L: 171 - field268[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method999() : 0; // L: 172 + field266[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method988() : 0; // L: 172 } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("d") - void method700(float[] var1, int var2) { - int var3 = this.field269.length; // L: 179 - int var4 = field276[this.multiplier - 1]; // L: 180 - boolean[] var5 = field278; // L: 181 - field278[1] = true; // L: 182 + @ObfuscatedName("s") + void method665(float[] var1, int var2) { + int var3 = this.field258.length; // L: 179 + int var4 = field263[this.multiplier - 1]; // L: 180 + boolean[] var5 = field265; // L: 181 + field265[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method709(field274, var6); // L: 185 - var8 = method705(field274, var6); // L: 186 - var9 = this.method696(field274[var7], field268[var7], field274[var8], field268[var8], field274[var6]); // L: 187 - var10 = field268[var6]; // L: 188 + var7 = method673(field256, var6); // L: 185 + var8 = method664(field256, var6); // L: 186 + var9 = this.method666(field256[var7], field266[var7], field256[var8], field266[var8], field256[var6]); // L: 187 + var10 = field266[var6]; // L: 188 int var11 = var4 - var9; // L: 189 int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191 if (var10 != 0) { // L: 192 - boolean[] var14 = field278; // L: 193 - field278[var8] = true; // L: 195 + boolean[] var14 = field265; // L: 193 + field265[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field278[var6] = true; // L: 197 + field265[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field268[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field266[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field268[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field266[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field278[var6] = false; // L: 206 - field268[var6] = var9; // L: 207 + field265[var6] = false; // L: 206 + field266[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field268[0] * this.multiplier; // L: 212 + var7 = field266[0] * this.multiplier; // L: 212 for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field278[var8]) { // L: 214 - var9 = field274[var8]; // L: 215 - var10 = field268[var8] * this.multiplier; // L: 216 - this.method697(var6, var7, var9, var10, var1, var2); // L: 217 + if (field265[var8]) { // L: 214 + var9 = field256[var8]; // L: 215 + var10 = field266[var8] * this.multiplier; // L: 216 + this.method672(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -287,7 +287,7 @@ public class VorbisFloor { } // L: 225 @ObfuscatedName("v") - static int method709(int[] var0, int var1) { + static int method673(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("o") - static int method705(int[] var0, int var1) { + @ObfuscatedName("c") + static int method664(int[] var0, int var1) { int var2 = var0[var1]; // L: 36 int var3 = -1; // L: 37 int var4 = Integer.MAX_VALUE; // L: 38 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index fe171f0c45..a3431a638a 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("ak") +@ObfuscatedName("ad") @Implements("VorbisMapping") public class VorbisMapping { @ObfuscatedName("v") @Export("submaps") int submaps; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("mappingMux") int mappingMux; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 486c505f1b..d80dba7a2e 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("ah") +@ObfuscatedName("ab") @Implements("VorbisResidue") public class VorbisResidue { @ObfuscatedName("v") @Export("residueType") int residueType; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("begin") int begin; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("end") int end; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("partitionSize") int partitionSize; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("classifications") int classifications; @ObfuscatedName("n") @Export("classbook") int classbook; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("cascade") int[] cascade; @@ -57,7 +57,7 @@ public class VorbisResidue { } // L: 31 @ObfuscatedName("v") - void method807(float[] var1, int var2, boolean var3) { + void method784(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method999(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method988(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; // L: 60 for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method1005(); // L: 62 + float[] var20 = var14.method989(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method1005(); // L: 69 + float[] var16 = var14.method989(); // L: 69 for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 var1[var13 + var15] += var16[var17]; // L: 71 diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 3c2834b78d..ab19bd72cc 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("af") +@ObfuscatedName("ar") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lag;" + descriptor = "[Lax;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Las;" + descriptor = "[Lan;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lah;" + descriptor = "[Lab;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lak;" + descriptor = "[Lad;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("b") + @ObfuscatedName("u") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("w") - static boolean field380; - @ObfuscatedName("z") - static float[] field385; - @ObfuscatedName("e") - static float[] field390; @ObfuscatedName("t") - static float[] field392; - @ObfuscatedName("i") - static float[] field395; - @ObfuscatedName("ac") - static float[] field389; - @ObfuscatedName("ax") - static float[] field376; - @ObfuscatedName("ay") - static float[] field391; - @ObfuscatedName("au") - static int[] field373; - @ObfuscatedName("at") - static int[] field367; + static boolean field369; + @ObfuscatedName("j") + static float[] field378; + @ObfuscatedName("e") + static float[] field379; + @ObfuscatedName("z") + static float[] field356; + @ObfuscatedName("h") + static float[] field381; + @ObfuscatedName("ae") + static float[] field382; + @ObfuscatedName("aq") + static float[] field383; + @ObfuscatedName("aw") + static float[] field384; + @ObfuscatedName("am") + static int[] field385; + @ObfuscatedName("ak") + static int[] field386; @ObfuscatedName("v") - byte[][] field370; - @ObfuscatedName("o") + byte[][] field374; + @ObfuscatedName("c") @Export("sampleRate") int sampleRate; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("sampleCount") int sampleCount; - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("start") int start; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("end") int end; @ObfuscatedName("n") - boolean field368; + boolean field373; + @ObfuscatedName("g") + float[] field377; + @ObfuscatedName("x") + int field375; @ObfuscatedName("a") - float[] field381; - @ObfuscatedName("m") - int field382; - @ObfuscatedName("q") - int field383; + int field376; @ObfuscatedName("y") - boolean field384; - @ObfuscatedName("aw") + boolean field389; + @ObfuscatedName("ao") @Export("samples") byte[] samples; - @ObfuscatedName("ar") - int field393; - @ObfuscatedName("ae") - int field386; + @ObfuscatedName("aj") + int field388; + @ObfuscatedName("al") + int field364; static { - field380 = false; // L: 28 + field369 = false; // L: 28 } VorbisSample(byte[] var1) { this.read(var1); // L: 417 } // L: 418 - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field368 = true; // L: 96 + this.field373 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 - this.field370 = new byte[var3][]; // L: 99 + this.field374 = new byte[var3][]; // L: 99 for (int var4 = 0; var4 < var3; ++var4) { // L: 100 int var5 = 0; // L: 101 @@ -138,16 +138,16 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; // L: 107 var2.readBytes(var7, 0, var5); // L: 108 - this.field370[var4] = var7; // L: 109 + this.field374[var4] = var7; // L: 109 } } // L: 111 - @ObfuscatedName("d") - float[] method1015(int var1) { - VorbisSample_setData(this.field370[var1], 0); // L: 198 + @ObfuscatedName("s") + float[] method1000(int var1) { + VorbisSample_setData(this.field374[var1], 0); // L: 198 readBit(); // L: 199 - int var2 = readBits(class326.iLog(VorbisSample_mapping.length - 1)); // L: 200 + int var2 = readBits(class143.iLog(VorbisSample_mapping.length - 1)); // L: 200 boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202 boolean var5 = false; // L: 203 @@ -192,27 +192,27 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 - float[] var44 = field385; // L: 246 - var42.method807(var44, var4 >> 1, var45); // L: 247 + float[] var44 = field378; // L: 246 + var42.method784(var44, var4 >> 1, var45); // L: 247 } int var18; if (!var15) { // L: 250 var17 = var14.mappingMux; // L: 251 var18 = var14.submapFloor[var17]; // L: 252 - VorbisSample_floors[var18].method700(field385, var4 >> 1); // L: 253 + VorbisSample_floors[var18].method665(field378, var4 >> 1); // L: 253 } int var19; if (var15) { // L: 256 for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 - field385[var17] = 0.0F; + field378[var17] = 0.0F; } } else { var17 = var4 >> 1; // L: 260 var18 = var4 >> 2; // L: 261 var19 = var4 >> 3; // L: 262 - float[] var20 = field385; // L: 263 + float[] var20 = field378; // L: 263 int var21; for (var21 = 0; var21 < var17; ++var21) { // L: 264 @@ -223,10 +223,10 @@ public class VorbisSample extends Node { var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field389 : field390; // L: 266 - float[] var22 = var3 ? field376 : field392; // L: 267 - float[] var23 = var3 ? field391 : field395; // L: 268 - int[] var24 = var3 ? field367 : field373; // L: 269 + float[] var40 = var3 ? field382 : field379; // L: 266 + float[] var22 = var3 ? field383 : field356; // L: 267 + float[] var23 = var3 ? field384 : field381; // L: 268 + int[] var24 = var3 ? field386 : field385; // L: 269 int var25; float var26; @@ -257,7 +257,7 @@ public class VorbisSample extends Node { var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 } - var25 = class326.iLog(var4 - 1); // L: 290 + var25 = class143.iLog(var4 - 1); // L: 290 int var46; int var47; @@ -357,49 +357,49 @@ public class VorbisSample extends Node { float[] var10000; for (var46 = var8; var46 < var9; ++var46) { // L: 361 var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 - var10000 = field385; // L: 363 + var10000 = field378; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } for (var46 = var11; var46 < var12; ++var46) { // L: 365 var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 - var10000 = field385; // L: 367 + var10000 = field378; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } float[] var41 = null; // L: 370 - if (this.field382 > 0) { // L: 371 - var18 = var4 + this.field382 >> 2; // L: 372 + if (this.field375 > 0) { // L: 371 + var18 = var4 + this.field375 >> 2; // L: 372 var41 = new float[var18]; // L: 373 int var43; - if (!this.field384) { // L: 374 - for (var19 = 0; var19 < this.field383; ++var19) { // L: 375 - var43 = var19 + (this.field382 >> 1); // L: 376 - var41[var19] += this.field381[var43]; // L: 377 + if (!this.field389) { // L: 374 + for (var19 = 0; var19 < this.field376; ++var19) { // L: 375 + var43 = var19 + (this.field375 >> 1); // L: 376 + var41[var19] += this.field377[var43]; // L: 377 } } if (!var15) { // L: 380 for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 var43 = var41.length - (var4 >> 1) + var19; // L: 382 - var41[var43] += field385[var19]; // L: 383 + var41[var43] += field378[var19]; // L: 383 } } } - float[] var54 = this.field381; // L: 387 - this.field381 = field385; // L: 388 - field385 = var54; // L: 389 - this.field382 = var4; // L: 390 - this.field383 = var12 - (var4 >> 1); // L: 391 - this.field384 = var15; // L: 392 + float[] var54 = this.field377; // L: 387 + this.field377 = field378; // L: 388 + field378 = var54; // L: 389 + this.field375 = var4; // L: 390 + this.field376 = var12 - (var4 >> 1); // L: 391 + this.field389 = var15; // L: 392 return var41; // L: 393 } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([I)Laj;" + descriptor = "([I)Lat;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { // L: 422 - this.field382 = 0; // L: 423 - this.field381 = new float[VorbisSample_blockSize1]; // L: 424 + this.field375 = 0; // L: 423 + this.field377 = new float[VorbisSample_blockSize1]; // L: 424 this.samples = new byte[this.sampleCount]; // L: 425 - this.field393 = 0; // L: 426 - this.field386 = 0; // L: 427 + this.field388 = 0; // L: 426 + this.field364 = 0; // L: 427 } - for (; this.field386 < this.field370.length; ++this.field386) { // L: 429 444 + for (; this.field364 < this.field374.length; ++this.field364) { // L: 429 444 if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - float[] var2 = this.method1015(this.field386); // L: 431 + float[] var2 = this.method1000(this.field364); // L: 431 if (var2 != null) { // L: 432 - int var3 = this.field393; // L: 433 + int var3 = this.field388; // L: 433 int var4 = var2.length; // L: 434 if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; @@ -437,17 +437,17 @@ public class VorbisSample extends Node { } if (var1 != null) { // L: 441 - var1[0] -= var3 - this.field393; + var1[0] -= var3 - this.field388; } - this.field393 = var3; // L: 442 + this.field388 = var3; // L: 442 } } - this.field381 = null; // L: 446 + this.field377 = null; // L: 446 byte[] var7 = this.samples; // L: 447 this.samples = null; // L: 448 - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field368); // L: 449 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field373); // L: 449 } } @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("g") + @ObfuscatedName("f") @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -508,11 +508,11 @@ public class VorbisSample extends Node { } @ObfuscatedName("n") - static void method1011(byte[] var0) { + static void method999(byte[] var0) { VorbisSample_setData(var0, 0); // L: 114 VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field385 = new float[VorbisSample_blockSize1]; // L: 117 + field378 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -546,7 +546,7 @@ public class VorbisSample extends Node { } int[] var21 = new int[var5]; // L: 138 - int var10 = class326.iLog(var5 - 1); // L: 139 + int var10 = class143.iLog(var5 - 1); // L: 139 for (int var11 = 0; var11 < var5; ++var11) { // L: 140 int var15 = var11; // L: 144 @@ -562,15 +562,15 @@ public class VorbisSample extends Node { } if (var1 != 0) { // L: 157 - field389 = var18; // L: 158 - field376 = var19; // L: 159 - field391 = var20; // L: 160 - field367 = var21; // L: 161 + field382 = var18; // L: 158 + field383 = var19; // L: 159 + field384 = var20; // L: 160 + field386 = var21; // L: 161 } else { - field390 = var18; // L: 164 - field392 = var19; // L: 165 - field395 = var20; // L: 166 - field373 = var21; // L: 167 + field379 = var18; // L: 164 + field356 = var19; // L: 165 + field381 = var20; // L: 166 + field385 = var21; // L: 167 } } @@ -621,31 +621,31 @@ public class VorbisSample extends Node { } // L: 195 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Llq;)Z" + descriptor = "(Lln;)Z" ) - static boolean method1030(AbstractArchive var0) { - if (!field380) { // L: 397 + static boolean method1021(AbstractArchive var0) { + if (!field369) { // L: 397 byte[] var1 = var0.takeFile(0, 0); // L: 398 if (var1 == null) { // L: 399 return false; } - method1011(var1); // L: 400 - field380 = true; // L: 401 + method999(var1); // L: 400 + field369 = true; // L: 401 } return true; // L: 403 } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Llq;II)Laf;" + descriptor = "(Lln;II)Lar;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1030(var0)) { // L: 407 + if (!method1021(var0)) { // L: 407 var0.tryLoadFile(var1, var2); // L: 408 return null; // L: 409 } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 6c4710c5bb..9038eccddd 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,72 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("io") @Implements("WallDecoration") public final class WallDecoration { + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1952135175 + intValue = -1273290179 ) @Export("z") int z; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1874922275 + intValue = 1499164855 ) @Export("x") int x; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1796467831 + intValue = 2128198353 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1898535773 + intValue = 1183896313 ) @Export("orientation") int orientation; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -398764443 + intValue = 632137083 ) @Export("orientation2") int orientation2; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -689013995 + intValue = -35989305 ) @Export("xOffset") int xOffset; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1862395077 + intValue = 322472367 ) @Export("yOffset") int yOffset; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lix;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 3480899029470944713L + longValue = 2319004435936735131L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -454015765 + intValue = -1666426439 ) @Export("flags") int flags; @@ -78,42 +84,4 @@ public final class WallDecoration { this.tag = 0L; // L: 13 this.flags = 0; // L: 14 } // L: 16 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;III)[Lqx;", - garbageValue = "1626861036" - ) - public static IndexedSprite[] method4516(AbstractArchive var0, int var1, int var2) { - if (!GrandExchangeEvent.method6045(var0, var1, var2)) { // L: 23 - return null; - } else { - IndexedSprite[] var4 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 26 - - for (int var5 = 0; var5 < class451.SpriteBuffer_spriteCount; ++var5) { // L: 27 - IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28 - var6.width = class451.SpriteBuffer_spriteWidth; // L: 29 - var6.height = class451.SpriteBuffer_spriteHeight; // L: 30 - var6.xOffset = class451.SpriteBuffer_xOffsets[var5]; // L: 31 - var6.yOffset = class451.SpriteBuffer_yOffsets[var5]; // L: 32 - var6.subWidth = class451.SpriteBuffer_spriteWidths[var5]; // L: 33 - var6.subHeight = class451.SpriteBuffer_spriteHeights[var5]; // L: 34 - var6.palette = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette; // L: 35 - var6.pixels = class460.SpriteBuffer_pixels[var5]; // L: 36 - } - - RouteStrategy.method3872(); // L: 38 - return var4; // L: 41 - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)Lbr;", - garbageValue = "104" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 - } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 468e6c5efd..2fd9cef8a7 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1,3 +1,5 @@ +import java.io.DataInputStream; +import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -7,712 +9,719 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("ky") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("u") - static int[][] field3495; - @ObfuscatedName("t") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "[[Lky;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lig;" ) @Export("Widget_cachedSprites") public static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("Widget_cachedModels") public static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("Widget_cachedFonts") public static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("Widget_cachedSpriteMasks") public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lms;" + descriptor = "Lmg;" ) - static class361 field3388; - @ObfuscatedName("at") + static class361 field3389; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lms;" + descriptor = "Lmg;" ) - static class361 field3339; - @ObfuscatedName("aw") - public static boolean field3368; - @ObfuscatedName("ar") + static class361 field3332; + @ObfuscatedName("ao") + public static boolean field3411; + @ObfuscatedName("aj") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("ae") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 2073510769 + intValue = 785571949 ) @Export("id") public int id; - @ObfuscatedName("ab") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -241424449 + intValue = -1317080121 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -305580981 + intValue = 370654815 ) @Export("type") public int type; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 316575905 + intValue = 1674852349 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 931978387 + intValue = 707687703 ) @Export("contentType") public int contentType; - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 168145407 + intValue = 56148415 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1353355369 + intValue = 817696093 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 2100574927 + intValue = 513405589 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -2097224197 + intValue = 2040346085 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1713833669 + intValue = -26114281 ) @Export("rawX") public int rawX; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -2083219921 + intValue = 387503687 ) @Export("rawY") public int rawY; - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 397290189 + intValue = -2011247383 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("al") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -553667537 + intValue = 1435796997 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1525505925 + intValue = -1718696181 ) @Export("x") public int x; - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -246536175 + intValue = -566234841 ) @Export("y") public int y; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -646003077 + intValue = -1237179477 ) @Export("width") public int width; - @ObfuscatedName("af") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1323757205 + intValue = -686825733 ) @Export("height") public int height; - @ObfuscatedName("ap") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1760147361 + intValue = 324512829 ) - public int field3359; - @ObfuscatedName("ai") + public int field3352; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1431491597 + intValue = -98155543 ) - public int field3360; - @ObfuscatedName("bk") + public int field3353; + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1448981285 + intValue = -937388189 ) @Export("parentId") public int parentId; - @ObfuscatedName("bz") + @ObfuscatedName("bm") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("bl") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1148735313 + intValue = 1914558753 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 122125457 + intValue = -647232793 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 519655973 + intValue = -188983191 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("ba") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -4879553 + intValue = -1426770415 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1118702575 + intValue = 532413421 ) @Export("color") public int color; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 402572965 + intValue = 103132295 ) @Export("color2") public int color2; - @ObfuscatedName("br") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -753627881 + intValue = -154297075 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 657447847 + intValue = -811313521 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("bd") + @ObfuscatedName("bx") @Export("fill") public boolean fill; - @ObfuscatedName("bf") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lqs;" + descriptor = "Lqe;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("by") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -374157533 + intValue = -470805339 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("bu") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -32537097 + intValue = -112532293 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1832629109 + intValue = -1537981101 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bb") - public boolean field3491; - @ObfuscatedName("bv") + @ObfuscatedName("bk") + public boolean field3369; + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -234398187 + intValue = 43628099 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bs") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -1599395709 + intValue = 781497615 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bx") - public String field3386; - @ObfuscatedName("bo") + @ObfuscatedName("bt") + public String field3487; + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1957646801 + intValue = 2105991617 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bi") + @ObfuscatedName("bc") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bj") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1878691133 + intValue = 454838749 ) @Export("outline") public int outline; - @ObfuscatedName("bm") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -512889241 + intValue = 517366521 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bn") + @ObfuscatedName("bu") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bw") + @ObfuscatedName("bz") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -250490489 + intValue = 1227370175 ) @Export("modelType") public int modelType; - @ObfuscatedName("cd") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 393277933 + intValue = 945684985 ) @Export("modelId") public int modelId; - @ObfuscatedName("cy") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 621908161 + intValue = 445983049 ) @Export("modelType2") int modelType2; - @ObfuscatedName("ca") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -35409701 + intValue = 1687897513 ) @Export("modelId2") int modelId2; - @ObfuscatedName("cr") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 1320969547 + intValue = 1946938751 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("cn") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 2046351265 + intValue = 450134807 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("cp") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -230431727 + intValue = -219810473 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("cw") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1064101877 + intValue = 2011213921 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("ck") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -1053078933 + intValue = -1199644179 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("co") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -1123791315 + intValue = -870869659 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("cu") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -1378639755 + intValue = 1027382321 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("cl") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -867688381 + intValue = -19522443 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("cv") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 1683212549 + intValue = -701988609 ) - public int field3398; - @ObfuscatedName("cc") + public int field3467; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -507742713 + intValue = -781066785 ) - public int field3399; - @ObfuscatedName("cx") + public int field3392; + @ObfuscatedName("cy") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("cg") + @ObfuscatedName("cr") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("cz") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 1938208467 + intValue = -1801031319 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 1709783163 + intValue = -1408415309 ) @Export("fontId") public int fontId; - @ObfuscatedName("cq") + @ObfuscatedName("cu") @Export("text") public String text; - @ObfuscatedName("cf") + @ObfuscatedName("cg") @Export("text2") public String text2; - @ObfuscatedName("cm") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1518357985 + intValue = 1122513061 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("ch") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 135225825 + intValue = -694565497 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cj") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -2129783323 + intValue = 182093077 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ci") + @ObfuscatedName("ck") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cs") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 1414679759 + intValue = -1633261963 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -785857143 + intValue = 1192225759 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("ce") + @ObfuscatedName("cx") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("dd") + @ObfuscatedName("dr") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("de") + @ObfuscatedName("dj") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("dn") + @ObfuscatedName("dd") @Export("itemActions") public String[] itemActions; @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lev;" ) - class155 field3476; - @ObfuscatedName("dj") + class155 field3409; + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = -743625073 + intValue = 1539311711 ) - int field3439; - @ObfuscatedName("dk") - HashMap field3418; - @ObfuscatedName("dw") - HashMap field3381; + int field3410; + @ObfuscatedName("dp") + HashMap field3354; + @ObfuscatedName("dx") + HashMap field3412; @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = 1975625373 + intValue = 1690080249 ) @Export("flags") public int flags; - @ObfuscatedName("dh") - public boolean field3432; @ObfuscatedName("dm") - public byte[][] field3422; - @ObfuscatedName("dq") - public byte[][] field3423; - @ObfuscatedName("dy") - public int[] field3424; + public boolean field3414; + @ObfuscatedName("dv") + public byte[][] field3415; + @ObfuscatedName("da") + public byte[][] field3485; @ObfuscatedName("di") - public int[] field3425; - @ObfuscatedName("du") + public int[] field3417; + @ObfuscatedName("dt") + public int[] field3418; + @ObfuscatedName("do") @Export("dataText") public String dataText; - @ObfuscatedName("da") + @ObfuscatedName("dw") @Export("actions") public String[] actions; - @ObfuscatedName("dr") + @ObfuscatedName("dl") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lky;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dp") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = 253992415 + intValue = -255992791 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("df") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 1843255509 + intValue = -228708447 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("db") + @ObfuscatedName("dh") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dt") + @ObfuscatedName("dq") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dl") + @ObfuscatedName("dy") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("eu") + @ObfuscatedName("ec") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("ee") + @ObfuscatedName("es") @Export("onClick") public Object[] onClick; - @ObfuscatedName("em") + @ObfuscatedName("el") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("ec") + @ObfuscatedName("ej") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("eb") + @ObfuscatedName("em") @Export("onHold") public Object[] onHold; - @ObfuscatedName("er") + @ObfuscatedName("ei") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("ei") + @ObfuscatedName("ep") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("eq") + @ObfuscatedName("ef") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("ed") + @ObfuscatedName("eo") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("eh") + @ObfuscatedName("ex") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("en") + @ObfuscatedName("eq") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("ex") + @ObfuscatedName("ed") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("eo") + @ObfuscatedName("ek") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("ev") + @ObfuscatedName("eb") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("ek") + @ObfuscatedName("ew") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("ez") + @ObfuscatedName("er") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("el") + @ObfuscatedName("et") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("ep") + @ObfuscatedName("ee") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ey") + @ObfuscatedName("ea") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("es") + @ObfuscatedName("eu") @Export("onOp") public Object[] onOp; - @ObfuscatedName("ej") + @ObfuscatedName("eg") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("eg") + @ObfuscatedName("en") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("et") + @ObfuscatedName("ez") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ew") - public Object[] field3457; - @ObfuscatedName("ea") - public Object[] field3458; - @ObfuscatedName("ef") + @ObfuscatedName("ey") + public Object[] field3416; + @ObfuscatedName("eh") + public Object[] field3451; + @ObfuscatedName("ev") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("fw") + @ObfuscatedName("ff") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("fl") - public Object[] field3395; - @ObfuscatedName("fz") - public Object[] field3461; - @ObfuscatedName("fu") + @ObfuscatedName("fp") + public Object[] field3454; + @ObfuscatedName("fo") + public Object[] field3455; + @ObfuscatedName("fm") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("fa") + @ObfuscatedName("fu") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ft") + @ObfuscatedName("fd") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("fo") + @ObfuscatedName("fi") @Export("onResize") public Object[] onResize; - @ObfuscatedName("fv") + @ObfuscatedName("fa") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("fk") - public Object[] field3468; @ObfuscatedName("fn") - public Object[] field3408; - @ObfuscatedName("fr") + public Object[] field3432; + @ObfuscatedName("fx") + public Object[] field3462; + @ObfuscatedName("fy") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("fq") + @ObfuscatedName("fr") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ff") + @ObfuscatedName("fj") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("fd") + @ObfuscatedName("fl") @ObfuscatedGetter( - intValue = 1262202449 + intValue = 1863918323 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("fc") + @ObfuscatedName("fb") @Export("spellName") public String spellName; - @ObfuscatedName("fs") + @ObfuscatedName("fe") @Export("buttonText") public String buttonText; - @ObfuscatedName("fb") + @ObfuscatedName("fc") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("fi") + @ObfuscatedName("fq") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("fy") + @ObfuscatedName("fv") @ObfuscatedGetter( - intValue = -82905401 + intValue = -806667787 ) @Export("itemId") public int itemId; - @ObfuscatedName("fe") + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = -1170301129 + intValue = -603366955 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("fh") + @ObfuscatedName("fs") @ObfuscatedGetter( - intValue = -97136633 + intValue = 726749667 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("fg") + @ObfuscatedName("fw") @ObfuscatedGetter( - intValue = -531561985 + intValue = 1426555603 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("fj") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "[Lkn;" + descriptor = "[Lky;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fm") + @ObfuscatedName("fg") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fp") + @ObfuscatedName("fh") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fx") + @ObfuscatedName("fk") @ObfuscatedGetter( - intValue = -1126667937 + intValue = -235731823 ) - public int field3481; - @ObfuscatedName("gd") + public int field3478; + @ObfuscatedName("gb") @ObfuscatedGetter( - intValue = 302132005 + intValue = 590193357 ) - public int field3391; + public int field3479; + @ObfuscatedName("gi") + @ObfuscatedGetter( + intValue = -438997263 + ) + public int field3480; @ObfuscatedName("gn") @ObfuscatedGetter( - intValue = 1823882543 + intValue = 1088082053 ) - public int field3355; - @ObfuscatedName("gp") + public int field3433; + @ObfuscatedName("gh") @ObfuscatedGetter( - intValue = 328128015 - ) - public int field3387; - @ObfuscatedName("gk") - @ObfuscatedGetter( - intValue = 1493505929 + intValue = -1419320507 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("gj") + @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = -621080907 + intValue = 396807883 ) @Export("cycle") public int cycle; - @ObfuscatedName("gx") - public int[] field3406; - @ObfuscatedName("gz") + @ObfuscatedName("gj") + public int[] field3484; + @ObfuscatedName("gf") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("gu") + @ObfuscatedName("gc") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("gg") + @ObfuscatedName("gw") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -721,9 +730,9 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 53 Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 54 Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 55 - field3388 = new class361(10, class359.field4222); // L: 56 - field3339 = new class361(10, class359.field4222); // L: 57 - field3368 = false; // L: 58 + field3389 = new class361(10, class359.field4204); // L: 56 + field3332 = new class361(10, class359.field4204); // L: 57 + field3411 = false; // L: 58 } public Widget() { @@ -744,8 +753,8 @@ public class Widget extends Node { this.y = 0; // L: 74 this.width = 0; // L: 75 this.height = 0; // L: 76 - this.field3359 = 1; // L: 77 - this.field3360 = 1; // L: 78 + this.field3352 = 1; // L: 77 + this.field3353 = 1; // L: 78 this.parentId = -1; // L: 79 this.isHidden = false; // L: 80 this.scrollX = 0; // L: 81 @@ -761,7 +770,7 @@ public class Widget extends Node { this.transparencyTop = 0; // L: 91 this.transparencyBot = 0; // L: 92 this.lineWid = 1; // L: 93 - this.field3491 = false; // L: 94 + this.field3369 = false; // L: 94 this.spriteId2 = -1; // L: 95 this.spriteId = -1; // L: 96 this.spriteAngle = 0; // L: 98 @@ -780,8 +789,8 @@ public class Widget extends Node { this.modelAngleY = 0; // L: 113 this.modelAngleZ = 0; // L: 114 this.modelZoom = 100; // L: 115 - this.field3398 = 0; // L: 116 - this.field3399 = 0; // L: 117 + this.field3467 = 0; // L: 116 + this.field3392 = 0; // L: 117 this.modelOrthog = false; // L: 118 this.modelTransparency = false; // L: 119 this.itemQuantityMode = 2; // L: 120 @@ -794,9 +803,9 @@ public class Widget extends Node { this.textShadowed = false; // L: 127 this.paddingX = 0; // L: 128 this.paddingY = 0; // L: 129 - this.field3439 = -1; // L: 135 + this.field3410 = -1; // L: 135 this.flags = 0; // L: 139 - this.field3432 = false; // L: 140 + this.field3414 = false; // L: 140 this.dataText = ""; // L: 149 this.parent = null; // L: 151 this.dragZoneSize = 0; // L: 152 @@ -813,1056 +822,1149 @@ public class Widget extends Node { this.modelFrameCycle = 0; // L: 204 this.containsMouse = false; // L: 206 this.isClicked = false; // L: 207 - this.field3481 = -1; // L: 208 - this.field3391 = 0; // L: 209 - this.field3355 = 0; // L: 210 - this.field3387 = 0; // L: 211 + this.field3478 = -1; // L: 208 + this.field3479 = 0; // L: 209 + this.field3480 = 0; // L: 210 + this.field3433 = 0; // L: 211 this.rootIndex = -1; // L: 212 this.cycle = -1; // L: 213 this.noClickThrough = false; // L: 215 this.noScrollThrough = false; // L: 216 this.prioritizeMenuEntry = false; // L: 217 - } + } // L: 936 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-1306994469" + descriptor = "(Lpi;B)V", + garbageValue = "-39" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; // L: 277 - this.type = var1.readUnsignedByte(); // L: 278 - this.buttonType = var1.readUnsignedByte(); // L: 279 - this.contentType = var1.readUnsignedShort(); // L: 280 - this.rawX = var1.readShort(); // L: 281 - this.rawY = var1.readShort(); // L: 282 - this.rawWidth = var1.readUnsignedShort(); // L: 283 - this.rawHeight = var1.readUnsignedShort(); // L: 284 - this.transparencyTop = var1.readUnsignedByte(); // L: 285 - this.parentId = var1.readUnsignedShort(); // L: 286 - if (this.parentId == 65535) { // L: 287 + this.isIf3 = false; + this.type = var1.readUnsignedByte(); + this.buttonType = var1.readUnsignedByte(); + this.contentType = var1.readUnsignedShort(); // L: 273 + this.rawX = var1.readShort(); + this.rawY = var1.readShort(); + this.rawWidth = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); + this.transparencyTop = var1.readUnsignedByte(); + this.parentId = var1.readUnsignedShort(); + if (this.parentId == 65535) { this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 288 + this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 289 - if (this.mouseOverRedirect == 65535) { // L: 290 + this.mouseOverRedirect = var1.readUnsignedShort(); + if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 291 + int var2 = var1.readUnsignedByte(); int var3; - if (var2 > 0) { // L: 292 - this.cs1Comparisons = new int[var2]; // L: 293 - this.cs1ComparisonValues = new int[var2]; // L: 294 + if (var2 > 0) { + this.cs1Comparisons = new int[var2]; + this.cs1ComparisonValues = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 295 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 296 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 297 + for (var3 = 0; var3 < var2; ++var3) { + this.cs1Comparisons[var3] = var1.readUnsignedByte(); + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); } } - var3 = var1.readUnsignedByte(); // L: 300 + var3 = var1.readUnsignedByte(); // L: 293 int var4; int var5; int var6; - if (var3 > 0) { // L: 301 - this.cs1Instructions = new int[var3][]; // L: 302 + if (var3 > 0) { + this.cs1Instructions = new int[var3][]; // L: 295 - for (var4 = 0; var4 < var3; ++var4) { // L: 303 - var5 = var1.readUnsignedShort(); // L: 304 - this.cs1Instructions[var4] = new int[var5]; // L: 305 + for (var4 = 0; var4 < var3; ++var4) { // L: 296 + var5 = var1.readUnsignedShort(); // L: 297 + this.cs1Instructions[var4] = new int[var5]; // L: 298 - for (var6 = 0; var6 < var5; ++var6) { // L: 306 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 307 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 308 + for (var6 = 0; var6 < var5; ++var6) { // L: 299 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 300 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 301 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 312 - this.scrollHeight = var1.readUnsignedShort(); // L: 313 - this.isHidden = var1.readUnsignedByte() == 1; // L: 314 + if (this.type == 0) { // L: 305 + this.scrollHeight = var1.readUnsignedShort(); // L: 306 + this.isHidden = var1.readUnsignedByte() == 1; // L: 307 } - if (this.type == 1) { // L: 316 - var1.readUnsignedShort(); // L: 317 - var1.readUnsignedByte(); // L: 318 + if (this.type == 1) { // L: 309 + var1.readUnsignedShort(); // L: 310 + var1.readUnsignedByte(); // L: 311 } - if (this.type == 2) { // L: 320 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 321 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 322 - var4 = var1.readUnsignedByte(); // L: 323 - if (var4 == 1) { // L: 324 + if (this.type == 2) { // L: 313 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 314 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 315 + var4 = var1.readUnsignedByte(); // L: 316 + if (var4 == 1) { // L: 317 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 325 - if (var5 == 1) { // L: 326 + var5 = var1.readUnsignedByte(); // L: 318 + if (var5 == 1) { // L: 319 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 327 - if (var6 == 1) { // L: 328 + var6 = var1.readUnsignedByte(); // L: 320 + if (var6 == 1) { // L: 321 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 329 - if (var7 == 1) { // L: 330 + int var7 = var1.readUnsignedByte(); // L: 322 + if (var7 == 1) { // L: 323 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 331 - this.paddingY = var1.readUnsignedByte(); // L: 332 - this.inventoryXOffsets = new int[20]; // L: 333 - this.inventoryYOffsets = new int[20]; // L: 334 - this.inventorySprites = new int[20]; // L: 335 + this.paddingX = var1.readUnsignedByte(); // L: 324 + this.paddingY = var1.readUnsignedByte(); // L: 325 + this.inventoryXOffsets = new int[20]; // L: 326 + this.inventoryYOffsets = new int[20]; // L: 327 + this.inventorySprites = new int[20]; // L: 328 int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 336 - int var11 = var1.readUnsignedByte(); // L: 337 - if (var11 == 1) { // L: 338 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 339 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 340 - this.inventorySprites[var8] = var1.readInt(); // L: 341 + for (var8 = 0; var8 < 20; ++var8) { // L: 329 + int var11 = var1.readUnsignedByte(); // L: 330 + if (var11 == 1) { // L: 331 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 332 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 333 + this.inventorySprites[var8] = var1.readInt(); // L: 334 } else { - this.inventorySprites[var8] = -1; // L: 343 + this.inventorySprites[var8] = -1; // L: 336 } } - this.itemActions = new String[5]; // L: 345 + this.itemActions = new String[5]; // L: 338 - for (var8 = 0; var8 < 5; ++var8) { // L: 346 - String var9 = var1.readStringCp1252NullTerminated(); // L: 347 - if (var9.length() > 0) { // L: 348 - this.itemActions[var8] = var9; // L: 349 - this.flags |= 1 << var8 + 23; // L: 350 + for (var8 = 0; var8 < 5; ++var8) { // L: 339 + String var9 = var1.readStringCp1252NullTerminated(); // L: 340 + if (var9.length() > 0) { // L: 341 + this.itemActions[var8] = var9; // L: 342 + this.flags |= 1 << var8 + 23; // L: 343 } } } - if (this.type == 3) { // L: 354 - this.fill = var1.readUnsignedByte() == 1; // L: 355 + if (this.type == 3) { // L: 347 + this.fill = var1.readUnsignedByte() == 1; // L: 348 } - if (this.type == 4 || this.type == 1) { // L: 357 - this.textXAlignment = var1.readUnsignedByte(); // L: 358 - this.textYAlignment = var1.readUnsignedByte(); // L: 359 - this.textLineHeight = var1.readUnsignedByte(); // L: 360 - this.fontId = var1.readUnsignedShort(); // L: 361 - if (this.fontId == 65535) { // L: 362 + if (this.type == 4 || this.type == 1) { // L: 350 + this.textXAlignment = var1.readUnsignedByte(); // L: 351 + this.textYAlignment = var1.readUnsignedByte(); // L: 352 + this.textLineHeight = var1.readUnsignedByte(); // L: 353 + this.fontId = var1.readUnsignedShort(); // L: 354 + if (this.fontId == 65535) { // L: 355 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 363 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 356 } - if (this.type == 4) { // L: 365 - this.text = var1.readStringCp1252NullTerminated(); // L: 366 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 367 + if (this.type == 4) { // L: 358 + this.text = var1.readStringCp1252NullTerminated(); // L: 359 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 360 } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 369 + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 362 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 370 - this.color2 = var1.readInt(); // L: 371 - this.mouseOverColor = var1.readInt(); // L: 372 - this.mouseOverColor2 = var1.readInt(); // L: 373 + if (this.type == 3 || this.type == 4) { // L: 363 + this.color2 = var1.readInt(); // L: 364 + this.mouseOverColor = var1.readInt(); // L: 365 + this.mouseOverColor2 = var1.readInt(); // L: 366 } - if (this.type == 5) { // L: 375 - this.spriteId2 = var1.readInt(); // L: 376 - this.spriteId = var1.readInt(); // L: 377 + if (this.type == 5) { // L: 368 + this.spriteId2 = var1.readInt(); // L: 369 + this.spriteId = var1.readInt(); // L: 370 } - if (this.type == 6) { // L: 379 - this.modelType = 1; // L: 380 - this.modelId = var1.readUnsignedShort(); // L: 381 - if (this.modelId == 65535) { // L: 382 + if (this.type == 6) { // L: 372 + this.modelType = 1; // L: 373 + this.modelId = var1.readUnsignedShort(); // L: 374 + if (this.modelId == 65535) { // L: 375 this.modelId = -1; } - this.modelType2 = 1; // L: 383 - this.modelId2 = var1.readUnsignedShort(); // L: 384 - if (this.modelId2 == 65535) { // L: 385 + this.modelType2 = 1; // L: 376 + this.modelId2 = var1.readUnsignedShort(); // L: 377 + if (this.modelId2 == 65535) { // L: 378 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 386 - if (this.sequenceId == 65535) { // L: 387 + this.sequenceId = var1.readUnsignedShort(); // L: 379 + if (this.sequenceId == 65535) { // L: 380 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 388 - if (this.sequenceId2 == 65535) { // L: 389 + this.sequenceId2 = var1.readUnsignedShort(); // L: 381 + if (this.sequenceId2 == 65535) { // L: 382 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 390 - this.modelAngleX = var1.readUnsignedShort(); // L: 391 - this.modelAngleY = var1.readUnsignedShort(); // L: 392 + this.modelZoom = var1.readUnsignedShort(); // L: 383 + this.modelAngleX = var1.readUnsignedShort(); // L: 384 + this.modelAngleY = var1.readUnsignedShort(); // L: 385 } - if (this.type == 7) { // L: 394 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 395 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 396 - this.textXAlignment = var1.readUnsignedByte(); // L: 397 - this.fontId = var1.readUnsignedShort(); // L: 398 - if (this.fontId == 65535) { // L: 399 + if (this.type == 7) { // L: 387 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 388 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 389 + this.textXAlignment = var1.readUnsignedByte(); // L: 390 + this.fontId = var1.readUnsignedShort(); // L: 391 + if (this.fontId == 65535) { // L: 392 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 400 - this.color = var1.readInt(); // L: 401 - this.paddingX = var1.readShort(); // L: 402 - this.paddingY = var1.readShort(); // L: 403 - var4 = var1.readUnsignedByte(); // L: 404 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 393 + this.color = var1.readInt(); // L: 394 + this.paddingX = var1.readShort(); // L: 395 + this.paddingY = var1.readShort(); // L: 396 + var4 = var1.readUnsignedByte(); // L: 397 if (var4 == 1) { - this.flags |= 1073741824; // L: 405 + this.flags |= 1073741824; // L: 398 } - this.itemActions = new String[5]; // L: 406 + this.itemActions = new String[5]; // L: 399 - for (var5 = 0; var5 < 5; ++var5) { // L: 407 - String var10 = var1.readStringCp1252NullTerminated(); // L: 408 - if (var10.length() > 0) { // L: 409 - this.itemActions[var5] = var10; // L: 410 - this.flags |= 1 << var5 + 23; // L: 411 + for (var5 = 0; var5 < 5; ++var5) { // L: 400 + String var10 = var1.readStringCp1252NullTerminated(); // L: 401 + if (var10.length() > 0) { // L: 402 + this.itemActions[var5] = var10; // L: 403 + this.flags |= 1 << var5 + 23; // L: 404 } } } - if (this.type == 8) { // L: 415 - this.text = var1.readStringCp1252NullTerminated(); // L: 416 + if (this.type == 8) { // L: 408 + this.text = var1.readStringCp1252NullTerminated(); // L: 409 } - if (this.buttonType == 2 || this.type == 2) { // L: 418 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 419 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 420 - var4 = var1.readUnsignedShort() & 63; // L: 421 - this.flags |= var4 << 11; // L: 422 + if (this.buttonType == 2 || this.type == 2) { // L: 411 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 412 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 413 + var4 = var1.readUnsignedShort() & 63; // L: 414 + this.flags |= var4 << 11; // L: 415 } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 424 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 425 - if (this.buttonText.length() == 0) { // L: 426 - if (this.buttonType == 1) { // L: 427 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 417 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 418 + if (this.buttonText.length() == 0) { // L: 419 + if (this.buttonType == 1) { // L: 420 this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 428 + if (this.buttonType == 4) { // L: 421 this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 429 + if (this.buttonType == 5) { // L: 422 this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 430 + if (this.buttonType == 6) { // L: 423 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 433 - this.flags |= 4194304; // L: 434 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 426 + this.flags |= 4194304; // L: 427 } - if (this.buttonType == 6) { // L: 436 - this.flags |= 1; // L: 437 + if (this.buttonType == 6) { // L: 429 + this.flags |= 1; // L: 430 } - } // L: 439 + } // L: 432 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "108" + descriptor = "(Lpi;I)V", + garbageValue = "-107310721" ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 442 - this.isIf3 = true; // L: 443 - this.type = var1.readUnsignedByte(); // L: 444 - this.contentType = var1.readUnsignedShort(); // L: 445 - this.rawX = var1.readShort(); // L: 446 - this.rawY = var1.readShort(); // L: 447 - this.rawWidth = var1.readUnsignedShort(); // L: 448 - if (this.type == 9) { // L: 449 + var1.readUnsignedByte(); // L: 435 + this.isIf3 = true; // L: 436 + this.type = var1.readUnsignedByte(); // L: 437 + this.contentType = var1.readUnsignedShort(); // L: 438 + this.rawX = var1.readShort(); // L: 439 + this.rawY = var1.readShort(); // L: 440 + this.rawWidth = var1.readUnsignedShort(); // L: 441 + if (this.type == 9) { // L: 442 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 450 + this.rawHeight = var1.readUnsignedShort(); // L: 443 } - this.widthAlignment = var1.readByte(); // L: 451 - this.heightAlignment = var1.readByte(); // L: 452 - this.xAlignment = var1.readByte(); // L: 453 - this.yAlignment = var1.readByte(); // L: 454 - this.parentId = var1.readUnsignedShort(); // L: 455 - if (this.parentId == 65535) { // L: 456 + this.widthAlignment = var1.readByte(); // L: 444 + this.heightAlignment = var1.readByte(); // L: 445 + this.xAlignment = var1.readByte(); // L: 446 + this.yAlignment = var1.readByte(); // L: 447 + this.parentId = var1.readUnsignedShort(); // L: 448 + if (this.parentId == 65535) { // L: 449 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 457 + this.parentId += this.id & -65536; // L: 450 } - this.isHidden = var1.readUnsignedByte() == 1; // L: 458 - if (this.type == 0) { // L: 459 - this.scrollWidth = var1.readUnsignedShort(); // L: 460 - this.scrollHeight = var1.readUnsignedShort(); // L: 461 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 462 + this.isHidden = var1.readUnsignedByte() == 1; // L: 451 + if (this.type == 0) { // L: 452 + this.scrollWidth = var1.readUnsignedShort(); // L: 453 + this.scrollHeight = var1.readUnsignedShort(); // L: 454 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 455 } - if (this.type == 5) { // L: 464 - this.spriteId2 = var1.readInt(); // L: 465 - this.spriteAngle = var1.readUnsignedShort(); // L: 466 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 467 - this.transparencyTop = var1.readUnsignedByte(); // L: 468 - this.outline = var1.readUnsignedByte(); // L: 469 - this.spriteShadow = var1.readInt(); // L: 470 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 471 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 472 + if (this.type == 5) { // L: 457 + this.spriteId2 = var1.readInt(); // L: 458 + this.spriteAngle = var1.readUnsignedShort(); // L: 459 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 460 + this.transparencyTop = var1.readUnsignedByte(); // L: 461 + this.outline = var1.readUnsignedByte(); // L: 462 + this.spriteShadow = var1.readInt(); // L: 463 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 464 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 465 } - if (this.type == 6) { // L: 474 - this.modelType = 1; // L: 475 - this.modelId = var1.readUnsignedShort(); // L: 476 - if (this.modelId == 65535) { // L: 477 + if (this.type == 6) { // L: 467 + this.modelType = 1; // L: 468 + this.modelId = var1.readUnsignedShort(); // L: 469 + if (this.modelId == 65535) { // L: 470 this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 478 - this.modelOffsetY = var1.readShort(); // L: 479 - this.modelAngleX = var1.readUnsignedShort(); // L: 480 - this.modelAngleY = var1.readUnsignedShort(); // L: 481 - this.modelAngleZ = var1.readUnsignedShort(); // L: 482 - this.modelZoom = var1.readUnsignedShort(); // L: 483 - this.sequenceId = var1.readUnsignedShort(); // L: 484 - if (this.sequenceId == 65535) { // L: 485 + this.modelOffsetX = var1.readShort(); // L: 471 + this.modelOffsetY = var1.readShort(); // L: 472 + this.modelAngleX = var1.readUnsignedShort(); // L: 473 + this.modelAngleY = var1.readUnsignedShort(); // L: 474 + this.modelAngleZ = var1.readUnsignedShort(); // L: 475 + this.modelZoom = var1.readUnsignedShort(); // L: 476 + this.sequenceId = var1.readUnsignedShort(); // L: 477 + if (this.sequenceId == 65535) { // L: 478 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 486 - var1.readUnsignedShort(); // L: 487 - if (this.widthAlignment != 0) { // L: 488 - this.field3398 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 479 + var1.readUnsignedShort(); // L: 480 + if (this.widthAlignment != 0) { // L: 481 + this.field3467 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 489 - var1.readUnsignedShort(); // L: 490 + if (this.heightAlignment != 0) { // L: 482 + var1.readUnsignedShort(); // L: 483 } } - if (this.type == 4) { // L: 493 - this.fontId = var1.readUnsignedShort(); // L: 494 - if (this.fontId == 65535) { // L: 495 + if (this.type == 4) { // L: 486 + this.fontId = var1.readUnsignedShort(); // L: 487 + if (this.fontId == 65535) { // L: 488 this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 496 - this.textLineHeight = var1.readUnsignedByte(); // L: 497 - this.textXAlignment = var1.readUnsignedByte(); // L: 498 - this.textYAlignment = var1.readUnsignedByte(); // L: 499 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 500 - this.color = var1.readInt(); // L: 501 + this.text = var1.readStringCp1252NullTerminated(); // L: 489 + this.textLineHeight = var1.readUnsignedByte(); // L: 490 + this.textXAlignment = var1.readUnsignedByte(); // L: 491 + this.textYAlignment = var1.readUnsignedByte(); // L: 492 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 493 + this.color = var1.readInt(); // L: 494 } - if (this.type == 3) { // L: 503 - this.color = var1.readInt(); // L: 504 - this.fill = var1.readUnsignedByte() == 1; // L: 505 - this.transparencyTop = var1.readUnsignedByte(); // L: 506 + if (this.type == 3) { // L: 496 + this.color = var1.readInt(); // L: 497 + this.fill = var1.readUnsignedByte() == 1; // L: 498 + this.transparencyTop = var1.readUnsignedByte(); // L: 499 } - if (this.type == 9) { // L: 508 - this.lineWid = var1.readUnsignedByte(); // L: 509 - this.color = var1.readInt(); // L: 510 - this.field3491 = var1.readUnsignedByte() == 1; // L: 511 + if (this.type == 9) { // L: 501 + this.lineWid = var1.readUnsignedByte(); // L: 502 + this.color = var1.readInt(); // L: 503 + this.field3369 = var1.readUnsignedByte() == 1; // L: 504 } - this.flags = var1.readMedium(); // L: 513 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 514 - int var2 = var1.readUnsignedByte(); // L: 515 - if (var2 > 0) { // L: 516 - this.actions = new String[var2]; // L: 517 + this.flags = var1.readMedium(); // L: 506 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 507 + int var2 = var1.readUnsignedByte(); // L: 508 + if (var2 > 0) { // L: 509 + this.actions = new String[var2]; // L: 510 - for (int var3 = 0; var3 < var2; ++var3) { // L: 518 + for (int var3 = 0; var3 < var2; ++var3) { // L: 511 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 520 - this.dragThreshold = var1.readUnsignedByte(); // L: 521 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 522 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 523 - this.onLoad = this.readListener(var1); // L: 524 - this.onMouseOver = this.readListener(var1); // L: 525 - this.onMouseLeave = this.readListener(var1); // L: 526 - this.onTargetLeave = this.readListener(var1); // L: 527 - this.onTargetEnter = this.readListener(var1); // L: 528 - this.onVarTransmit = this.readListener(var1); // L: 529 - this.onInvTransmit = this.readListener(var1); // L: 530 - this.onStatTransmit = this.readListener(var1); // L: 531 - this.onTimer = this.readListener(var1); // L: 532 - this.onOp = this.readListener(var1); // L: 533 - this.onMouseRepeat = this.readListener(var1); // L: 534 - this.onClick = this.readListener(var1); // L: 535 - this.onClickRepeat = this.readListener(var1); // L: 536 - this.onRelease = this.readListener(var1); // L: 537 - this.onHold = this.readListener(var1); // L: 538 - this.onDrag = this.readListener(var1); // L: 539 - this.onDragComplete = this.readListener(var1); // L: 540 - this.onScroll = this.readListener(var1); // L: 541 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 542 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 543 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 544 - } // L: 545 + this.dragZoneSize = var1.readUnsignedByte(); // L: 513 + this.dragThreshold = var1.readUnsignedByte(); // L: 514 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 515 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 516 + this.onLoad = this.readListener(var1); // L: 517 + this.onMouseOver = this.readListener(var1); // L: 518 + this.onMouseLeave = this.readListener(var1); // L: 519 + this.onTargetLeave = this.readListener(var1); // L: 520 + this.onTargetEnter = this.readListener(var1); // L: 521 + this.onVarTransmit = this.readListener(var1); // L: 522 + this.onInvTransmit = this.readListener(var1); // L: 523 + this.onStatTransmit = this.readListener(var1); // L: 524 + this.onTimer = this.readListener(var1); // L: 525 + this.onOp = this.readListener(var1); // L: 526 + this.onMouseRepeat = this.readListener(var1); // L: 527 + this.onClick = this.readListener(var1); // L: 528 + this.onClickRepeat = this.readListener(var1); // L: 529 + this.onRelease = this.readListener(var1); // L: 530 + this.onHold = this.readListener(var1); // L: 531 + this.onDrag = this.readListener(var1); // L: 532 + this.onDragComplete = this.readListener(var1); // L: 533 + this.onScroll = this.readListener(var1); // L: 534 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 535 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 536 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 537 + } // L: 538 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpd;B)[Ljava/lang/Object;", - garbageValue = "67" + descriptor = "(Lpi;B)[Ljava/lang/Object;", + garbageValue = "117" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 548 - if (var2 == 0) { // L: 549 + int var2 = var1.readUnsignedByte(); // L: 541 + if (var2 == 0) { // L: 542 return null; } else { - Object[] var3 = new Object[var2]; // L: 550 + Object[] var3 = new Object[var2]; // L: 543 - for (int var4 = 0; var4 < var2; ++var4) { // L: 551 - int var5 = var1.readUnsignedByte(); // L: 552 + for (int var4 = 0; var4 < var2; ++var4) { // L: 544 + int var5 = var1.readUnsignedByte(); // L: 545 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 553 - } else if (var5 == 1) { // L: 554 + var3[var4] = new Integer(var1.readInt()); // L: 546 + } else if (var5 == 1) { // L: 547 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 556 - return var3; // L: 557 + this.hasListener = true; // L: 549 + return var3; // L: 550 } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpd;I)[I", - garbageValue = "-1157160948" + descriptor = "(Lpi;B)[I", + garbageValue = "-1" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 561 - if (var2 == 0) { // L: 562 + int var2 = var1.readUnsignedByte(); // L: 554 + if (var2 == 0) { // L: 555 return null; } else { - int[] var3 = new int[var2]; // L: 563 + int[] var3 = new int[var2]; // L: 556 - for (int var4 = 0; var4 < var2; ++var4) { // L: 564 - var3[var4] = var1.readInt(); // L: 565 + for (int var4 = 0; var4 < var2; ++var4) { // L: 557 + var3[var4] = var1.readInt(); // L: 558 } - return var3; // L: 567 + return var3; // L: 560 } } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "-85" + garbageValue = "2" ) @Export("swapItems") public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 571 - this.itemIds[var2] = this.itemIds[var1]; // L: 572 - this.itemIds[var1] = var3; // L: 573 - var3 = this.itemQuantities[var2]; // L: 574 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 575 - this.itemQuantities[var1] = var3; // L: 576 - } // L: 577 + int var3 = this.itemIds[var2]; // L: 564 + this.itemIds[var2] = this.itemIds[var1]; // L: 565 + this.itemIds[var1] = var3; // L: 566 + var3 = this.itemQuantities[var2]; // L: 567 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 568 + this.itemQuantities[var1] = var3; // L: 569 + } // L: 570 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZLci;B)Lql;", - garbageValue = "76" + descriptor = "(ZLck;B)Lqi;", + garbageValue = "-6" ) @Export("getSprite") public SpritePixels getSprite(boolean var1, UrlRequester var2) { - field3368 = false; // L: 580 - if (this.field3386 != null) { // L: 581 - SpritePixels var3 = this.method5628(var2); // L: 582 - if (var3 != null) { // L: 583 - return var3; // L: 584 + field3411 = false; // L: 573 + if (this.field3487 != null) { // L: 574 + SpritePixels var3 = this.method5646(var2); // L: 575 + if (var3 != null) { // L: 576 + return var3; // L: 577 } } int var7; - if (var1) { // L: 588 + if (var1) { // L: 581 var7 = this.spriteId; } else { - var7 = this.spriteId2; // L: 589 + var7 = this.spriteId2; // L: 582 } - if (var7 == -1) { // L: 590 + if (var7 == -1) { // L: 583 return null; } else { - long var4 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var7 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 591 - SpritePixels var6 = (SpritePixels)Widget_cachedSprites.get(var4); // L: 592 - if (var6 != null) { // L: 593 + long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var7 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 584 + SpritePixels var6 = (SpritePixels)Widget_cachedSprites.get(var4); // L: 585 + if (var6 != null) { // L: 586 return var6; } else { - var6 = InterfaceParent.SpriteBuffer_getSprite(WorldMapLabel.Widget_spritesArchive, var7, 0); // L: 594 - if (var6 == null) { // L: 595 - field3368 = true; // L: 596 - return null; // L: 597 + var6 = class6.SpriteBuffer_getSprite(SoundCache.Widget_spritesArchive, var7, 0); // L: 587 + if (var6 == null) { // L: 588 + field3411 = true; // L: 589 + return null; // L: 590 } else { - this.method5684(var6); // L: 599 - Widget_cachedSprites.put(var6, var4); // L: 600 - return var6; // L: 601 + this.method5611(var6); // L: 592 + Widget_cachedSprites.put(var6, var4); // L: 593 + return var6; // L: 594 } } } } - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lci;I)Lql;", - garbageValue = "1697043029" + descriptor = "(Lck;B)Lqi;", + garbageValue = "48" ) - SpritePixels method5628(UrlRequester var1) { - if (!this.method5633()) { // L: 605 - return this.method5621(var1); // L: 606 + SpritePixels method5646(UrlRequester var1) { + if (!this.method5610()) { // L: 598 + return this.method5609(var1); // L: 599 } else { - String var2 = this.field3386 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 608 - SpritePixels var3 = (SpritePixels)field3339.method6639(var2); // L: 609 - if (var3 == null) { // L: 610 - SpritePixels var4 = this.method5621(var1); // L: 611 - if (var4 != null) { // L: 612 - var3 = var4.method8177(); // L: 613 - this.method5684(var3); // L: 614 - field3339.method6640(var2, var3); // L: 615 + String var2 = this.field3487 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 601 + SpritePixels var3 = (SpritePixels)field3332.method6601(var2); // L: 602 + if (var3 == null) { // L: 603 + SpritePixels var4 = this.method5609(var1); // L: 604 + if (var4 != null) { // L: 605 + var3 = var4.method8147(); // L: 606 + this.method5611(var3); // L: 607 + field3332.method6596(var2, var3); // L: 608 } } - return var3; // L: 618 + return var3; // L: 611 } } - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lci;I)Lql;", - garbageValue = "-895601509" - ) - SpritePixels method5621(UrlRequester var1) { - if (this.field3386 != null && var1 != null) { // L: 622 - class291 var2 = (class291)field3388.method6639(this.field3386); // L: 623 - if (var2 == null) { // L: 624 - var2 = new class291(this.field3386, var1); // L: 625 - field3388.method6640(this.field3386, var2); // L: 626 - } - - return var2.method5586(); // L: 628 - } else { - return null; // L: 630 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1970852021" - ) - boolean method5633() { - return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; // L: 634 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lql;I)V", - garbageValue = "705719056" - ) - void method5684(SpritePixels var1) { - if (this.spriteFlipV) { // L: 638 - var1.flipVertically(); - } - - if (this.spriteFlipH) { // L: 639 - var1.flipHorizontally(); - } - - if (this.outline > 0) { // L: 640 - var1.pad(this.outline); - } - - if (this.outline >= 1) { // L: 641 - var1.outline(1); - } - - if (this.outline >= 2) { // L: 642 - var1.outline(16777215); - } - - if (this.spriteShadow != 0) { // L: 643 - var1.shadow(this.spriteShadow); - } - - } // L: 644 - @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Lmr;", - garbageValue = "-1011074356" + descriptor = "(Lck;B)Lqi;", + garbageValue = "1" ) - @Export("getFont") - public Font getFont() { - field3368 = false; // L: 647 - if (this.fontId == -1) { // L: 648 - return null; - } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 649 - if (var1 != null) { // L: 650 - return var1; - } else { - var1 = class19.method319(WorldMapLabel.Widget_spritesArchive, Client.Widget_fontsArchive, this.fontId, 0); // L: 651 - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); // L: 652 - } else { - field3368 = true; // L: 653 - } - - return var1; // L: 654 - } - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lql;", - garbageValue = "1100651857" - ) - @Export("getInventorySprite") - public SpritePixels getInventorySprite(int var1) { - field3368 = false; // L: 658 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 659 - int var2 = this.inventorySprites[var1]; // L: 660 - if (var2 == -1) { // L: 661 - return null; - } else { - SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 662 - if (var3 != null) { // L: 663 - return var3; - } else { - var3 = InterfaceParent.SpriteBuffer_getSprite(WorldMapLabel.Widget_spritesArchive, var2, 0); // L: 664 - if (var3 != null) { // L: 665 - Widget_cachedSprites.put(var3, (long)var2); - } else { - field3368 = true; // L: 666 - } - - return var3; // L: 667 - } - } - } else { - return null; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lgg;IZLkq;B)Lhx;", - garbageValue = "0" - ) - @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field3368 = false; // L: 671 - int var5; - int var6; - if (var3) { // L: 674 - var5 = this.modelType2; // L: 675 - var6 = this.modelId2; // L: 676 - } else { - var5 = this.modelType; // L: 679 - var6 = this.modelId; // L: 680 - } - - if (var5 == 0) { // L: 682 - return null; - } else if (var5 == 1 && var6 == -1) { // L: 683 - return null; - } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 684 - if (var7 == null) { // L: 685 - ModelData var8; - if (var5 == 1) { // L: 687 - var8 = ModelData.ModelData_get(BoundaryObject.Widget_modelsArchive, var6, 0); // L: 688 - if (var8 == null) { // L: 689 - field3368 = true; // L: 690 - return null; // L: 691 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 693 - } - - if (var5 == 2) { // L: 695 - var8 = class9.getNpcDefinition(var6).getModelData(); // L: 696 - if (var8 == null) { // L: 697 - field3368 = true; // L: 698 - return null; // L: 699 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 701 - } - - if (var5 == 3) { // L: 703 - if (var4 == null) { // L: 704 - return null; - } - - var8 = var4.getModelData(); // L: 705 - if (var8 == null) { // L: 706 - field3368 = true; // L: 707 - return null; // L: 708 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 710 - } - - if (var5 == 4) { // L: 712 - ItemComposition var9 = class67.ItemDefinition_get(var6); // L: 713 - var8 = var9.getModelData(10); // L: 714 - if (var8 == null) { // L: 715 - field3368 = true; // L: 716 - return null; // L: 717 - } - - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 719 - } - - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 721 + SpritePixels method5609(UrlRequester var1) { + if (this.field3487 != null && var1 != null) { // L: 615 + class291 var2 = (class291)field3389.method6601(this.field3487); // L: 616 + if (var2 == null) { // L: 617 + var2 = new class291(this.field3487, var1); // L: 618 + field3389.method6596(this.field3487, var2); // L: 619 } - if (var1 != null) { // L: 723 - var7 = var1.transformWidgetModel(var7, var2); // L: 724 - } - - return var7; // L: 726 + return var2.method5563(); // L: 621 + } else { + return null; // L: 623 } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ZI)Lkw;", - garbageValue = "-1173151994" + descriptor = "(I)Z", + garbageValue = "1666597852" ) - @Export("getSpriteMask") - public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 730 - var1 = false; + boolean method5610() { + return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; // L: 627 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lqi;I)V", + garbageValue = "576149889" + ) + void method5611(SpritePixels var1) { + if (this.spriteFlipV) { // L: 631 + var1.flipVertically(); } - int var2 = var1 ? this.spriteId * -1599395709 * 1203004971 : this.spriteId2 * -234398187 * 1912504637; // L: 731 - if (var2 == -1) { // L: 732 + if (this.spriteFlipH) { // L: 632 + var1.flipHorizontally(); + } + + if (this.outline > 0) { // L: 633 + var1.pad(this.outline); + } + + if (this.outline >= 1) { // L: 634 + var1.outline(1); + } + + if (this.outline >= 2) { // L: 635 + var1.outline(16777215); + } + + if (this.spriteShadow != 0) { // L: 636 + var1.shadow(this.spriteShadow); + } + + } // L: 637 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)Lmd;", + garbageValue = "-1386663176" + ) + @Export("getFont") + public Font getFont() { + field3411 = false; // L: 640 + if (this.fontId == -1) { // L: 641 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 733 - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 734 - if (var5 != null) { // L: 735 - return var5; + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 642 + if (var1 != null) { // L: 643 + return var1; } else { - SpritePixels var6 = this.getSprite(var1, (UrlRequester)null); // L: 736 - if (var6 == null) { // L: 737 - return null; + var1 = class163.method3322(SoundCache.Widget_spritesArchive, class17.Widget_fontsArchive, this.fontId, 0); // L: 644 + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); // L: 645 } else { - SpritePixels var7 = var6.copyNormalized(); // L: 738 - int[] var8 = new int[var7.subHeight]; // L: 739 - int[] var9 = new int[var7.subHeight]; // L: 740 - - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 741 - int var11 = 0; // L: 742 - int var12 = var7.subWidth; // L: 743 - - int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 744 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 745 - var11 = var13; // L: 746 - break; - } - } - - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 750 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 751 - var12 = var13 + 1; // L: 752 - break; - } - } - - var8[var10] = var11; // L: 756 - var9[var10] = var12 - var11; // L: 757 - } - - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 759 - Widget_cachedSpriteMasks.put(var5, var3); // L: 760 - return var5; // L: 761 + field3411 = true; // L: 646 } + + return var1; // L: 647 } } } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1364336092" - ) - @Export("setAction") - public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 765 - String[] var3 = new String[var1 + 1]; // L: 766 - if (this.actions != null) { // L: 767 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 768 - var3[var4] = this.actions[var4]; - } - } - - this.actions = var3; // L: 770 - } - - this.actions[var1] = var2; // L: 772 - } // L: 773 - @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "27" + descriptor = "(IB)Lqi;", + garbageValue = "7" ) - public boolean method5637() { - return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338; // L: 776 + @Export("getInventorySprite") + public SpritePixels getInventorySprite(int var1) { + field3411 = false; // L: 651 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 652 + int var2 = this.inventorySprites[var1]; // L: 653 + if (var2 == -1) { // L: 654 + return null; + } else { + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 655 + if (var3 != null) { // L: 656 + return var3; + } else { + var3 = class6.SpriteBuffer_getSprite(SoundCache.Widget_spritesArchive, var2, 0); // L: 657 + if (var3 != null) { // L: 658 + Widget_cachedSprites.put(var3, (long)var2); + } else { + field3411 = true; // L: 659 + } + + return var3; // L: 660 + } + } + } else { + return null; + } } - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lci;J)V" + descriptor = "(Lgw;IZLkp;I)Liq;", + garbageValue = "-1321759215" ) - public void method5720(String var1, UrlRequester var2, long var3) { - if (this.type == 11 && var3 != -1L) { // L: 780 - var1.replaceAll("%userid%", Long.toString(var3)); // L: 781 - this.field3476 = new class155(); // L: 782 - if (!this.field3476.method3131(var1, var2)) { // L: 783 - this.field3476 = null; // L: 784 - } else { - this.field3418 = new HashMap(); // L: 787 - this.field3381 = new HashMap(); // L: 788 - } - } - } // L: 785 789 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "936361700" - ) - public void method5639(int var1, int var2) { - if (this.type == 11 && this.field3418 != null) { // L: 792 - this.field3418.put(var1, var2); // L: 793 - } - } // L: 794 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-426288266" - ) - public void method5682(String var1, int var2) { - if (this.type == 11 && this.field3381 != null) { // L: 797 - this.field3381.put(var1, var2); // L: 798 - } - } // L: 799 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "1" - ) - public boolean method5623(int var1, int var2) { - if (this.type == 11 && this.field3476 != null && this.method5642()) { // L: 802 - int var3 = (int)(this.field3476.method3146()[0] * (float)this.width); // L: 803 - int var4 = (int)(this.field3476.method3146()[1] * (float)this.height); // L: 804 - int var5 = var3 + (int)(this.field3476.method3146()[2] * (float)this.width); // L: 805 - int var6 = var4 + (int)(this.field3476.method3146()[3] * (float)this.height); // L: 806 - return var1 >= var3 && var2 >= var4 && var1 < var5 && var2 < var6; // L: 807 + @Export("getModel") + public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { + field3411 = false; // L: 664 + int var5; + int var6; + if (var3) { // L: 667 + var5 = this.modelType2; // L: 668 + var6 = this.modelId2; // L: 669 } else { - return false; + var5 = this.modelType; // L: 672 + var6 = this.modelId; // L: 673 + } + + if (var5 == 0) { // L: 675 + return null; + } else if (var5 == 1 && var6 == -1) { // L: 676 + return null; + } else { + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 677 + if (var7 == null) { // L: 678 + ModelData var8; + if (var5 == 1) { // L: 680 + var8 = ModelData.ModelData_get(class162.Widget_modelsArchive, var6, 0); // L: 681 + if (var8 == null) { // L: 682 + field3411 = true; // L: 683 + return null; // L: 684 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 686 + } + + if (var5 == 2) { // L: 688 + var8 = KeyHandler.getNpcDefinition(var6).getModelData(); // L: 689 + if (var8 == null) { // L: 690 + field3411 = true; // L: 691 + return null; // L: 692 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 694 + } + + if (var5 == 3) { // L: 696 + if (var4 == null) { // L: 697 + return null; + } + + var8 = var4.getModelData(); // L: 698 + if (var8 == null) { // L: 699 + field3411 = true; // L: 700 + return null; // L: 701 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 703 + } + + if (var5 == 4) { // L: 705 + ItemComposition var9 = class19.ItemDefinition_get(var6); // L: 706 + var8 = var9.getModelData(10); // L: 707 + if (var8 == null) { // L: 708 + field3411 = true; // L: 709 + return null; // L: 710 + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 712 + } + + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 714 + } + + if (var1 != null) { // L: 716 + var7 = var1.transformWidgetModel(var7, var2); // L: 717 + } + + return var7; // L: 719 } } @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1389898904" + descriptor = "(ZB)Lki;", + garbageValue = "2" ) - public boolean method5642() { - return this.field3439 == 2; // L: 811 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-942824800" - ) - public int method5663(String var1) { - return this.type == 11 && this.field3476 != null && this.method5642() ? this.field3476.method3134(var1) : -1; // L: 815 816 818 - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1042520697" - ) - public String method5666(String var1) { - return this.type == 11 && this.field3476 != null && this.method5642() ? this.field3476.method3144(var1) : null; // L: 822 823 - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2025421912" - ) - public int method5656() { - return this.field3381 != null && this.field3381.size() > 0 ? 1 : 0; // L: 827 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-3071" - ) - public int method5699() { - if (this.type == 11 && this.field3476 != null && this.field3381 != null && !this.field3381.isEmpty()) { // L: 831 - String var1 = this.field3476.method3138(); // L: 832 - return var1 != null && this.field3381.containsKey(this.field3476.method3138()) ? (Integer)this.field3381.get(var1) : -1; // L: 833 834 836 - } else { - return -1; + @Export("getSpriteMask") + public SpriteMask getSpriteMask(boolean var1) { + if (this.spriteId == -1) { // L: 723 + var1 = false; } - } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1508958413" - ) - public String method5647() { - if (this.type == 11 && this.field3476 != null) { // L: 840 - String var1 = this.field3476.method3138(); // L: 841 - Iterator var2 = this.field3476.method3140().iterator(); // L: 842 - - while (var2.hasNext()) { - class166 var3 = (class166)var2.next(); // L: 843 - String var4 = String.format("%%%S%%", var3.method3295()); // L: 845 - if (var3.vmethod3297() == 0) { // L: 846 - var1.replaceAll(var4, Integer.toString(var3.vmethod3299())); // L: 847 - } else { - var1.replaceAll(var4, var3.vmethod3296()); // L: 850 - } - } - - return var1; // L: 854 - } else { - return null; // L: 853 - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1363848757" - ) - public int[] method5686() { - if (this.type == 11 && this.field3476 != null) { // L: 858 - int[] var1 = new int[3]; // L: 859 - int var2 = 0; // L: 860 - Iterator var3 = this.field3476.method3140().iterator(); // L: 861 - - while (var3.hasNext()) { // L: 876 - class166 var4 = (class166)var3.next(); // L: 862 - if (!var4.method3295().equals("user_id")) { // L: 864 - if (var4.vmethod3297() != 0) { // L: 865 - return null; // L: 872 - } - - var1[var2++] = var4.vmethod3299(); // L: 866 - if (var2 > 3) { // L: 867 - return null; // L: 868 - } - } - } - - return var1; // L: 877 - } else { + int var2 = var1 ? this.spriteId * -1883530769 * 781497615 : this.spriteId2 * 1275315819 * 43628099; // L: 724 + if (var2 == -1) { // L: 725 return null; + } else { + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 726 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 727 + if (var5 != null) { // L: 728 + return var5; + } else { + SpritePixels var6 = this.getSprite(var1, (UrlRequester)null); // L: 729 + if (var6 == null) { // L: 730 + return null; + } else { + SpritePixels var7 = var6.copyNormalized(); // L: 731 + int[] var8 = new int[var7.subHeight]; // L: 732 + int[] var9 = new int[var7.subHeight]; // L: 733 + + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 734 + int var11 = 0; // L: 735 + int var12 = var7.subWidth; // L: 736 + + int var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 737 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 738 + var11 = var13; // L: 739 + break; + } + } + + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 743 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 744 + var12 = var13 + 1; // L: 745 + break; + } + } + + var8[var10] = var11; // L: 749 + var9[var10] = var12 - var11; // L: 750 + } + + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 752 + Widget_cachedSpriteMasks.put(var5, var3); // L: 753 + return var5; // L: 754 + } + } } } - @ObfuscatedName("aw") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lci;I)Z", - garbageValue = "-715123605" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-60" ) - public boolean method5694(UrlRequester var1) { - if (this.type == 11 && this.field3476 != null) { // L: 881 - this.field3476.method3165(var1); // L: 882 - if (this.field3476.method3141() != this.field3439) { // L: 883 - this.field3439 = this.field3476.method3141(); // L: 884 - if (this.field3439 >= 100) { // L: 885 - return false; // L: 886 - } - - if (this.field3439 == 2) { // L: 888 - this.method5640(); // L: 889 - return true; // L: 890 + @Export("setAction") + public void setAction(int var1, String var2) { + if (this.actions == null || this.actions.length <= var1) { // L: 758 + String[] var3 = new String[var1 + 1]; // L: 759 + if (this.actions != null) { // L: 760 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 761 + var3[var4] = this.actions[var4]; } } - return false; // L: 893 + this.actions = var3; // L: 763 + } + + this.actions[var1] = var2; // L: 765 + } // L: 766 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-398525420" + ) + public boolean method5617() { + return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338; // L: 769 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lck;J)V" + ) + public void method5618(String var1, UrlRequester var2, long var3) { + if (this.type == 11 && var3 != -1L) { // L: 773 + var1.replaceAll("%userid%", Long.toString(var3)); // L: 774 + this.field3409 = new class155(); // L: 775 + if (!this.field3409.method3201(var1, var2)) { // L: 776 + this.field3409 = null; // L: 777 + } else { + this.field3354 = new HashMap(); // L: 780 + this.field3412 = new HashMap(); // L: 781 + } + } + } // L: 778 782 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-459125487" + ) + public void method5722(int var1, int var2) { + if (this.type == 11 && this.field3354 != null) { // L: 785 + this.field3354.put(var1, var2); // L: 786 + } + } // L: 787 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "1957119277" + ) + public void method5672(String var1, int var2) { + if (this.type == 11 && this.field3412 != null) { // L: 790 + this.field3412.put(var1, var2); // L: 791 + } + } // L: 792 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "-22" + ) + public boolean method5721(int var1, int var2) { + if (this.type == 11 && this.field3409 != null && this.method5690()) { // L: 795 + int var3 = (int)(this.field3409.method3190()[0] * (float)this.width); // L: 796 + int var4 = (int)(this.field3409.method3190()[1] * (float)this.height); // L: 797 + int var5 = var3 + (int)(this.field3409.method3190()[2] * (float)this.width); // L: 798 + int var6 = var4 + (int)(this.field3409.method3190()[3] * (float)this.height); // L: 799 + return var1 >= var3 && var2 >= var4 && var1 < var5 && var2 < var6; // L: 800 } else { return false; } } + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "98" + ) + public boolean method5690() { + return this.field3410 == 2; // L: 804 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "9" + ) + public int method5623(String var1) { + return this.type == 11 && this.field3409 != null && this.method5690() ? this.field3409.method3189(var1) : -1; // L: 808 809 811 + } + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1643593972" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "787247673" ) - void method5640() { - this.noClickThrough = true; // L: 914 - ArrayList var1 = this.field3476.method3130(); // L: 915 - ArrayList var2 = this.field3476.method3137(); // L: 916 - int var3 = var1.size() + var2.size(); // L: 917 - this.children = new Widget[var3]; // L: 918 - int var4 = 0; // L: 919 + public String method5624(String var1) { + return this.type == 11 && this.field3409 != null && this.method5690() ? this.field3409.method3223(var1) : null; // L: 815 816 + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1923228408" + ) + public int method5625() { + return this.field3412 != null && this.field3412.size() > 0 ? 1 : 0; // L: 820 + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-9" + ) + public int method5647() { + if (this.type == 11 && this.field3409 != null && this.field3412 != null && !this.field3412.isEmpty()) { // L: 824 + String var1 = this.field3409.method3188(); // L: 825 + return var1 != null && this.field3412.containsKey(this.field3409.method3188()) ? (Integer)this.field3412.get(var1) : -1; // L: 826 827 829 + } else { + return -1; + } + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-41" + ) + public String method5627() { + if (this.type == 11 && this.field3409 != null) { // L: 833 + String var1 = this.field3409.method3188(); // L: 834 + Iterator var2 = this.field3409.method3191().iterator(); // L: 835 + + while (var2.hasNext()) { + class166 var3 = (class166)var2.next(); // L: 836 + String var4 = String.format("%%%S%%", var3.method3336()); // L: 838 + if (var3.vmethod3341() == 0) { // L: 839 + var1.replaceAll(var4, Integer.toString(var3.vmethod3334())); // L: 840 + } else { + var1.replaceAll(var4, var3.vmethod3333()); // L: 843 + } + } + + return var1; // L: 847 + } else { + return null; // L: 846 + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "998374015" + ) + public int[] method5628() { + if (this.type == 11 && this.field3409 != null) { // L: 851 + int[] var1 = new int[3]; // L: 852 + int var2 = 0; // L: 853 + Iterator var3 = this.field3409.method3191().iterator(); // L: 854 + + while (var3.hasNext()) { + class166 var4 = (class166)var3.next(); // L: 855 + if (!var4.method3336().equals("user_id")) { // L: 857 + if (var4.vmethod3341() != 0) { // L: 858 + return null; // L: 865 + } + + var1[var2++] = var4.vmethod3334(); // L: 859 + if (var2 > 3) { // L: 860 + return null; // L: 861 + } + } + } + + return var1; // L: 870 + } else { + return null; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Lck;I)Z", + garbageValue = "-1463897993" + ) + public boolean method5629(UrlRequester var1) { + if (this.type == 11 && this.field3409 != null) { // L: 874 + this.field3409.method3184(var1); // L: 875 + if (this.field3409.method3230() != this.field3410) { // L: 876 + this.field3410 = this.field3409.method3230(); // L: 877 + if (this.field3410 >= 100) { // L: 878 + return false; // L: 879 + } + + if (this.field3410 == 2) { // L: 881 + this.method5701(); // L: 882 + return true; // L: 883 + } + } + + return false; // L: 886 + } else { + return false; + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1471555316" + ) + void method5701() { + this.noClickThrough = true; // L: 907 + ArrayList var1 = this.field3409.method3187(); // L: 908 + ArrayList var2 = this.field3409.method3229(); // L: 909 + int var3 = var1.size() + var2.size(); // L: 910 + this.children = new Widget[var3]; // L: 911 + int var4 = 0; // L: 912 Iterator var5; Widget var7; - for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 920 927 - class160 var6 = (class160)var5.next(); // L: 921 - var7 = class146.method3043(5, this, var4, 0, 0, 0, 0, var6.field1748); // L: 923 - var7.field3386 = var6.field1749.method2546(); // L: 924 - class291 var8 = new class291(var6.field1749); // L: 925 - field3388.method6640(var7.field3386, var8); // L: 926 + for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 913 920 + class160 var6 = (class160)var5.next(); // L: 914 + var7 = class83.method2111(5, this, var4, 0, 0, 0, 0, var6.field1735); // L: 916 + var7.field3487 = var6.field1737.method2554(); // L: 917 + class291 var8 = new class291(var6.field1737); // L: 918 + field3389.method6596(var7.field3487, var8); // L: 919 } - for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 930 938 - class162 var9 = (class162)var5.next(); // L: 931 - var7 = class146.method3043(4, this, var4, 0, 0, 0, 0, var9.field1769); // L: 933 - var7.text = var9.field1771; // L: 934 - var7.fontId = (Integer)this.field3418.get(var9.field1772); // L: 935 - var7.textXAlignment = var9.field1770; // L: 936 - var7.textYAlignment = var9.field1776; // L: 937 + for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 923 931 + class162 var9 = (class162)var5.next(); // L: 924 + var7 = class83.method2111(4, this, var4, 0, 0, 0, 0, var9.field1754); // L: 926 + var7.text = var9.field1758; // L: 927 + var7.fontId = (Integer)this.field3354.get(var9.field1752); // L: 928 + var7.textXAlignment = var9.field1755; // L: 929 + var7.textYAlignment = var9.field1756; // L: 930 } - } // L: 941 + } // L: 934 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-2380539" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; // L: 33 + if (var1 != null) { // L: 34 + var2 = class128.method2853(var1); + } + + if (var0 != null) { // L: 35 + if (var1 != null) { // L: 36 + var2 = var2 + " | "; + } + + var2 = var2 + var0; // L: 37 + } + + System.out.println("Error: " + var2); // L: 39 + var2 = var2.replace(':', '.'); // L: 40 + var2 = var2.replace('@', '_'); // L: 41 + var2 = var2.replace('&', '_'); // L: 42 + var2 = var2.replace('#', '_'); // L: 43 + if (RunException.RunException_applet == null) { // L: 44 + 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=" + WorldMapRegion.clientType + "&e=" + var2); // L: 45 + DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 + var4.read(); // L: 47 + var4.close(); // L: 48 + } catch (Exception var5) { // L: 50 + } + + } + } // L: 51 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "([BIILhv;[Lgv;I)V", + garbageValue = "-2111400483" + ) + static final void method5681(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 266 + int var6 = -1; // L: 267 + + while (true) { + int var7 = var5.method7743(); // L: 269 + if (var7 == 0) { // L: 270 + return; // L: 294 + } + + var6 += var7; // L: 271 + int var8 = 0; // L: 272 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 274 + if (var9 == 0) { // L: 275 + break; + } + + var8 += var9 - 1; // L: 276 + int var10 = var8 & 63; // L: 277 + int var11 = var8 >> 6 & 63; // L: 278 + int var12 = var8 >> 12; // L: 279 + int var13 = var5.readUnsignedByte(); // L: 280 + int var14 = var13 >> 2; // L: 281 + int var15 = var13 & 3; // L: 282 + int var16 = var11 + var1; // L: 283 + int var17 = var10 + var2; // L: 284 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 285 + int var18 = var12; // L: 286 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 287 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 288 + if (var18 >= 0) { // L: 289 + var19 = var4[var18]; + } + + WorldMapElement.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); // L: 290 + } + } + } + } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 8d90fd25a8..22d0fcd76f 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -1,75 +1,67 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bb") @Implements("World") public class World { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Lbr;" - ) - @Export("World_worlds") - static World[] World_worlds; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 708983157 + intValue = -99479259 ) @Export("World_count") static int World_count; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1412956873 + intValue = 666094335 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1791268419 + intValue = 2132870801 ) @Export("id") int id; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1457180793 + intValue = -1264114231 ) @Export("properties") int properties; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1283993585 + intValue = 1643368369 ) @Export("population") int population; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("host") String host; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("activity") String activity; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -658464583 + intValue = 786542067 ) @Export("location") int location; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1286682885 + intValue = -154567813 ) @Export("index") int index; @@ -84,90 +76,137 @@ public class World { World() { } // L: 27 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1842412760" + descriptor = "(B)Z", + garbageValue = "1" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; // L: 247 } - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "728871441" + garbageValue = "-1237619504" ) - boolean method1628() { + boolean method1637() { return (2 & this.properties) != 0; // L: 251 } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1860289724" + garbageValue = "1559605214" ) @Export("isPvp") boolean isPvp() { return (4 & this.properties) != 0; // L: 255 } - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1727369163" + descriptor = "(B)Z", + garbageValue = "-3" ) - boolean method1612() { + boolean method1639() { return (8 & this.properties) != 0; // L: 259 } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1493123434" + garbageValue = "-1091774244" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; // L: 263 } - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1898535773" + garbageValue = "-980357381" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; // L: 267 } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "116" + garbageValue = "-67" ) - boolean method1638() { + boolean method1642() { return (1073741824 & this.properties) != 0; // L: 271 } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-200801552" + descriptor = "(I)J", + garbageValue = "248587859" ) - public static void method1655() { + static long method1678() { try { - JagexCache.JagexCache_dat2File.close(); // L: 240 + URL var0 = new URL(ArchiveLoader.method2063("services", false) + "m=accountappeal/login.ws"); // L: 36 + URLConnection var1 = var0.openConnection(); + var1.setRequestProperty("connection", "close"); + var1.setDoInput(true); + var1.setDoOutput(true); // L: 40 + var1.setConnectTimeout(5000); // L: 41 + OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42 + var2.write("data1=req"); // L: 43 + var2.flush(); // L: 44 + InputStream var3 = var1.getInputStream(); // L: 45 + Buffer var4 = new Buffer(new byte[1000]); // L: 46 - for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 241 - class194.JagexCache_idxFiles[var0].close(); - } + do { + int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48 + if (var5 == -1) { + var4.offset = 0; // L: 55 + long var7 = var4.readLong(); // L: 56 + return var7; // L: 57 + } - JagexCache.JagexCache_idx255File.close(); // L: 242 - JagexCache.JagexCache_randomDat.close(); // L: 243 - } catch (Exception var2) { // L: 245 + var4.offset += var5; // L: 50 + } while(var4.offset < 1000); + + return 0L; // L: 52 + } catch (Exception var9) { + return 0L; // L: 60 } + } - } // L: 246 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-88" + ) + public static int method1673(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 49 + int var1 = (int)(var2 >>> 0 & 127L); // L: 51 + return var1; // L: 53 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "2080667319" + ) + public static int method1679(int var0, int var1, int var2) { + int var3 = class54.method1078(var2 - var1 + 1); // L: 37 + var3 <<= var1; // L: 38 + return var0 & ~var3; // L: 39 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1622392704" + ) + public static int method1677() { + return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 59 + } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index ce44b0c392..9bb83cf66a 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("on") +@ObfuscatedName("ov") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Low;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmd;" ) @Export("font") Font font; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("fonts") HashMap fonts; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lqx;" + descriptor = "[Lqq;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("details") HashMap details; - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lgu;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lgu;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lgu;" ) - WorldMapArea field4476; - @ObfuscatedName("m") + WorldMapArea field4470; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lgq;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Loo;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 408955541 + intValue = -204052953 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1426073287 + intValue = 219914903 ) @Export("centerTileY") int centerTileY; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 332929337 + intValue = -1572186899 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -236036255 + intValue = -1716305029 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("i") + @ObfuscatedName("h") @Export("zoom") float zoom; - @ObfuscatedName("ac") + @ObfuscatedName("ae") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1419638859 + intValue = -170913605 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1579840621 + intValue = 1495575421 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1167803945 + intValue = -1912893677 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 2066122969 + intValue = 1000081531 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 517821217 + intValue = -247126339 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 826780571 + intValue = 372546071 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ae") + @ObfuscatedName("al") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("ab") + @ObfuscatedName("av") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 3395265 + intValue = 793373045 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 472385181 + intValue = 129908321 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("aj") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -557110831 + intValue = -56119659 ) - int field4495; - @ObfuscatedName("as") + int field4478; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1015816733 + intValue = 1571569859 ) - int field4496; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = 1486339413 - ) - int field4497; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = 1300251727 - ) - int field4498; - @ObfuscatedName("aq") - @ObfuscatedGetter( - longValue = -3497508433383023727L - ) - long field4499; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = 329780085 - ) - int field4500; + int field4490; @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1671130161 + intValue = -1208790781 ) - int field4501; - @ObfuscatedName("am") - boolean field4464; - @ObfuscatedName("az") + int field4476; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = -1439661763 + ) + int field4492; + @ObfuscatedName("ab") + @ObfuscatedGetter( + longValue = -4966636021843214621L + ) + long field4493; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 188135575 + ) + int field4494; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = -1117440409 + ) + int field4487; + @ObfuscatedName("ad") + boolean field4496; + @ObfuscatedName("ar") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("af") + @ObfuscatedName("az") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ap") - HashSet field4507; - @ObfuscatedName("ai") + @ObfuscatedName("as") + HashSet field4500; + @ObfuscatedName("aa") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bk") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -889165185 + intValue = 671682067 ) - int field4470; - @ObfuscatedName("bl") + int field4502; + @ObfuscatedName("br") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("be") - List field4519; - @ObfuscatedName("bt") + @ObfuscatedName("bo") + List field4468; + @ObfuscatedName("bl") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("ba") - HashSet field4460; - @ObfuscatedName("bg") + @ObfuscatedName("be") + HashSet field4506; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lks;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("br") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqi;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -2110734943 + intValue = 1339558425 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bd") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1052523623 + intValue = 470203205 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bf") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1982945111 + intValue = 925038883 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("by") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1453677139 + intValue = -1007232389 ) - int field4520; + int field4513; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; // L: 71 this.flashCount = -1; // L: 72 this.flashCycle = -1; // L: 73 - this.field4495 = -1; // L: 74 - this.field4496 = -1; // L: 75 - this.field4497 = -1; // L: 76 - this.field4498 = -1; // L: 77 - this.field4464 = true; // L: 81 + this.field4478 = -1; // L: 74 + this.field4490 = -1; // L: 75 + this.field4476 = -1; // L: 76 + this.field4492 = -1; // L: 77 + this.field4496 = true; // L: 81 this.enabledElements = new HashSet(); // L: 84 this.enabledCategories = new HashSet(); // L: 85 this.enabledElementIds = new HashSet(); // L: 86 - this.field4507 = new HashSet(); // L: 87 + this.field4500 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field4470 = 0; // L: 89 + this.field4502 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4460 = new HashSet(); // L: 94 + this.field4506 = new HashSet(); // L: 94 this.mouseCoord = null; // L: 95 this.showCoord = false; // L: 96 this.minCachedTileX = -1; // L: 99 this.minCachedTileY = -1; // L: 100 - this.field4520 = -1; // L: 101 + this.field4513 = -1; // L: 101 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;Llq;Lmr;Ljava/util/HashMap;[Lqx;B)V", - garbageValue = "16" + descriptor = "(Lln;Lln;Lln;Lmd;Ljava/util/HashMap;[Lqq;B)V", + garbageValue = "-57" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2849.name); // L: 115 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2413.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -356,453 +356,450 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4476 = null; // L: 128 + this.field4470 = null; // L: 128 } // L: 129 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1192677755" + descriptor = "(B)V", + garbageValue = "-36" ) - public void method7303() { - class140.method2985(); // L: 132 - } // L: 133 + public void method7215() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 + } // L: 135 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIZIIIIB)V", - garbageValue = "1" + garbageValue = "0" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { // L: 136 - this.smoothZoom(); // L: 139 - this.scrollToTarget(); // L: 140 - if (var3) { // L: 141 - int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 144 - int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 145 - List var10 = this.worldMapManager.method4806(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 146 - HashSet var11 = new HashSet(); // L: 147 + if (this.cacheLoader.isLoaded()) { // L: 138 + this.smoothZoom(); // L: 141 + this.scrollToTarget(); // L: 142 + if (var3) { // L: 143 + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146 + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147 + List var10 = this.worldMapManager.method4186(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 + HashSet var11 = new HashSet(); // L: 149 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); class1.runScriptEvent(var14)) { // L: 148 161 - var13 = (AbstractWorldMapIcon)var12.next(); // L: 149 - var11.add(var13); // L: 151 - var14 = new ScriptEvent(); // L: 152 - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 153 - var14.setArgs(new Object[]{var15, var1, var2}); // L: 154 - if (this.field4460.contains(var13)) { // L: 155 - var14.setType(17); // L: 156 + for (var12 = var10.iterator(); var12.hasNext(); ClanSettings.runScriptEvent(var14)) { // L: 150 163 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 151 + var11.add(var13); // L: 153 + var14 = new ScriptEvent(); // L: 154 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 156 + if (this.field4506.contains(var13)) { // L: 157 + var14.setType(17); // L: 158 } else { - var14.setType(15); // L: 159 + var14.setType(15); // L: 161 } } - var12 = this.field4460.iterator(); // L: 164 + var12 = this.field4506.iterator(); // L: 166 while (var12.hasNext()) { - var13 = (AbstractWorldMapIcon)var12.next(); // L: 165 - if (!var11.contains(var13)) { // L: 167 - var14 = new ScriptEvent(); // L: 168 - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 169 - var14.setArgs(new Object[]{var15, var1, var2}); // L: 170 - var14.setType(16); // L: 171 - class1.runScriptEvent(var14); // L: 172 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 + if (!var11.contains(var13)) { // L: 169 + var14 = new ScriptEvent(); // L: 170 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 172 + var14.setType(16); // L: 173 + ClanSettings.runScriptEvent(var14); // L: 174 } } - this.field4460 = var11; // L: 176 + this.field4506 = var11; // L: 178 } } - } // L: 137 142 177 + } // L: 139 144 179 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "-42282906" + descriptor = "(IIZZB)V", + garbageValue = "-38" ) - public void method7305(int var1, int var2, boolean var3, boolean var4) { - long var5 = WorldMapSprite.method4989(); // L: 180 - this.method7315(var1, var2, var4, var5); // L: 181 - if (this.hasTarget() || !var4 && !var3) { // L: 182 - this.method7499(); // L: 196 + public void method7217(int var1, int var2, boolean var3, boolean var4) { + long var5 = class136.method2931(); // L: 182 + this.method7218(var1, var2, var4, var5); // L: 183 + if (this.hasTarget() || !var4 && !var3) { // L: 184 + this.method7222(); // L: 198 } else { - if (var4) { // L: 183 - this.field4497 = var1; // L: 184 - this.field4498 = var2; // L: 185 - this.field4495 = this.centerTileX; // L: 186 - this.field4496 = this.centerTileY; // L: 187 + if (var4) { // L: 185 + this.field4476 = var1; // L: 186 + this.field4492 = var2; // L: 187 + this.field4478 = this.centerTileX; // L: 188 + this.field4490 = this.centerTileY; // L: 189 } - if (this.field4495 != -1) { // L: 189 - int var7 = var1 - this.field4497; // L: 190 - int var8 = var2 - this.field4498; // L: 191 - this.setWorldMapPosition(this.field4495 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4496, false); // L: 192 + if (this.field4478 != -1) { // L: 191 + int var7 = var1 - this.field4476; // L: 192 + int var8 = var2 - this.field4492; // L: 193 + this.setWorldMapPosition(this.field4478 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4490, false); // L: 194 } } - if (var4) { // L: 198 - this.field4499 = var5; // L: 199 - this.field4500 = var1; // L: 200 - this.field4501 = var2; // L: 201 + if (var4) { // L: 200 + this.field4493 = var5; // L: 201 + this.field4494 = var1; // L: 202 + this.field4487 = var2; // L: 203 } - } // L: 203 + } // L: 205 - @ObfuscatedName("l") - void method7315(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea != null) { // L: 206 - int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 207 - int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 208 - this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 209 - if (this.mouseCoord != null && var3) { // L: 210 - boolean var8 = Client.staffModLevel >= 2; // L: 213 - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 215 - class392.method7191(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 216 + @ObfuscatedName("b") + void method7218(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea != null) { // L: 208 + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209 + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210 + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211 + if (this.mouseCoord != null && var3) { // L: 212 + if (class113.method2651() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213 + StructComposition.method3619(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214 } else { - boolean var9 = true; // L: 219 - if (this.field4464) { // L: 220 - int var10 = var1 - this.field4500; // L: 221 - int var11 = var2 - this.field4501; // L: 222 - if (var4 - this.field4499 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 223 - var9 = false; // L: 224 + boolean var8 = true; // L: 217 + if (this.field4496) { // L: 218 + int var9 = var1 - this.field4494; // L: 219 + int var10 = var2 - this.field4487; // L: 220 + if (var4 - this.field4493 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221 + var8 = false; // L: 222 } } - if (var9) { // L: 227 - PacketBufferNode var12 = ItemContainer.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 228 - var12.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 229 - Client.packetWriter.addNode(var12); // L: 230 - this.field4499 = 0L; // L: 231 + if (var8) { // L: 225 + PacketBufferNode var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 226 + var11.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 227 + Client.packetWriter.addNode(var11); // L: 228 + this.field4493 = 0L; // L: 229 } } } } else { - this.mouseCoord = null; // L: 236 + this.mouseCoord = null; // L: 234 } - } // L: 237 + } // L: 235 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "403257256" + garbageValue = "-521549937" ) @Export("smoothZoom") void smoothZoom() { - if (class340.field4109 != null) { // L: 240 - this.zoom = this.zoomTarget; // L: 241 + if (VarcInt.field1841 != null) { // L: 238 + this.zoom = this.zoomTarget; // L: 239 } else { - if (this.zoom < this.zoomTarget) { // L: 244 - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 245 + if (this.zoom < this.zoomTarget) { // L: 242 + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 243 } - if (this.zoom > this.zoomTarget) { // L: 247 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 248 + if (this.zoom > this.zoomTarget) { // L: 245 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 246 } } - } // L: 242 250 + } // L: 240 248 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-57" + descriptor = "(I)V", + garbageValue = "54677905" ) @Export("scrollToTarget") void scrollToTarget() { - if (this.hasTarget()) { // L: 253 - int var1 = this.worldMapTargetX - this.centerTileX; // L: 256 - int var2 = this.worldMapTargetY - this.centerTileY; // L: 257 - if (var1 != 0) { // L: 258 - var1 /= Math.min(8, Math.abs(var1)); // L: 259 + if (this.hasTarget()) { // L: 251 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 254 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 255 + if (var1 != 0) { // L: 256 + var1 /= Math.min(8, Math.abs(var1)); // L: 257 } - if (var2 != 0) { // L: 261 - var2 /= Math.min(8, Math.abs(var2)); // L: 262 + if (var2 != 0) { // L: 259 + var2 /= Math.min(8, Math.abs(var2)); // L: 260 } - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 264 - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 265 - this.worldMapTargetX = -1; // L: 266 - this.worldMapTargetY = -1; // L: 267 + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 262 + if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 263 + this.worldMapTargetX = -1; // L: 264 + this.worldMapTargetY = -1; // L: 265 } } - } // L: 254 269 + } // L: 252 267 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1898905069" + garbageValue = "1721152529" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 272 - this.centerTileY = var2; // L: 273 - WorldMapSprite.method4989(); // L: 274 + this.centerTileX = var1; // L: 270 + this.centerTileY = var2; // L: 271 + class136.method2931(); // L: 272 if (var3) { - this.method7499(); // L: 275 + this.method7222(); // L: 273 } - } // L: 276 + } // L: 274 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1193199774" + descriptor = "(B)V", + garbageValue = "0" ) - final void method7499() { - this.field4498 = -1; // L: 279 - this.field4497 = -1; // L: 280 - this.field4496 = -1; // L: 281 - this.field4495 = -1; // L: 282 - } // L: 283 + final void method7222() { + this.field4492 = -1; // L: 277 + this.field4476 = -1; // L: 278 + this.field4490 = -1; // L: 279 + this.field4478 = -1; // L: 280 + } // L: 281 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1728836815" + garbageValue = "2003911116" ) @Export("hasTarget") boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 286 + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284 } - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIII)Lhw;", - garbageValue = "2133488552" + descriptor = "(IIII)Lgu;", + garbageValue = "837342952" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); // L: 290 + Iterator var4 = this.details.values().iterator(); // L: 288 WorldMapArea var5; do { if (!var4.hasNext()) { - return null; // L: 298 + return null; // L: 296 } - var5 = (WorldMapArea)var4.next(); // L: 291 - } while(!var5.containsCoord(var1, var2, var3)); // L: 293 + var5 = (WorldMapArea)var4.next(); // L: 289 + } while(!var5.containsCoord(var1, var2, var3)); // L: 291 - return var5; // L: 294 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "660135431" - ) - public void method7313(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 302 - if (var5 == null) { // L: 303 - if (!var4) { // L: 304 - return; // L: 307 - } - - var5 = this.mainMapArea; // L: 305 - } - - boolean var6 = false; // L: 309 - if (var5 != this.field4476 || var4) { // L: 310 - this.field4476 = var5; // L: 311 - this.setCurrentMapArea(var5); // L: 312 - var6 = true; // L: 313 - } - - if (var6 || var4) { // L: 315 - this.jump(var1, var2, var3); // L: 316 - } - - } // L: 318 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1503903829" - ) - @Export("setCurrentMapAreaId") - public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); // L: 321 - if (var2 != null) { // L: 322 - this.setCurrentMapArea(var2); // L: 323 - } - - } // L: 325 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1936294730" - ) - @Export("currentMapAreaId") - public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 328 329 331 + return var5; // L: 292 } @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Lhw;", - garbageValue = "-1794473827" + descriptor = "(IIIZB)V", + garbageValue = "9" ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 335 - } + public void method7327(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 300 + if (var5 == null) { // L: 301 + if (!var4) { // L: 302 + return; // L: 305 + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lhw;B)V", - garbageValue = "3" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 339 - this.initializeWorldMapManager(var1); // L: 342 - this.jump(-1, -1, -1); // L: 343 + var5 = this.mainMapArea; // L: 303 } - } // L: 340 344 - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lhw;I)V", - garbageValue = "-525711858" - ) - @Export("initializeWorldMapManager") - void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; // L: 347 - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 348 - this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 349 - } // L: 350 + boolean var6 = false; // L: 307 + if (var5 != this.field4470 || var4) { // L: 308 + this.field4470 = var5; // L: 309 + this.setCurrentMapArea(var5); // L: 310 + var6 = true; // L: 311 + } + + if (var6 || var4) { // L: 313 + this.jump(var1, var2, var3); // L: 314 + } + + } // L: 316 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lhw;Lko;Lko;ZI)V", - garbageValue = "23223639" + descriptor = "(IB)V", + garbageValue = "6" ) - public void method7319(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { // L: 353 - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 356 - this.initializeWorldMapManager(var1); // L: 357 - } - - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 359 - this.jump(var2.plane, var2.x, var2.y); // L: 363 - } else { - this.jump(var3.plane, var3.x, var3.y); // L: 360 - } - + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); // L: 319 + if (var2 != null) { // L: 320 + this.setCurrentMapArea(var2); // L: 321 } - } // L: 354 365 - @ObfuscatedName("a") + } // L: 323 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "122" + descriptor = "(I)I", + garbageValue = "673781183" ) - @Export("jump") - void jump(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 368 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 371 - if (var4 == null) { // L: 372 - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 373 - } + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329 + } - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 375 - this.worldMapTargetX = -1; // L: 376 - this.worldMapTargetY = -1; // L: 377 - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 378 - this.zoomTarget = this.zoom; // L: 379 - this.field4519 = null; // L: 380 - this.iconIterator = null; // L: 381 - this.worldMapManager.clearIcons(); // L: 382 - } - } // L: 369 383 + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)Lgu;", + garbageValue = "-1495787888" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 333 + } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-2101106312" + descriptor = "(Lgu;B)V", + garbageValue = "-27" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337 + this.initializeWorldMapManager(var1); // L: 340 + this.jump(-1, -1, -1); // L: 341 + } + } // L: 338 342 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lgu;I)V", + garbageValue = "1382384596" + ) + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; // L: 345 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 346 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 347 + } // L: 348 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lgu;Lks;Lks;ZI)V", + garbageValue = "-1940143695" + ) + public void method7231(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 351 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 354 + this.initializeWorldMapManager(var1); // L: 355 + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 357 + this.jump(var2.plane, var2.x, var2.y); // L: 361 + } else { + this.jump(var3.plane, var3.x, var3.y); // L: 358 + } + + } + } // L: 352 363 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-537383689" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 366 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 369 + if (var4 == null) { // L: 370 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 371 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 373 + this.worldMapTargetX = -1; // L: 374 + this.worldMapTargetY = -1; // L: 375 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 376 + this.zoomTarget = this.zoom; // L: 377 + this.field4468 = null; // L: 378 + this.iconIterator = null; // L: 379 + this.worldMapManager.clearIcons(); // L: 380 + } + } // L: 367 381 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIIIB)V", + garbageValue = "4" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; // L: 386 - Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 387 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 388 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 389 - int var7 = this.cacheLoader.getPercentLoaded(); // L: 390 - if (var7 < 100) { // L: 391 - this.drawLoading(var1, var2, var3, var4, var7); // L: 392 + int[] var6 = new int[4]; // L: 384 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 385 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 386 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 387 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 388 + if (var7 < 100) { // L: 389 + this.drawLoading(var1, var2, var3, var4, var7); // L: 390 } else { - if (!this.worldMapManager.isLoaded()) { // L: 395 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 396 - if (!this.worldMapManager.isLoaded()) { // L: 397 - return; // L: 398 + if (!this.worldMapManager.isLoaded()) { // L: 393 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 394 + if (!this.worldMapManager.isLoaded()) { // L: 395 + return; // L: 396 } } - if (this.flashingElements != null) { // L: 401 - ++this.flashCycle; // L: 402 - if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 403 - this.flashCycle = 0; // L: 404 - ++this.flashCount; // L: 405 + if (this.flashingElements != null) { // L: 399 + ++this.flashCycle; // L: 400 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 401 + this.flashCycle = 0; // L: 402 + ++this.flashCount; // L: 403 } - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 407 - this.flashingElements = null; // L: 408 + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 405 + this.flashingElements = null; // L: 406 } } - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 411 - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 412 - 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); // L: 413 - boolean var10; - if (!this.elementsDisabled) { // L: 414 - var10 = false; // L: 415 - if (var5 - this.field4470 > 100) { // L: 416 - this.field4470 = var5; // L: 417 - var10 = true; // L: 418 + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 409 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 410 + 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); // L: 411 + if (!this.elementsDisabled) { // L: 412 + boolean var10 = false; // L: 413 + if (var5 - this.field4502 > 100) { // L: 414 + this.field4502 = var5; // L: 415 + var10 = true; // L: 416 } - 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.field4507, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 420 + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4500, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418 } - this.method7323(var1, var2, var3, var4, var8, var9); // L: 422 - var10 = Client.staffModLevel >= 2; // L: 425 - if (var10 && this.showCoord && this.mouseCoord != null) { // L: 427 + this.method7297(var1, var2, var3, var4, var8, var9); // L: 420 + if (class113.method2651() && this.showCoord && this.mouseCoord != null) { // L: 421 this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } - this.worldMapDisplayWidth = var8; // L: 428 - this.worldMapDisplayHeight = var9; // L: 429 - this.worldMapDisplayX = var1; // L: 430 - this.worldMapDisplayY = var2; // L: 431 - Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 432 + this.worldMapDisplayWidth = var8; // L: 422 + this.worldMapDisplayHeight = var9; // L: 423 + this.worldMapDisplayX = var1; // L: 424 + this.worldMapDisplayY = var2; // L: 425 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 426 } - } // L: 393 433 + } // L: 391 427 - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIIIII)Z", - garbageValue = "569446067" + garbageValue = "1064030571" ) - boolean method7358(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { // L: 436 + boolean method7234(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 430 return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 437 - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 438 + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 431 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 432 return true; - } else if (this.field4520 != Client.field764) { // L: 439 + } else if (this.field4513 != Client.field779) { // L: 433 return true; - } else if (var3 <= 0 && var4 <= 0) { // L: 440 - return var3 + var1 < var5 || var2 + var4 < var6; // L: 441 + } else if (var3 <= 0 && var4 <= 0) { // L: 434 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 435 } else { - return true; // L: 442 + return true; // L: 436 } } else { return true; @@ -812,631 +809,631 @@ public class WorldMap { @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-1981206171" + garbageValue = "-248173982" ) - void method7323(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class340.field4109 != null) { // L: 446 - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 447 - int var8 = var3 + 512; // L: 448 - int var9 = var4 + 512; // L: 449 - float var10 = 1.0F; // L: 450 - var8 = (int)((float)var8 / var10); // L: 451 - var9 = (int)((float)var9 / var10); // L: 452 - int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 453 - int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 454 - int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 455 - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 456 - if (this.method7358(var8, var9, var13, var14, var3, var4)) { // L: 457 - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 458 - Arrays.fill(this.sprite.pixels, 0); // L: 461 + void method7297(int var1, int var2, int var3, int var4, int var5, int var6) { + if (VarcInt.field1841 != null) { // L: 440 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 441 + int var8 = var3 + 512; // L: 442 + int var9 = var4 + 512; // L: 443 + float var10 = 1.0F; // L: 444 + var8 = (int)((float)var8 / var10); // L: 445 + var9 = (int)((float)var9 / var10); // L: 446 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 447 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 448 + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 449 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 450 + if (this.method7234(var8, var9, var13, var14, var3, var4)) { // L: 451 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 452 + Arrays.fill(this.sprite.pixels, 0); // L: 455 } else { - this.sprite = new SpritePixels(var8, var9); // L: 459 + this.sprite = new SpritePixels(var8, var9); // L: 453 } - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 462 - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 463 - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 464 - class340.field4109.method6082(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 465 - this.field4520 = Client.field764; // L: 466 - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 467 - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 468 + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 456 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 457 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 458 + VarcInt.field1841.method6045(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459 + this.field4513 = Client.field779; // L: 460 + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 461 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 462 } - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 470 - if (var10 == 1.0F) { // L: 471 - this.sprite.method8198(var13, var14, 192); // L: 472 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 464 + if (1.0F == var10) { // L: 465 + this.sprite.method8097(var13, var14, 192); // L: 466 } else { - this.sprite.method8242(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 475 + this.sprite.method8100(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 469 } } - } // L: 478 + } // L: 472 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "239687024" + garbageValue = "-1493873382" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { // L: 481 - if (!this.worldMapManager.isLoaded()) { // L: 484 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 485 - if (!this.worldMapManager.isLoaded()) { // L: 486 - return; // L: 487 + if (this.cacheLoader.isLoaded()) { // L: 475 + if (!this.worldMapManager.isLoaded()) { // L: 478 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 479 + if (!this.worldMapManager.isLoaded()) { // L: 480 + return; // L: 481 } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 490 + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 484 } - } // L: 482 491 + } // L: 476 485 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-248546686" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); // L: 494 - } // L: 495 + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488 + } // L: 489 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "-552636091" + garbageValue = "-1103182749" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { - byte var6 = 20; // L: 498 - int var7 = var3 / 2 + var1; // L: 499 - int var8 = var4 / 2 + var2 - 18 - var6; // L: 500 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 501 - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 502 - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 503 - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 504 - } // L: 505 + byte var6 = 20; // L: 492 + int var7 = var3 / 2 + var1; // L: 493 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 494 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 495 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 496 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 497 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 498 + } // L: 499 - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)F", - garbageValue = "1" + descriptor = "(II)F", + garbageValue = "302307911" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 508 + if (var1 == 25) { // L: 502 return 1.0F; - } else if (var1 == 37) { // L: 509 + } else if (var1 == 37) { // L: 503 return 1.5F; - } else if (var1 == 50) { // L: 510 + } else if (var1 == 50) { // L: 504 return 2.0F; - } else if (var1 == 75) { // L: 511 + } else if (var1 == 75) { // L: 505 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 512 513 + return var1 == 100 ? 4.0F : 8.0F; // L: 506 507 } } - @ObfuscatedName("ac") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1559529721" + garbageValue = "1321436394" ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { // L: 517 + if (1.0D == (double)this.zoomTarget) { // L: 511 return 25; - } else if (1.5D == (double)this.zoomTarget) { // L: 518 + } else if ((double)this.zoomTarget == 1.5D) { // L: 512 return 37; - } else if ((double)this.zoomTarget == 2.0D) { // L: 519 + } else if (2.0D == (double)this.zoomTarget) { // L: 513 return 50; - } else if ((double)this.zoomTarget == 3.0D) { - return 75; // L: 520 + } else if (3.0D == (double)this.zoomTarget) { // L: 514 + return 75; } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 521 522 + return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 515 516 } } - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1909569492" + garbageValue = "-901314878" ) @Export("loadCache") public void loadCache() { - this.cacheLoader.load(); // L: 526 - } // L: 527 + this.cacheLoader.load(); // L: 520 + } // L: 521 - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "71230720" + descriptor = "(B)Z", + garbageValue = "-34" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); // L: 530 + return this.cacheLoader.isLoaded(); // L: 524 } - @ObfuscatedName("au") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II)Lhw;", - garbageValue = "-1379309819" + descriptor = "(IB)Lgu;", + garbageValue = "49" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); // L: 534 + Iterator var2 = this.details.values().iterator(); // L: 528 WorldMapArea var3; do { if (!var2.hasNext()) { - return null; // L: 542 + return null; // L: 536 } - var3 = (WorldMapArea)var2.next(); // L: 535 - } while(var3.getId() != var1); // L: 537 + var3 = (WorldMapArea)var2.next(); // L: 529 + } while(var3.getId() != var1); // L: 531 - return var3; // L: 538 + return var3; // L: 532 + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "67863709" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 540 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 543 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 544 + } + } // L: 541 545 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-264358279" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 548 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 551 + this.worldMapTargetX = -1; // L: 552 + this.worldMapTargetY = -1; // L: 553 + } + } // L: 549 554 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "110" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 557 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 560 + if (var4 != null) { // L: 561 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 562 + } + + } + } // L: 558 564 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "49" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 567 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 570 + if (var4 != null) { // L: 571 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 572 + } + + } + } // L: 568 574 + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "658592896" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580 } @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-33" - ) - @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 546 - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 549 - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 550 - } - } // L: 547 551 - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1498726313" - ) - @Export("setWorldMapPositionTargetInstant") - public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { // L: 554 - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 557 - this.worldMapTargetX = -1; // L: 558 - this.worldMapTargetY = -1; // L: 559 - } - } // L: 555 560 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-648258167" - ) - @Export("jumpToSourceCoord") - public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 563 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 566 - if (var4 != null) { // L: 567 - this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 568 - } - - } - } // L: 564 570 - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1321495201" - ) - @Export("jumpToSourceCoordInstant") - public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 573 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 576 - if (var4 != null) { // L: 577 - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 578 - } - - } - } // L: 574 580 - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-637373299" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 583 584 586 - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-565015812" + descriptor = "(B)I", + garbageValue = "31" ) @Export("getDisplayY") public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 590 591 593 + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587 } - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(I)Lko;", - garbageValue = "-505137213" - ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 597 598 600 - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-275514917" - ) - @Export("getDisplayWith") - public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 604 - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" - ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 608 - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "996304193" - ) - @Export("setMaxFlashCount") - public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 612 - this.maxFlashCount = var1; // L: 613 - } - - } // L: 615 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "52" - ) - @Export("resetMaxFlashCount") - public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 618 - } // L: 619 - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1101317331" - ) - @Export("setCyclesPerFlash") - public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 622 - this.cyclesPerFlash = var1; // L: 623 - } - - } // L: 625 - @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-30" + descriptor = "(S)Lks;", + garbageValue = "-9331" ) - @Export("resetCyclesPerFlash") - public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; // L: 628 - } // L: 629 + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594 + } - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "2136197333" + descriptor = "(B)I", + garbageValue = "117" ) - @Export("setPerpetualFlash") - public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; // L: 632 - } // L: 633 - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1705535166" - ) - @Export("flashElement") - public void flashElement(int var1) { - this.flashingElements = new HashSet(); // L: 636 - this.flashingElements.add(var1); // L: 637 - this.flashCount = 0; // L: 638 - this.flashCycle = 0; // L: 639 - } // L: 640 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2124527614" - ) - @Export("flashCategory") - public void flashCategory(int var1) { - this.flashingElements = new HashSet(); // L: 643 - this.flashCount = 0; // L: 644 - this.flashCycle = 0; // L: 645 - - for (int var2 = 0; var2 < class132.WorldMapElement_count; ++var2) { // L: 646 - if (class19.WorldMapElement_get(var2) != null && class19.WorldMapElement_get(var2).category == var1) { // L: 647 650 - this.flashingElements.add(class19.WorldMapElement_get(var2).objectId); // L: 651 - } - } - - } // L: 654 - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "591336020" - ) - @Export("stopCurrentFlashes") - public void stopCurrentFlashes() { - this.flashingElements = null; // L: 657 - } // L: 658 - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-73" - ) - @Export("setElementsDisabled") - public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; // L: 661 - } // L: 662 + @Export("getDisplayWith") + public int getDisplayWith() { + return this.worldMapDisplayWidth; // L: 598 + } @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-1468812142" + descriptor = "(I)I", + garbageValue = "1319666044" ) - @Export("disableElement") - public void disableElement(int var1, boolean var2) { - if (!var2) { // L: 665 - this.enabledElements.add(var1); // L: 666 - } else { - this.enabledElements.remove(var1); // L: 669 + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; // L: 602 + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2054976977" + ) + @Export("setMaxFlashCount") + public void setMaxFlashCount(int var1) { + if (var1 >= 1) { // L: 606 + this.maxFlashCount = var1; // L: 607 } - this.method7354(); // L: 671 - } // L: 672 + } // L: 609 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-11" + ) + @Export("resetMaxFlashCount") + public void resetMaxFlashCount() { + this.maxFlashCount = 3; // L: 612 + } // L: 613 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2006252469" + ) + @Export("setCyclesPerFlash") + public void setCyclesPerFlash(int var1) { + if (var1 >= 1) { // L: 616 + this.cyclesPerFlash = var1; // L: 617 + } + + } // L: 619 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "102" + ) + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; // L: 622 + } // L: 623 @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-565959186" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; // L: 626 + } // L: 627 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1042147237" + ) + @Export("flashElement") + public void flashElement(int var1) { + this.flashingElements = new HashSet(); // L: 630 + this.flashingElements.add(var1); // L: 631 + this.flashCount = 0; // L: 632 + this.flashCycle = 0; // L: 633 + } // L: 634 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-121" + ) + @Export("flashCategory") + public void flashCategory(int var1) { + this.flashingElements = new HashSet(); // L: 637 + this.flashCount = 0; // L: 638 + this.flashCycle = 0; // L: 639 + + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 640 + if (UserComparator7.WorldMapElement_get(var2) != null && UserComparator7.WorldMapElement_get(var2).category == var1) { // L: 641 644 + this.flashingElements.add(UserComparator7.WorldMapElement_get(var2).objectId); // L: 645 + } + } + + } // L: 648 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-353719726" + ) + @Export("stopCurrentFlashes") + public void stopCurrentFlashes() { + this.flashingElements = null; // L: 651 + } // L: 652 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1639336490" + ) + @Export("setElementsDisabled") + public void setElementsDisabled(boolean var1) { + this.elementsDisabled = !var1; // L: 655 + } // L: 656 + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "-1018816964" + ) + @Export("disableElement") + public void disableElement(int var1, boolean var2) { + if (!var2) { // L: 659 + this.enabledElements.add(var1); // L: 660 + } else { + this.enabledElements.remove(var1); // L: 663 + } + + this.method7396(); // L: 665 + } // L: 666 + + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "83" + garbageValue = "91" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 675 - this.enabledCategories.add(var1); // L: 676 + if (!var2) { // L: 669 + this.enabledCategories.add(var1); // L: 670 } else { - this.enabledCategories.remove(var1); // L: 679 + this.enabledCategories.remove(var1); // L: 673 } - for (int var3 = 0; var3 < class132.WorldMapElement_count; ++var3) { // L: 681 - if (class19.WorldMapElement_get(var3) != null && class19.WorldMapElement_get(var3).category == var1) { // L: 682 685 - int var4 = class19.WorldMapElement_get(var3).objectId; // L: 686 - if (!var2) { // L: 687 - this.enabledElementIds.add(var4); // L: 688 + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 675 + if (UserComparator7.WorldMapElement_get(var3) != null && UserComparator7.WorldMapElement_get(var3).category == var1) { // L: 676 679 + int var4 = UserComparator7.WorldMapElement_get(var3).objectId; // L: 680 + if (!var2) { // L: 681 + this.enabledElementIds.add(var4); // L: 682 } else { - this.enabledElementIds.remove(var4); // L: 691 + this.enabledElementIds.remove(var4); // L: 685 } } } - this.method7354(); // L: 695 - } // L: 696 + this.method7396(); // L: 689 + } // L: 690 - @ObfuscatedName("ap") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "197493966" + descriptor = "(B)Z", + garbageValue = "42" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 699 + return !this.elementsDisabled; // L: 693 } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "2134196249" + descriptor = "(IB)Z", + garbageValue = "-10" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 703 + return !this.enabledElements.contains(var1); // L: 697 } - @ObfuscatedName("bk") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "-62" + garbageValue = "126" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 707 + return !this.enabledCategories.contains(var1); // L: 701 } - @ObfuscatedName("bz") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "913012823" + garbageValue = "1947147586" ) - void method7354() { - this.field4507.clear(); // L: 711 - this.field4507.addAll(this.enabledElements); // L: 712 - this.field4507.addAll(this.enabledElementIds); // L: 713 - } // L: 714 + void method7396() { + this.field4500.clear(); // L: 705 + this.field4500.addAll(this.enabledElements); // L: 706 + this.field4500.addAll(this.enabledElementIds); // L: 707 + } // L: 708 - @ObfuscatedName("bl") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1822071374" + garbageValue = "-1996855172" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { // L: 717 - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 720 - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 721 - List var9 = this.worldMapManager.method4806(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 722 - if (!var9.isEmpty()) { // L: 723 + if (this.cacheLoader.isLoaded()) { // L: 711 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 714 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 715 + List var9 = this.worldMapManager.method4186(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 716 + if (!var9.isEmpty()) { // L: 717 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 726 - return; // L: 742 + if (!var10.hasNext()) { // L: 720 + return; // L: 736 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 727 - WorldMapElement var12 = class19.WorldMapElement_get(var11.getElement()); // L: 729 - var13 = false; // L: 730 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 721 + WorldMapElement var12 = UserComparator7.WorldMapElement_get(var11.getElement()); // L: 723 + var13 = false; // L: 724 - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 731 - if (var12.menuActions[var14] != null) { // L: 732 - SecureRandomFuture.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 733 - var13 = true; // L: 734 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 725 + if (var12.menuActions[var14] != null) { // L: 726 + class21.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727 + var13 = true; // L: 728 } } - } while(!var13); // L: 737 + } while(!var13); // L: 731 } } - } // L: 718 724 738 + } // L: 712 718 732 - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(ILko;I)Lko;", - garbageValue = "-733665636" + descriptor = "(ILks;I)Lks;", + garbageValue = "-267672290" ) - public Coord method7342(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { // L: 745 + public Coord method7269(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 739 + return null; // L: 740 + } else if (!this.worldMapManager.isLoaded()) { // L: 742 + return null; // L: 743 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 745 return null; // L: 746 - } else if (!this.worldMapManager.isLoaded()) { // L: 748 - return null; // L: 749 - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 751 - return null; // L: 752 } else { - HashMap var3 = this.worldMapManager.buildIcons(); // L: 754 - List var4 = (List)var3.get(var1); // L: 755 - if (var4 != null && !var4.isEmpty()) { // L: 756 - AbstractWorldMapIcon var5 = null; // L: 759 - int var6 = -1; // L: 760 - Iterator var7 = var4.iterator(); // L: 761 + HashMap var3 = this.worldMapManager.buildIcons(); // L: 748 + List var4 = (List)var3.get(var1); // L: 749 + if (var4 != null && !var4.isEmpty()) { // L: 750 + AbstractWorldMapIcon var5 = null; // L: 753 + int var6 = -1; // L: 754 + Iterator var7 = var4.iterator(); // L: 755 while (true) { AbstractWorldMapIcon var8; int var11; do { - if (!var7.hasNext()) { // L: 775 - return var5.coord2; // L: 776 + if (!var7.hasNext()) { + return var5.coord2; // L: 770 } - var8 = (AbstractWorldMapIcon)var7.next(); // L: 762 - int var9 = var8.coord2.x - var2.x; // L: 764 - int var10 = var8.coord2.y - var2.y; // L: 765 - var11 = var10 * var10 + var9 * var9; // L: 766 - if (var11 == 0) { // L: 767 - return var8.coord2; // L: 768 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 756 + int var9 = var8.coord2.x - var2.x; // L: 758 + int var10 = var8.coord2.y - var2.y; // L: 759 + var11 = var10 * var10 + var9 * var9; // L: 760 + if (var11 == 0) { // L: 761 + return var8.coord2; // L: 762 } - } while(var11 >= var6 && var5 != null); // L: 770 + } while(var11 >= var6 && var5 != null); // L: 764 - var5 = var8; // L: 771 - var6 = var11; // L: 772 + var5 = var8; // L: 765 + var6 = var11; // L: 766 } } else { - return null; // L: 757 + return null; // L: 751 } } } - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IILko;Lko;S)V", - garbageValue = "-2529" + descriptor = "(IILks;Lks;B)V", + garbageValue = "-98" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); // L: 780 - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 781 - var5.setArgs(new Object[]{var6}); // L: 782 - switch(var1) { // L: 783 + ScriptEvent var5 = new ScriptEvent(); // L: 774 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 775 + var5.setArgs(new Object[]{var6}); // L: 776 + switch(var1) { // L: 777 case 1008: - var5.setType(10); // L: 786 + var5.setType(10); // L: 800 break; case 1009: - var5.setType(11); // L: 801 - break; // L: 802 + var5.setType(11); // L: 780 + break; case 1010: - var5.setType(12); // L: 791 - break; // L: 792 + var5.setType(12); // L: 790 + break; case 1011: - var5.setType(13); // L: 796 - break; // L: 797 + var5.setType(13); // L: 785 + break; // L: 786 case 1012: - var5.setType(14); // L: 806 + var5.setType(14); // L: 795 } - class1.runScriptEvent(var5); // L: 810 - } // L: 811 + ClanSettings.runScriptEvent(var5); // L: 804 + } // L: 805 - @ObfuscatedName("ba") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(I)Lic;", - garbageValue = "-1289438305" + descriptor = "(I)Lhq;", + garbageValue = "885482314" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 814 - return null; // L: 815 - } else if (!this.worldMapManager.isLoaded()) { // L: 817 - return null; // L: 818 + if (!this.cacheLoader.isLoaded()) { // L: 808 + return null; // L: 809 + } else if (!this.worldMapManager.isLoaded()) { // L: 811 + return null; // L: 812 } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 820 - this.field4519 = new LinkedList(); // L: 821 - Iterator var2 = var1.values().iterator(); // L: 822 + HashMap var1 = this.worldMapManager.buildIcons(); // L: 814 + this.field4468 = new LinkedList(); // L: 815 + Iterator var2 = var1.values().iterator(); // L: 816 while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 823 - this.field4519.addAll(var3); // L: 825 + List var3 = (List)var2.next(); // L: 817 + this.field4468.addAll(var3); // L: 819 } - this.iconIterator = this.field4519.iterator(); // L: 828 - return this.iconNext(); // L: 829 + this.iconIterator = this.field4468.iterator(); // L: 822 + return this.iconNext(); // L: 823 } } - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(B)Lic;", - garbageValue = "20" + descriptor = "(I)Lhq;", + garbageValue = "581290708" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 833 - return null; // L: 834 + if (this.iconIterator == null) { // L: 827 + return null; // L: 828 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 836 - return null; // L: 842 + if (!this.iconIterator.hasNext()) { // L: 830 + return null; // L: 836 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 837 - } while(var1.getElement() == -1); // L: 838 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 831 + } while(var1.getElement() == -1); // L: 832 - return var1; // L: 839 + return var1; // L: 833 } } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index db1291a1a7..112eb2ea62 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") +@ObfuscatedName("oo") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("l") + @ObfuscatedName("am") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("b") @Export("cacheName") String cacheName; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1032853053 + intValue = -1677535767 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Llq;)V" + descriptor = "(Lln;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -37,8 +40,8 @@ public class WorldMapArchiveLoader { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "31" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "36138809" ) @Export("reset") void reset(String var1) { @@ -52,15 +55,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1161037724" + garbageValue = "1816632619" ) @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2847.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2414.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -68,7 +71,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field2846.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2846.name, this.cacheName)) { // L: 41 42 + if (this.archive.isValidFileName(WorldMapCacheName.field2418.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2418.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -76,7 +79,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2850.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2417.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -87,20 +90,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2001859589" + descriptor = "(S)Z", + garbageValue = "4676" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-788311036" + garbageValue = "-1760303453" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 77aecccbf6..28eea60970 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.IOException; import java.util.Iterator; import java.util.LinkedList; import net.runelite.mapping.Export; @@ -6,67 +8,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("gu") @Implements("WorldMapArea") public class WorldMapArea { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1768774525 + intValue = 1619651077 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("internalName") String internalName; - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("externalName") String externalName; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 204385687 + intValue = -988816927 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 187513979 + intValue = 865751719 ) @Export("zoom") int zoom; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lks;" ) @Export("origin") Coord origin; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 892660861 + intValue = -1477331149 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 819856267 + intValue = -194565457 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1961417227 + intValue = -1241290265 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -439163167 + intValue = 702405047 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("isMain") boolean isMain; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("sections") LinkedList sections; @@ -84,8 +86,8 @@ public class WorldMapArea { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-1643256237" + descriptor = "(Lpi;IB)V", + garbageValue = "61" ) @Export("read") public void read(Buffer var1, int var2) { @@ -97,51 +99,51 @@ public class WorldMapArea { var1.readUnsignedByte(); // L: 28 this.isMain = var1.readUnsignedByte() == 1; // L: 29 this.zoom = var1.readUnsignedByte(); // L: 30 - int var3 = var1.readUnsignedByte(); - this.sections = new LinkedList(); + int var3 = var1.readUnsignedByte(); // L: 31 + this.sections = new LinkedList(); // L: 32 - for (int var4 = 0; var4 < var3; ++var4) { - this.sections.add(this.readWorldMapSection(var1)); + for (int var4 = 0; var4 < var3; ++var4) { // L: 33 + this.sections.add(this.readWorldMapSection(var1)); // L: 34 } - this.setBounds(); - } + this.setBounds(); // L: 36 + } // L: 37 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;B)Lik;", - garbageValue = "-51" + descriptor = "(Lpi;I)Lhs;", + garbageValue = "-156804208" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)ChatChannel.findEnumerated(WorldMapSectionType.method4949(), var2); - Object var4 = null; - switch(var3.type) { + int var2 = var1.readUnsignedByte(); // L: 40 + WorldMapSectionType var3 = (WorldMapSectionType)MusicPatchPcmStream.findEnumerated(WorldMapSectionType.method4305(), var2); // L: 41 + Object var4 = null; // L: 42 + switch(var3.type) { // L: 43 case 0: - var4 = new class229(); - break; + var4 = new class204(); // L: 48 + break; // L: 49 case 1: - var4 = new WorldMapSection0(); // L: 50 - break; + var4 = new WorldMapSection0(); // L: 51 + break; // L: 52 case 2: - var4 = new WorldMapSection2(); // L: 56 + var4 = new WorldMapSection1(); // L: 45 break; case 3: - var4 = new WorldMapSection1(); // L: 53 - break; // L: 54 + var4 = new WorldMapSection2(); // L: 54 + break; // L: 55 default: - throw new IllegalStateException(""); // L: 48 + throw new IllegalStateException(""); // L: 57 } ((WorldMapSection)var4).read(var1); // L: 59 return (WorldMapSection)var4; // L: 60 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-79" + descriptor = "(IIII)Z", + garbageValue = "-1632482006" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -159,10 +161,10 @@ public class WorldMapArea { return true; // L: 68 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-77" + descriptor = "(III)Z", + garbageValue = "87299869" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -190,10 +192,10 @@ public class WorldMapArea { } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-25" + descriptor = "(IIII)[I", + garbageValue = "1977712276" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -213,8 +215,8 @@ public class WorldMapArea { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)Lko;", - garbageValue = "-2002328673" + descriptor = "(IIB)Lks;", + garbageValue = "32" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -232,10 +234,10 @@ public class WorldMapArea { return var4.coord(var1, var2); // L: 108 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-963481641" + garbageValue = "-1245875017" ) @Export("setBounds") void setBounds() { @@ -248,170 +250,332 @@ public class WorldMapArea { } // L: 122 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "128" + descriptor = "(I)I", + garbageValue = "-1605690613" ) @Export("getId") public int getId() { - return this.id; // L: 125 + return this.id; } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "856188829" + garbageValue = "-616797466" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; // L: 129 } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1814116650" + garbageValue = "2076460427" ) @Export("getInternalName") public String getInternalName() { - return this.internalName; // L: 133 + return this.internalName; } - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "107" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "-14972" ) @Export("getExternalName") public String getExternalName() { return this.externalName; // L: 137 } - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2041021120" - ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; // L: 141 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-35714966" - ) - @Export("getZoom") - public int getZoom() { - return this.zoom; // L: 145 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1069945240" - ) - @Export("getRegionLowX") - public int getRegionLowX() { - return this.regionLowX; // L: 149 - } - @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1823486423" + garbageValue = "1206801353" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1480409778" + ) + @Export("getZoom") + public int getZoom() { + return this.zoom; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "32" + ) + @Export("getRegionLowX") + public int getRegionLowX() { + return this.regionLowX; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-916655253" ) @Export("getRegionHighX") public int getRegionHighX() { - return this.regionHighX; // L: 153 + return this.regionHighX; } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1605388793" + garbageValue = "-1639961591" ) @Export("getRegionLowY") public int getRegionLowY() { - return this.regionLowY; // L: 157 + return this.regionLowY; } - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1164673789" + garbageValue = "-1377567233" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; // L: 161 } - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "480137512" + garbageValue = "-2107638017" ) @Export("getOriginX") public int getOriginX() { - return this.origin.x; // L: 165 + return this.origin.x; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "622710860" + ) + @Export("getOriginPlane") + public int getOriginPlane() { + return this.origin.plane; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-27476" + ) + @Export("getOriginY") + public int getOriginY() { + return this.origin.y; } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1377230464" - ) - @Export("getOriginPlane") - public int getOriginPlane() { - return this.origin.plane; // L: 169 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-27" - ) - @Export("getOriginY") - public int getOriginY() { - return this.origin.y; // L: 173 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Lko;", - garbageValue = "-1856274219" + descriptor = "(I)Lks;", + garbageValue = "2133331168" ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); // L: 177 + return new Coord(this.origin); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "1973093508" + ) + static File method4036(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; // L: 123 + class28.JagexCache_locationFile = new File(NetSocket.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 124 + String var4 = null; // L: 125 + String var5 = null; // L: 126 + boolean var6 = false; // L: 127 + File var22; + if (class28.JagexCache_locationFile.exists()) { // L: 128 + try { + AccessFile var7 = new AccessFile(class28.JagexCache_locationFile, "rw", 10000L); // L: 131 + + Buffer var8; + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 132 133 136 + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 134 + if (var9 == -1) { // L: 135 + throw new IOException(); + } + } + + var8.offset = 0; // L: 138 + var9 = var8.readUnsignedByte(); // L: 139 + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); // L: 140 + } + + int var10 = 0; // L: 141 + if (var9 > 1) { // L: 142 + var10 = var8.readUnsignedByte(); + } + + if (var9 <= 2) { // L: 143 + var4 = var8.readStringCp1252NullCircumfixed(); // L: 144 + if (var10 == 1) { // L: 145 + var5 = var8.readStringCp1252NullCircumfixed(); + } + } else { + var4 = var8.readCESU8(); // L: 148 + if (var10 == 1) { // L: 149 + var5 = var8.readCESU8(); + } + } + + var7.close(); // L: 151 + } catch (IOException var20) { // L: 153 + var20.printStackTrace(); // L: 154 + } + + if (var4 != null) { // L: 156 + var22 = new File(var4); // L: 157 + if (!var22.exists()) { // L: 158 + var4 = null; // L: 159 + } + } + + if (var4 != null) { // L: 162 + var22 = new File(var4, "test.dat"); // L: 163 + if (!AbstractWorldMapIcon.method4405(var22, true)) { // L: 164 + var4 = null; // L: 165 + } + } + } + + if (var4 == null && var2 == 0) { // L: 169 + label125: + for (int var15 = 0; var15 < class216.cacheSubPaths.length; ++var15) { // L: 170 + for (int var16 = 0; var16 < ItemContainer.cacheParentPaths.length; ++var16) { // L: 171 + File var17 = new File(ItemContainer.cacheParentPaths[var16] + class216.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 172 + if (var17.exists() && AbstractWorldMapIcon.method4405(new File(var17, "test.dat"), true)) { // L: 173 174 + var4 = var17.toString(); // L: 175 + var6 = true; // L: 176 + break label125; // L: 177 + } + } + } + } + + if (var4 == null) { // L: 183 + var4 = NetSocket.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 184 + var6 = true; // L: 185 + } + + if (var5 != null) { // L: 187 + File var21 = new File(var5); // L: 188 + var22 = new File(var4); // L: 189 + + try { + File[] var23 = var21.listFiles(); // L: 191 + File[] var18 = var23; // L: 193 + + for (int var11 = 0; var11 < var18.length; ++var11) { // L: 194 + File var12 = var18[var11]; + File var13 = new File(var22, var12.getName()); + boolean var14 = var12.renameTo(var13); + if (!var14) { + throw new IOException(); + } + } + } catch (Exception var19) { + var19.printStackTrace(); + } + + var6 = true; + } + + if (var6) { + class16.method194(new File(var4), (File)null); + } + + return new File(var4); } @ObfuscatedName("o") - public static String method4648(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31 - if (0L == var0 % 37L) { // L: 32 - return null; - } else { - int var2 = 0; // L: 33 + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1294916560" + ) + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 195 + var1.offset = var0.length - 2; // L: 196 + class451.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 197 + class451.SpriteBuffer_xOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 198 + class271.SpriteBuffer_yOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 199 + class451.SpriteBuffer_spriteWidths = new int[class451.SpriteBuffer_spriteCount]; // L: 200 + class451.SpriteBuffer_spriteHeights = new int[class451.SpriteBuffer_spriteCount]; // L: 201 + FriendLoginUpdate.SpriteBuffer_pixels = new byte[class451.SpriteBuffer_spriteCount][]; // L: 202 + var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8; // L: 203 + class451.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 204 + class451.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 205 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 206 - for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 34 35 37 - ++var2; // L: 36 - } - - StringBuilder var5 = new StringBuilder(var2); // L: 39 - - while (var0 != 0L) { // L: 40 - long var6 = var0; // L: 41 - var0 /= 37L; // L: 42 - var5.append(class349.base37Table[(int)(var6 - 37L * var0)]); // L: 43 - } - - return var5.reverse().toString(); // L: 45 - } - } else { - return null; + int var3; + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 207 + class451.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - } + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 208 + class271.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 209 + class451.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 210 + class451.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 211 + NetFileRequest.SpriteBuffer_spritePalette = new int[var2]; // L: 212 + + for (var3 = 1; var3 < var2; ++var3) { // L: 213 + NetFileRequest.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 214 + if (NetFileRequest.SpriteBuffer_spritePalette[var3] == 0) { // L: 215 + NetFileRequest.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 217 + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 218 + int var4 = class451.SpriteBuffer_spriteWidths[var3]; // L: 219 + int var5 = class451.SpriteBuffer_spriteHeights[var3]; // L: 220 + int var6 = var4 * var5; // L: 221 + byte[] var7 = new byte[var6]; // L: 222 + FriendLoginUpdate.SpriteBuffer_pixels[var3] = var7; // L: 223 + int var8 = var1.readUnsignedByte(); // L: 224 + int var9; + if (var8 == 0) { // L: 225 + for (var9 = 0; var9 < var6; ++var9) { // L: 226 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 228 + for (var9 = 0; var9 < var4; ++var9) { // L: 229 + for (int var10 = 0; var10 < var5; ++var10) { // L: 230 + var7[var9 + var10 * var4] = var1.readByte(); // L: 231 + } + } + } + } + + } // L: 236 } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index ce2eae340a..6739a4a2cd 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.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.HashSet; import java.util.LinkedList; import java.util.List; @@ -14,28 +5,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("io") +@ObfuscatedName("hi") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("cn") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(Lpd;Lpd;IZI)V", - garbageValue = "-578931105" + descriptor = "(Lpi;Lpi;IZB)V", + garbageValue = "0" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -49,312 +39,49 @@ public class WorldMapAreaData extends WorldMapArea { try { var7.init(var2); // L: 23 - } catch (IllegalStateException var12) { - continue; + } catch (IllegalStateException var12) { // L: 25 + continue; // L: 26 } - this.worldMapData0Set.add(var7); + this.worldMapData0Set.add(var7); // L: 28 } - var6 = var2.readUnsignedShort(); - this.worldMapData1Set = new HashSet(var6); + var6 = var2.readUnsignedShort(); // L: 30 + this.worldMapData1Set = new HashSet(var6); // L: 31 for (int var10 = 0; var10 < var6; ++var10) { // L: 32 WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 try { - var8.init(var2); - } catch (IllegalStateException var11) { - continue; + var8.init(var2); // L: 35 + } catch (IllegalStateException var11) { // L: 37 + continue; // L: 38 } - this.worldMapData1Set.add(var8); + this.worldMapData1Set.add(var8); // L: 40 } - this.initIconsList(var2, var4); - } + this.initIconsList(var2, var4); // L: 42 + } // L: 43 - @ObfuscatedName("cp") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(Lpd;ZB)V", - garbageValue = "110" + descriptor = "(Lpi;ZI)V", + garbageValue = "-313386834" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { this.iconList = new LinkedList(); // L: 46 - int var3 = var1.readUnsignedShort(); + int var3 = var1.readUnsignedShort(); // L: 47 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method7742(); - Coord var6 = new Coord(var1.readInt()); - boolean var7 = var1.readUnsignedByte() == 1; + for (int var4 = 0; var4 < var3; ++var4) { // L: 48 + int var5 = var1.method7692(); // L: 49 + Coord var6 = new Coord(var1.readInt()); // L: 50 + boolean var7 = var1.readUnsignedByte() == 1; // L: 51 if (var2 || !var7) { // L: 52 - this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); + this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 } } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpy;I)V", - garbageValue = "736636997" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 25 - if (var1 != null) { // L: 26 - int var2 = var0.offset; // L: 27 - var0.writeInt(var1.id); // L: 28 - - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 29 - if (var1.creationErrors[var3] != 0) { // L: 30 - var0.writeByte(var1.creationErrors[var3]); // L: 31 - } else { - try { - int var4 = var1.operations[var3]; // L: 35 - Field var5; - int var6; - if (var4 == 0) { // L: 36 - var5 = var1.fields[var3]; // L: 37 - var6 = Reflection.getInt(var5, (Object)null); // L: 38 - var0.writeByte(0); // L: 39 - var0.writeInt(var6); // L: 40 - } else if (var4 == 1) { // L: 42 - var5 = var1.fields[var3]; // L: 43 - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 44 - var0.writeByte(0); // L: 45 - } else if (var4 == 2) { // L: 47 - var5 = var1.fields[var3]; // L: 48 - var6 = var5.getModifiers(); // L: 49 - var0.writeByte(0); // L: 50 - var0.writeInt(var6); // L: 51 - } - - Method var25; - if (var4 != 3) { // L: 53 - if (var4 == 4) { // L: 73 - var25 = var1.methods[var3]; // L: 74 - var6 = var25.getModifiers(); // L: 75 - var0.writeByte(0); // L: 76 - var0.writeInt(var6); // L: 77 - } - } else { - var25 = var1.methods[var3]; // L: 54 - byte[][] var10 = var1.arguments[var3]; // L: 55 - Object[] var7 = new Object[var10.length]; // L: 56 - - for (int var8 = 0; var8 < var10.length; ++var8) { // L: 57 - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 58 - var7[var8] = var9.readObject(); // L: 59 - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 61 - if (var11 == null) { // L: 62 - var0.writeByte(0); - } else if (var11 instanceof Number) { // L: 63 - var0.writeByte(1); // L: 64 - var0.writeLong(((Number)var11).longValue()); // L: 65 - } else if (var11 instanceof String) { // L: 67 - var0.writeByte(2); // L: 68 - var0.writeStringCp1252NullTerminated((String)var11); // L: 69 - } else { - var0.writeByte(4); // L: 71 - } - } - } catch (ClassNotFoundException var13) { // L: 80 - var0.writeByte(-10); // L: 81 - } catch (InvalidClassException var14) { // L: 83 - var0.writeByte(-11); // L: 84 - } catch (StreamCorruptedException var15) { // L: 86 - var0.writeByte(-12); // L: 87 - } catch (OptionalDataException var16) { // L: 89 - var0.writeByte(-13); // L: 90 - } catch (IllegalAccessException var17) { // L: 92 - var0.writeByte(-14); // L: 93 - } catch (IllegalArgumentException var18) { // L: 95 - var0.writeByte(-15); // L: 96 - } catch (InvocationTargetException var19) { // L: 98 - var0.writeByte(-16); // L: 99 - } catch (SecurityException var20) { // L: 101 - var0.writeByte(-17); // L: 102 - } catch (IOException var21) { // L: 104 - var0.writeByte(-18); // L: 105 - } catch (NullPointerException var22) { // L: 107 - var0.writeByte(-19); // L: 108 - } catch (Exception var23) { // L: 110 - var0.writeByte(-20); // L: 111 - } catch (Throwable var24) { // L: 113 - var0.writeByte(-21); // L: 114 - } - } - } - - var0.writeCrc(var2); // L: 117 - var1.remove(); // L: 118 - } - } // L: 119 - - @ObfuscatedName("je") - @ObfuscatedSignature( - descriptor = "(Lkn;II)I", - garbageValue = "781537863" - ) - static final int method5086(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10294 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 10296 - int var3 = 0; // L: 10297 - int var4 = 0; // L: 10298 - byte var5 = 0; // L: 10299 - - while (true) { - int var6 = var2[var4++]; // L: 10301 - int var7 = 0; // L: 10302 - byte var8 = 0; // L: 10303 - if (var6 == 0) { // L: 10304 - return var3; - } - - if (var6 == 1) { // L: 10305 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 10306 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 10307 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 10308 - var9 = var2[var4++] << 16; // L: 10309 - var9 += var2[var4++]; // L: 10310 - var10 = HorizontalAlignment.getWidget(var9); // L: 10311 - var11 = var2[var4++]; // L: 10312 - if (var11 != -1 && (!class67.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10313 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10314 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10315 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 10319 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 10320 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 10321 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 10322 - var7 = class19.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 10323 - for (var9 = 0; var9 < 25; ++var9) { // L: 10324 - if (Skills.Skills_enabled[var9]) { // L: 10325 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 10328 - var9 = var2[var4++] << 16; // L: 10329 - var9 += var2[var4++]; // L: 10330 - var10 = HorizontalAlignment.getWidget(var9); // L: 10331 - var11 = var2[var4++]; // L: 10332 - if (var11 != -1 && (!class67.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10333 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10334 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10335 - var7 = 999999999; // L: 10336 - break; // L: 10337 - } - } - } - } - - if (var6 == 11) { // L: 10342 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 10343 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 10344 - var9 = Varps.Varps_main[var2[var4++]]; // L: 10345 - int var13 = var2[var4++]; // L: 10346 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10347 - } - - if (var6 == 14) { // L: 10349 - var9 = var2[var4++]; // L: 10350 - var7 = WorldMapRegion.getVarbit(var9); // L: 10351 - } - - if (var6 == 15) { // L: 10353 - var8 = 1; - } - - if (var6 == 16) { // L: 10354 - var8 = 2; - } - - if (var6 == 17) { // L: 10355 - var8 = 3; - } - - if (var6 == 18) { // L: 10356 - var7 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; - } - - if (var6 == 19) { // L: 10357 - var7 = (class19.localPlayer.y >> 7) + class250.baseY; - } - - if (var6 == 20) { // L: 10358 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 10359 - if (var5 == 0) { // L: 10360 - var3 += var7; - } - - if (var5 == 1) { // L: 10361 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 10362 - var3 /= var7; - } - - if (var5 == 3) { // L: 10363 - var3 *= var7; - } - - var5 = 0; // L: 10364 - } else { - var5 = var8; // L: 10366 - } - } - } catch (Exception var14) { // L: 10369 - return -1; // L: 10370 - } - } else { - return -2; - } - } + } // L: 56 } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 3a9d7de382..c5c55b08a6 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -3,179 +3,47 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("hw") @Implements("WorldMapCacheName") public class WorldMapCacheName { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lhw;" ) - public static final WorldMapCacheName field2849; - @ObfuscatedName("o") + public static final WorldMapCacheName field2413; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lhw;" ) - public static final WorldMapCacheName field2847; - @ObfuscatedName("h") + public static final WorldMapCacheName field2414; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lhw;" ) - public static final WorldMapCacheName field2846; - @ObfuscatedName("g") + public static final WorldMapCacheName field2418; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lhw;" ) - static final WorldMapCacheName field2852; - @ObfuscatedName("l") + static final WorldMapCacheName field2419; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lhw;" ) - public static final WorldMapCacheName field2850; + public static final WorldMapCacheName field2417; @ObfuscatedName("n") @Export("name") public final String name; static { - field2849 = new WorldMapCacheName("details"); // L: 4 - field2847 = new WorldMapCacheName("compositemap"); // L: 5 - field2846 = new WorldMapCacheName("compositetexture"); // L: 6 - field2852 = new WorldMapCacheName("area"); // L: 7 - field2850 = new WorldMapCacheName("labels"); // L: 8 + field2413 = new WorldMapCacheName("details"); // L: 4 + field2414 = new WorldMapCacheName("compositemap"); // L: 5 + field2418 = new WorldMapCacheName("compositetexture"); // L: 6 + field2419 = new WorldMapCacheName("area"); // L: 7 + field2417 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { this.name = var1; // L: 12 } // L: 13 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lql;", - garbageValue = "1724872631" - ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 365 - var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 366 - var4 = 1; - } - - long var6 = ((long)var3 << 42) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var4 << 40); // L: 367 - SpritePixels var8; - if (!var5) { // L: 369 - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 370 - if (var8 != null) { // L: 371 - return var8; - } - } - - ItemComposition var9 = class67.ItemDefinition_get(var0); // L: 373 - if (var1 > 1 && var9.countobj != null) { // L: 374 - int var10 = -1; // L: 375 - - for (int var11 = 0; var11 < 10; ++var11) { // L: 376 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 377 - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { // L: 379 - var9 = class67.ItemDefinition_get(var10); - } - } - - Model var21 = var9.getModel(1); // L: 381 - if (var21 == null) { // L: 382 - return null; - } else { - SpritePixels var22 = null; // L: 383 - if (var9.noteTemplate != -1) { // L: 384 - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 385 - if (var22 == null) { // L: 386 - return null; - } - } else if (var9.notedId != -1) { // L: 388 - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 389 - if (var22 == null) { // L: 390 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 392 - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 393 - if (var22 == null) { // L: 394 - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 396 - int var13 = Rasterizer2D.Rasterizer2D_width; // L: 397 - int var14 = Rasterizer2D.Rasterizer2D_height; // L: 398 - int[] var15 = new int[4]; // L: 399 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 400 - var8 = new SpritePixels(36, 32); // L: 401 - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 402 - Rasterizer2D.Rasterizer2D_clear(); // L: 403 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 404 - Rasterizer3D.method3997(16, 16); // L: 405 - Rasterizer3D.field2325 = false; // L: 406 - if (var9.placeholderTemplate != -1) { // L: 407 - var22.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; // L: 408 - if (var5) { // L: 409 - var16 = (int)((double)var16 * 1.5D); - } else if (var2 == 2) { // L: 410 - var16 = (int)((double)var16 * 1.04D); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 411 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 412 - var21.calculateBoundsCylinder(); // L: 413 - var21.method4376(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 414 - if (var9.notedId != -1) { // L: 415 - var22.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { // L: 416 - var8.outline(1); - } - - if (var2 >= 2) { // L: 417 - var8.outline(16777215); - } - - if (var3 != 0) { // L: 418 - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 419 - if (var9.noteTemplate != -1) { // L: 420 - var22.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 421 - Font var19 = class239.ItemDefinition_fontPlain11; // L: 422 - String var20; - if (var1 < 100000) { // L: 425 - var20 = "" + var1 + ""; // L: 426 - } else if (var1 < 10000000) { // L: 429 - var20 = "" + var1 / 1000 + "K" + ""; // L: 430 - } else { - var20 = "" + var1 / 1000000 + "M" + ""; // L: 433 - } - - var19.draw(var20, 0, 9, 16776960, 1); // L: 435 - } - - if (!var5) { // L: 437 - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 438 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 439 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 440 - Rasterizer3D.field2325 = true; // L: 441 - return var8; // L: 442 - } - } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 9a761da606..8b8fa4e2ca 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,21 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("ge") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("ObjectDefinition_archive") + public static AbstractArchive ObjectDefinition_archive; + WorldMapData_0() { } // L: 6 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1008832377" + descriptor = "(Lpi;S)V", + garbageValue = "-2625" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field2829.value) { // L: 10 + if (var2 != WorldMapID.field2383.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -26,110 +33,53 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); // L: 16 super.regionX = var1.readUnsignedShort(); // L: 17 super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method7742(); // L: 19 - super.fileId = var1.method7742(); // L: 20 + super.groupId = var1.method7692(); // L: 19 + super.fileId = var1.method7692(); // L: 20 } } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1809174469" + descriptor = "(Lpi;I)V", + garbageValue = "169222990" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); // L: 25 - super.floorUnderlayIds = new short[1][64][64]; // L: 26 - super.floorOverlayIds = new short[super.planes][64][64]; // L: 27 - super.field2793 = new byte[super.planes][64][64]; // L: 28 - super.field2792 = new byte[super.planes][64][64]; // L: 29 - super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 30 - int var2 = var1.readUnsignedByte(); // L: 31 - if (var2 != class239.field2823.value) { // L: 32 - throw new IllegalStateException(""); // L: 33 + super.planes = Math.min(super.planes, 4); // L: 24 + super.floorUnderlayIds = new short[1][64][64]; // L: 25 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 26 + super.field2334 = new byte[super.planes][64][64]; // L: 27 + super.field2342 = new byte[super.planes][64][64]; // L: 28 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29 + int var2 = var1.readUnsignedByte(); // L: 30 + if (var2 != class214.field2380.value) { // L: 31 + throw new IllegalStateException(""); // L: 32 } else { - int var3 = var1.readUnsignedByte(); // L: 35 - int var4 = var1.readUnsignedByte(); // L: 36 - if (var3 == super.regionX && var4 == super.regionY) { // L: 37 - for (int var5 = 0; var5 < 64; ++var5) { // L: 40 - for (int var6 = 0; var6 < 64; ++var6) { // L: 41 - this.readTile(var5, var6, var1); // L: 42 + int var3 = var1.readUnsignedByte(); // L: 34 + int var4 = var1.readUnsignedByte(); // L: 35 + if (var3 == super.regionX && var4 == super.regionY) { // L: 36 + for (int var5 = 0; var5 < 64; ++var5) { // L: 39 + for (int var6 = 0; var6 < 64; ++var6) { // L: 40 + this.readTile(var5, var6, var1); // L: 41 } } } else { - throw new IllegalStateException(""); // L: 38 + throw new IllegalStateException(""); // L: 37 } } - } + } // L: 44 public int hashCode() { - return super.regionX | super.regionY << 8; + return super.regionX | super.regionY << 8; // L: 55 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { - return false; + if (!(var1 instanceof WorldMapData_0)) { // L: 47 + return false; // L: 48 } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; - return super.regionX == var2.regionX && super.regionY == var2.regionY; + WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 + return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 } } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIII)V", - garbageValue = "-352073584" - ) - public static void method4518(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { // L: 43 - int var4 = (var3 + var2) / 2; // L: 44 - int var5 = var2; // L: 45 - String var6 = var0[var4]; // L: 46 - var0[var4] = var0[var3]; // L: 47 - var0[var3] = var6; // L: 48 - int var7 = var1[var4]; // L: 49 - var1[var4] = var1[var3]; // L: 50 - var1[var3] = var7; // L: 51 - - for (int var8 = var2; var8 < var3; ++var8) { // L: 52 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53 - String var9 = var0[var8]; // L: 54 - var0[var8] = var0[var5]; // L: 55 - var0[var5] = var9; // L: 56 - int var10 = var1[var8]; // L: 57 - var1[var8] = var1[var5]; // L: 58 - var1[var5++] = var10; // L: 59 - } - } - - var0[var3] = var0[var5]; // L: 63 - var0[var5] = var6; // L: 64 - var1[var3] = var1[var5]; // L: 65 - var1[var5] = var7; // L: 66 - method4518(var0, var1, var2, var5 - 1); // L: 67 - method4518(var0, var1, var5 + 1, var3); // L: 68 - } - - } // L: 70 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(CLlp;I)I", - garbageValue = "-1970955164" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 128 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 129 - var0 = Character.toLowerCase(var0); // L: 130 - var2 = (var0 << 4) + 1; // L: 131 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 133 - var2 = 1762; - } - - return var2; // L: 134 - } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index ac80d90393..5c861d8dc9 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("gg") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("en") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive8") - static Archive archive8; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1652459631 + intValue = -1189550107 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2125666913 + intValue = 1085074515 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1369214467 + intValue = 1863655397 ) @Export("chunkX") int chunkX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1403244579 + intValue = -1631671287 ) @Export("chunkY") int chunkY; @@ -43,13 +37,13 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-1584785156" + descriptor = "(Lpi;I)V", + garbageValue = "1916863393" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field2826.value) { // L: 15 + if (var2 != WorldMapID.field2387.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -62,99 +56,127 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); // L: 25 this.chunkX = var1.readUnsignedByte(); // L: 26 this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method7742(); // L: 28 - super.fileId = var1.method7742(); // L: 29 + super.groupId = var1.method7692(); // L: 28 + super.fileId = var1.method7692(); // L: 29 } } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1809174469" + descriptor = "(Lpi;I)V", + garbageValue = "169222990" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); // L: 34 - super.floorUnderlayIds = new short[1][64][64]; // L: 35 - super.floorOverlayIds = new short[super.planes][64][64]; // L: 36 - super.field2793 = new byte[super.planes][64][64]; // L: 37 - super.field2792 = new byte[super.planes][64][64]; // L: 38 - super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 39 - int var2 = var1.readUnsignedByte(); // L: 40 - if (var2 != class239.field2819.value) { // L: 41 - throw new IllegalStateException(""); // L: 42 + super.planes = Math.min(super.planes, 4); // L: 33 + super.floorUnderlayIds = new short[1][64][64]; // L: 34 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 + super.field2334 = new byte[super.planes][64][64]; // L: 36 + super.field2342 = new byte[super.planes][64][64]; // L: 37 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 != class214.field2378.value) { // L: 40 + throw new IllegalStateException(""); // L: 41 } else { - int var3 = var1.readUnsignedByte(); // L: 44 - int var4 = var1.readUnsignedByte(); // L: 45 - int var5 = var1.readUnsignedByte(); // L: 46 - int var6 = var1.readUnsignedByte(); // L: 47 - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 48 - for (int var7 = 0; var7 < 8; ++var7) { // L: 51 - for (int var8 = 0; var8 < 8; ++var8) { // L: 52 - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 53 + int var3 = var1.readUnsignedByte(); // L: 43 + int var4 = var1.readUnsignedByte(); // L: 44 + int var5 = var1.readUnsignedByte(); // L: 45 + int var6 = var1.readUnsignedByte(); // L: 46 + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 47 + for (int var7 = 0; var7 < 8; ++var7) { // L: 50 + for (int var8 = 0; var8 < 8; ++var8) { // L: 51 + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 52 } } } else { - throw new IllegalStateException(""); // L: 49 + throw new IllegalStateException(""); // L: 48 } } - } // L: 56 + } // L: 55 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "31" + garbageValue = "-8" ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; // L: 76 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - @Export("getChunkYLow") - int getChunkYLow() { - return this.chunkYLow; // L: 80 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "606761017" - ) - @Export("getChunkX") - int getChunkX() { - return this.chunkX; // L: 84 + return this.chunkXLow; } @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-111904746" + garbageValue = "16777215" + ) + @Export("getChunkYLow") + int getChunkYLow() { + return this.chunkYLow; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2037619431" + ) + @Export("getChunkX") + int getChunkX() { + return this.chunkX; // L: 81 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "93025886" ) @Export("getChunkY") int getChunkY() { - return this.chunkY; // L: 88 + return this.chunkY; // L: 85 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { // L: 60 - return false; // L: 61 + if (!(var1 instanceof WorldMapData_1)) { // L: 58 + return false; // L: 59 } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63 - if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 64 - return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 67 + WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 + if (super.regionX == var2.regionX && var2.regionY == super.regionY) { + return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; } else { - return false; // L: 65 + return false; } } } public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72 + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "-264358279" + ) + static String method4226(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); // L: 62 + + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 63 + int var5 = var0[var4] & 255; // L: 64 + var3.append(class346.field4136[var5 >>> 2]); // L: 65 + if (var4 < var2 - 1) { // L: 66 + int var6 = var0[var4 + 1] & 255; // L: 67 + var3.append(class346.field4136[(var5 & 3) << 4 | var6 >>> 4]); // L: 68 + if (var4 < var2 - 2) { // L: 69 + int var7 = var0[var4 + 2] & 255; // L: 70 + var3.append(class346.field4136[(var6 & 15) << 2 | var7 >>> 6]).append(class346.field4136[var7 & 63]); // L: 71 + } else { + var3.append(class346.field4136[(var6 & 15) << 2]).append("="); // L: 73 + } + } else { + var3.append(class346.field4136[(var5 & 3) << 4]).append("=="); // L: 75 + } + } + + return var3.toString(); // L: 77 } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 839128a060..94ac199d56 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -2,26 +2,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("ij") +@ObfuscatedName("hl") @Implements("WorldMapDecoration") public class WorldMapDecoration { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -536072233 + intValue = 37157343 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1607146609 + intValue = 1991740145 ) @Export("decoration") final int decoration; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -179610333 + intValue = -1682517797 ) @Export("rotation") final int rotation; @@ -31,14 +30,4 @@ public class WorldMapDecoration { this.decoration = var2; // L: 10 this.rotation = var3; // L: 11 } // L: 12 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-323833461" - ) - public static void method4988() { - NPCComposition.NpcDefinition_cached.clear(); // L: 260 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 261 - } // L: 262 } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 26eec2fd73..4a6c42ccdf 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,128 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("ko") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3519(0, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3516(1, 0), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3512(2, 0), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3511(3, 0), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3514(9, 2), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3515(4, 1), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3517(5, 1), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3510(6, 1), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3518(7, 1), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3531(8, 1), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3530(12, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3521(13, 2), + field3517(0, 0), @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3522(14, 2), - @ObfuscatedName("j") + field3512(1, 0), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3523(15, 2), - @ObfuscatedName("p") + field3509(2, 0), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3524(16, 2), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - field3525(17, 2), + field3500(3, 0), @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3526(18, 2), - @ObfuscatedName("w") + field3501(9, 2), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3527(19, 2), - @ObfuscatedName("a") + field3502(4, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3528(20, 2), - @ObfuscatedName("m") + field3507(5, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3529(21, 2), + field3499(6, 1), @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3513(10, 2), + field3505(7, 1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3504(8, 1), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3497(12, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3508(13, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3521(14, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3510(15, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3511(16, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3506(17, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3515(18, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3514(19, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3513(20, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3516(21, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3498(10, 2), @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3532(11, 2), - @ObfuscatedName("z") + field3518(11, 2), + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lko;" ) - field3520(22, 3); + field3519(22, 3); + @ObfuscatedName("ed") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive9") + static Archive archive9; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -541001393 + intValue = -1027603677 ) @Export("id") public final int id; @@ -138,125 +144,13 @@ public enum WorldMapDecorationType implements MouseWheel { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 39 + return this.id; // L: 38 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([Lbr;II[I[II)V", - garbageValue = "-2080663785" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { // L: 81 - int var5 = var1 - 1; // L: 82 - int var6 = var2 + 1; // L: 83 - int var7 = (var2 + var1) / 2; // L: 84 - World var8 = var0[var7]; // L: 85 - var0[var7] = var0[var1]; // L: 86 - var0[var1] = var8; // L: 87 - - while (var5 < var6) { // L: 88 - boolean var9 = true; // L: 89 - - int var10; - int var11; - int var12; - do { - --var6; // L: 91 - - for (var10 = 0; var10 < 4; ++var10) { // L: 92 - if (var3[var10] == 2) { // L: 95 - var11 = var0[var6].index; // L: 96 - var12 = var8.index; // L: 97 - } else if (var3[var10] == 1) { // L: 99 - var11 = var0[var6].population; // L: 100 - var12 = var8.population; // L: 101 - if (var11 == -1 && var4[var10] == 1) { // L: 102 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 103 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 105 - var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 - } else { - var11 = var0[var6].id; // L: 110 - var12 = var8.id; // L: 111 - } - - if (var12 != var11) { // L: 113 - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 - var9 = false; // L: 119 - } - break; - } - - if (var10 == 3) { // L: 114 - var9 = false; - } - } - } while(var9); - - var9 = true; // L: 124 - - do { - ++var5; // L: 126 - - for (var10 = 0; var10 < 4; ++var10) { // L: 127 - if (var3[var10] == 2) { // L: 130 - var11 = var0[var5].index; // L: 131 - var12 = var8.index; // L: 132 - } else if (var3[var10] == 1) { // L: 134 - var11 = var0[var5].population; // L: 135 - var12 = var8.population; // L: 136 - if (var11 == -1 && var4[var10] == 1) { // L: 137 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 138 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 140 - var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 - } else { - var11 = var0[var5].id; // L: 145 - var12 = var8.id; // L: 146 - } - - if (var12 != var11) { // L: 148 - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 - var9 = false; // L: 154 - } - break; - } - - if (var10 == 3) { // L: 149 - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { // L: 159 - World var13 = var0[var5]; // L: 160 - var0[var5] = var0[var6]; // L: 161 - var0[var6] = var13; // L: 162 - } - } - - sortWorlds(var0, var1, var6, var3, var4); // L: 165 - sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 - } - - } // L: 168 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 4dd0f6b8a3..28f9da2589 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -1,113 +1,129 @@ +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("fs") +@ObfuscatedName("fe") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { + @ObfuscatedName("tn") + @ObfuscatedGetter( + intValue = -157770033 + ) + static int field1837; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("WorldMapElement_archive") - public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("o") + static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lfs;" + descriptor = "[Lfe;" ) @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("g") + static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 225433591 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lig;" ) @Export("WorldMapElement_cachedSprites") - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("bw") + static String field1836; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 288727621 + intValue = 1299473343 ) @Export("objectId") public final int objectId; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 248860015 + intValue = 2002473353 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1362059855 + intValue = 1967880505 ) @Export("sprite2") int sprite2; - @ObfuscatedName("f") + @ObfuscatedName("l") @Export("name") public String name; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 22843739 + intValue = -713900129 ) - public int field1833; - @ObfuscatedName("r") + public int field1819; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1370123751 + intValue = -1130122781 ) @Export("textSize") public int textSize; - @ObfuscatedName("x") - public boolean field1835; - @ObfuscatedName("c") - public boolean field1836; - @ObfuscatedName("j") + @ObfuscatedName("p") + public boolean field1822; + @ObfuscatedName("w") + public boolean field1823; + @ObfuscatedName("k") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("p") + @ObfuscatedName("d") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("s") - int[] field1845; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 930567691 - ) - int field1840; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 866597645 - ) - int field1848; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 144925397 - ) - int field1842; @ObfuscatedName("m") + int[] field1826; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 899868617 + intValue = 380033171 ) - int field1843; - @ObfuscatedName("q") + int field1827; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 290055171 + ) + int field1818; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1320968285 + ) + int field1829; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 822364643 + ) + int field1816; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfw;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfg;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("z") - int[] field1846; + @ObfuscatedName("j") + int[] field1821; @ObfuscatedName("e") - byte[] field1847; - @ObfuscatedName("t") + byte[] field1834; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2089169819 + intValue = -504229365 ) @Export("category") public int category; @@ -116,229 +132,618 @@ public class WorldMapElement extends DualNode { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } - public WorldMapElement(int var1) { + WorldMapElement(int var1) { this.sprite1 = -1; // L: 18 this.sprite2 = -1; // L: 19 this.textSize = 0; // L: 22 - this.field1835 = true; // L: 24 - this.field1836 = false; // L: 25 + this.field1822 = true; // L: 24 + this.field1823 = false; // L: 25 this.menuActions = new String[5]; // L: 26 - this.field1840 = Integer.MAX_VALUE; // L: 29 - this.field1848 = Integer.MAX_VALUE; // L: 30 - this.field1842 = Integer.MIN_VALUE; // L: 31 - this.field1843 = Integer.MIN_VALUE; // L: 32 + this.field1827 = Integer.MAX_VALUE; // L: 29 + this.field1818 = Integer.MAX_VALUE; // L: 30 + this.field1829 = Integer.MIN_VALUE; + this.field1816 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 - this.category = -1; // L: 37 - this.objectId = var1; // L: 40 + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; + this.category = -1; + this.objectId = var1; } // L: 41 - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "-1866592266" + descriptor = "(Lpi;B)V", + garbageValue = "2" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 52 - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 70 + if (var2 == 0) { // L: 71 + return; // L: 74 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 72 } } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-654586001" + descriptor = "(Lpi;II)V", + garbageValue = "-633870320" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 59 - this.sprite1 = var1.method7742(); - } else if (var2 == 2) { - this.sprite2 = var1.method7742(); - } else if (var2 == 3) { + if (var2 == 1) { // L: 77 + this.sprite1 = var1.method7692(); + } else if (var2 == 2) { // L: 78 + this.sprite2 = var1.method7692(); + } else if (var2 == 3) { // L: 79 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.field1833 = var1.readMedium(); - } else if (var2 == 5) { - var1.readMedium(); - } else if (var2 == 6) { + } else if (var2 == 4) { // L: 80 + this.field1819 = var1.readMedium(); + } else if (var2 == 5) { // L: 81 + var1.readMedium(); // L: 82 + } else if (var2 == 6) { // L: 84 this.textSize = var1.readUnsignedByte(); } else { int var6; - if (var2 == 7) { - var6 = var1.readUnsignedByte(); // L: 68 - if ((var6 & 1) == 0) { // L: 69 - this.field1835 = false; + if (var2 == 7) { // L: 85 + var6 = var1.readUnsignedByte(); // L: 86 + if ((var6 & 1) == 0) { // L: 87 + this.field1822 = false; } - if ((var6 & 2) == 2) { // L: 70 - this.field1836 = true; + if ((var6 & 2) == 2) { // L: 88 + this.field1823 = true; } - } else if (var2 == 8) { // L: 72 - var1.readUnsignedByte(); // L: 73 - } else if (var2 >= 10 && var2 <= 14) { // L: 75 + } else if (var2 == 8) { // L: 90 + var1.readUnsignedByte(); // L: 91 + } else if (var2 >= 10 && var2 <= 14) { // L: 93 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 76 - var6 = var1.readUnsignedByte(); // L: 77 - this.field1845 = new int[var6 * 2]; // L: 78 + } else if (var2 == 15) { // L: 94 + var6 = var1.readUnsignedByte(); // L: 95 + this.field1826 = new int[var6 * 2]; // L: 96 int var4; - for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79 - this.field1845[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 97 + this.field1826[var4] = var1.readShort(); } - var1.readInt(); // L: 80 - var4 = var1.readUnsignedByte(); // L: 81 - this.field1846 = new int[var4]; // L: 82 + var1.readInt(); // L: 98 + var4 = var1.readUnsignedByte(); // L: 99 + this.field1821 = new int[var4]; // L: 100 int var5; - for (var5 = 0; var5 < this.field1846.length; ++var5) { // L: 83 - this.field1846[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1821.length; ++var5) { // L: 101 + this.field1821[var5] = var1.readInt(); } - this.field1847 = new byte[var6]; // L: 84 + this.field1834 = new byte[var6]; // L: 102 - for (var5 = 0; var5 < var6; ++var5) { // L: 85 - this.field1847[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { // L: 103 + this.field1834[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 87 - if (var2 == 17) { // L: 88 + } else if (var2 != 16) { // L: 105 + if (var2 == 17) { // L: 106 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 89 - var1.method7742(); // L: 90 - } else if (var2 == 19) { // L: 92 + } else if (var2 == 18) { // L: 107 + var1.method7692(); // L: 108 + } else if (var2 == 19) { // L: 110 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { // L: 93 - var1.readInt(); // L: 94 - } else if (var2 == 22) { // L: 96 - var1.readInt(); // L: 97 - } else if (var2 == 23) { // L: 99 - var1.readUnsignedByte(); // L: 100 - var1.readUnsignedByte(); // L: 101 - var1.readUnsignedByte(); // L: 102 - } else if (var2 == 24) { // L: 104 - var1.readShort(); // L: 105 - var1.readShort(); // L: 106 - } else if (var2 == 25) { // L: 108 - var1.method7742(); // L: 109 - } else if (var2 == 28) { // L: 111 - var1.readUnsignedByte(); // L: 112 - } else if (var2 == 29) { // L: 114 - this.horizontalAlignment = (HorizontalAlignment)ChatChannel.findEnumerated(LoginScreenAnimation.method2235(), var1.readUnsignedByte()); // L: 115 - } else if (var2 == 30) { // L: 117 - VerticalAlignment[] var3 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1944, VerticalAlignment.field1947}; // L: 120 - this.verticalAlignment = (VerticalAlignment)ChatChannel.findEnumerated(var3, var1.readUnsignedByte()); // L: 122 + } else if (var2 == 21) { // L: 111 + var1.readInt(); // L: 112 + } else if (var2 == 22) { // L: 114 + var1.readInt(); // L: 115 + } else if (var2 == 23) { // L: 117 + var1.readUnsignedByte(); // L: 118 + var1.readUnsignedByte(); // L: 119 + var1.readUnsignedByte(); // L: 120 + } else if (var2 == 24) { // L: 122 + var1.readShort(); // L: 123 + var1.readShort(); // L: 124 + } else if (var2 == 25) { // L: 126 + var1.method7692(); // L: 127 + } else if (var2 == 28) { // L: 129 + var1.readUnsignedByte(); // L: 130 + } else if (var2 == 29) { // L: 132 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1890, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1889}; // L: 135 + this.horizontalAlignment = (HorizontalAlignment)MusicPatchPcmStream.findEnumerated(var3, var1.readUnsignedByte()); // L: 137 + } else if (var2 == 30) { // L: 139 + this.verticalAlignment = (VerticalAlignment)MusicPatchPcmStream.findEnumerated(class295.method5745(), var1.readUnsignedByte()); // L: 140 } } } - } // L: 125 + } // L: 143 - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1239402235" + descriptor = "(B)V", + garbageValue = "13" ) - public void method3383() { - if (this.field1845 != null) { // L: 128 - for (int var1 = 0; var1 < this.field1845.length; var1 += 2) { // L: 129 - if (this.field1845[var1] < this.field1840) { // L: 130 - this.field1840 = this.field1845[var1]; - } else if (this.field1845[var1] > this.field1842) { // L: 131 - this.field1842 = this.field1845[var1]; + void method3381() { + if (this.field1826 != null) { // L: 146 + for (int var1 = 0; var1 < this.field1826.length; var1 += 2) { // L: 147 + if (this.field1826[var1] < this.field1827) { // L: 148 + this.field1827 = this.field1826[var1]; + } else if (this.field1826[var1] > this.field1829) { + this.field1829 = this.field1826[var1]; // L: 149 } - if (this.field1845[var1 + 1] < this.field1848) { // L: 132 - this.field1848 = this.field1845[var1 + 1]; - } else if (this.field1845[var1 + 1] > this.field1843) { - this.field1843 = this.field1845[var1 + 1]; // L: 133 + if (this.field1826[var1 + 1] < this.field1818) { // L: 150 + this.field1818 = this.field1826[var1 + 1]; + } else if (this.field1826[var1 + 1] > this.field1816) { + this.field1816 = this.field1826[var1 + 1]; // L: 151 } } } - } // L: 136 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(ZI)Lql;", - garbageValue = "921852844" - ) - @Export("getSpriteBool") - public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 139 - return this.getSprite(var2); // L: 140 - } + } // L: 154 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Lql;", - garbageValue = "-1" + descriptor = "(ZI)Lqi;", + garbageValue = "39477486" + ) + @Export("getSpriteBool") + public SpritePixels getSpriteBool(boolean var1) { + int var2 = this.sprite1; // L: 157 + return this.getSprite(var2); // L: 158 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lqi;", + garbageValue = "-824891527" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { // L: 144 + if (var1 < 0) { // L: 162 return null; } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 145 - if (var2 != null) { // L: 146 + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 163 + if (var2 != null) { // L: 164 return var2; } else { - var2 = InterfaceParent.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 147 - if (var2 != null) { // L: 148 - WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 149 + var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 165 + if (var2 != null) { // L: 166 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 167 } - return var2; // L: 151 + return var2; // L: 169 } } } - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1723398131" + garbageValue = "1607536994" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; // L: 155 + return this.objectId; // L: 173 } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-496863975" + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", + garbageValue = "1727118397" ) - public static void method3384(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 - VarbitComposition var2; - if (var3 != null) { // L: 49 - var2 = var3; // L: 50 - } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 - var3 = new VarbitComposition(); // L: 54 - if (var4 != null) { // L: 55 - var3.decode(new Buffer(var4)); + static void method3403(String var0, boolean var1, String var2, boolean var3) { + if (var1) { // L: 31 + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 32 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 34 + return; // L: 35 + } catch (Exception var5) { // L: 37 + } } - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 - var2 = var3; // L: 57 + if (class29.field175.startsWith("win") && !var3) { // L: 39 40 + PendingSpawn.method2165(var0, 0, "openjs"); // L: 42 + return; // L: 44 + } + + if (class29.field175.startsWith("mac")) { // L: 47 + PendingSpawn.method2165(var0, 1, var2); // L: 48 + return; // L: 49 + } + + PendingSpawn.method2165(var0, 2, "openjs"); // L: 52 + } else { + PendingSpawn.method2165(var0, 3, "openjs"); // L: 57 } - int var8 = var2.baseVar; // L: 60 - int var5 = var2.startBit; // L: 61 - int var6 = var2.endBit; // L: 62 - int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 - if (var1 < 0 || var1 > var7) { // L: 64 - var1 = 0; - } + } // L: 60 - var7 <<= var5; // L: 65 - Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 - } // L: 67 + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1481708201" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 142 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIIIILhv;Lgv;B)V", + garbageValue = "-47" + ) + @Export("addObjects") + static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 332 333 334 + if (var0 < Tiles.Tiles_minPlane) { // L: 337 + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = class146.getObjectDefinition(var3); // L: 338 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 341 + var9 = var8.sizeX; // L: 346 + var10 = var8.sizeY; // L: 347 + } else { + var9 = var8.sizeY; // L: 342 + var10 = var8.sizeX; // L: 343 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 353 + var11 = (var9 >> 1) + var1; // L: 354 + var12 = (var9 + 1 >> 1) + var1; // L: 355 + } else { + var11 = var1; // L: 358 + var12 = var1 + 1; // L: 359 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 361 + var13 = (var10 >> 1) + var2; // L: 362 + var14 = var2 + (var10 + 1 >> 1); // L: 363 + } else { + var13 = var2; // L: 366 + var14 = var2 + 1; // L: 367 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 369 + int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2; // L: 370 + int var17 = (var1 << 7) + (var9 << 6); // L: 371 + int var18 = (var2 << 7) + (var10 << 6); // L: 372 + long var19 = GameObject.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 373 + int var21 = var5 + (var4 << 6); // L: 374 + if (var8.int3 == 1) { // L: 375 + var21 += 256; + } + + if (var8.hasSound()) { // L: 376 + class360.method6589(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { // L: 377 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 378 + if (var8.animationId == -1 && var8.transforms == null) { // L: 380 + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 381 + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 382 + if (var8.interactType == 1 && var7 != null) { // L: 383 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { // L: 386 + int[] var10000; + if (var5 >= 12) { // L: 407 + if (var8.animationId == -1 && var8.transforms == null) { // L: 409 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 410 + } + + var6.method4882(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 411 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 412 + var10000 = class420.field4545[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 413 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 416 + if (var8.animationId == -1 && var8.transforms == null) { // L: 418 + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 419 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field990[var4], 0, var19, var21); // L: 420 + if (var4 == 0) { // L: 421 + if (var8.clipped) { // L: 422 + class392.field4374[var0][var1][var2] = 50; // L: 423 + class392.field4374[var0][var1][var2 + 1] = 50; // L: 424 + } + + if (var8.modelClipped) { // L: 426 + var10000 = class420.field4545[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 428 + if (var8.clipped) { // L: 429 + class392.field4374[var0][var1][var2 + 1] = 50; // L: 430 + class392.field4374[var0][var1 + 1][var2 + 1] = 50; // L: 431 + } + + if (var8.modelClipped) { // L: 433 + var10000 = class420.field4545[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { // L: 435 + if (var8.clipped) { // L: 436 + class392.field4374[var0][var1 + 1][var2] = 50; // L: 437 + class392.field4374[var0][var1 + 1][var2 + 1] = 50; // L: 438 + } + + if (var8.modelClipped) { // L: 440 + var10000 = class420.field4545[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 442 + if (var8.clipped) { // L: 443 + class392.field4374[var0][var1][var2] = 50; // L: 444 + class392.field4374[var0][var1 + 1][var2] = 50; // L: 445 + } + + if (var8.modelClipped) { // L: 447 + var10000 = class420.field4545[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 449 + var7.method3872(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 450 + var6.method4748(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 453 + if (var8.animationId == -1 && var8.transforms == null) { // L: 455 + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 456 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 457 + if (var8.clipped) { // L: 458 + if (var4 == 0) { // L: 459 + class392.field4374[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 460 + class392.field4374[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 461 + class392.field4374[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 462 + class392.field4374[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 464 + var7.method3872(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var22; + if (var5 == 2) { // L: 467 + var22 = var4 + 1 & 3; // L: 468 + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { // L: 471 + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 472 + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 473 + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 476 + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 477 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field990[var4], Tiles.field990[var22], var19, var21); // L: 479 + if (var8.modelClipped) { // L: 480 + if (var4 == 0) { // L: 481 + var10000 = class420.field4545[var0][var1]; // L: 482 + var10000[var2] |= 585; + var10000 = class420.field4545[var0][var1]; // L: 483 + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { // L: 485 + var10000 = class420.field4545[var0][var1]; // L: 486 + var10000[1 + var2] |= 1170; + var10000 = class420.field4545[var0][var1 + 1]; // L: 487 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 489 + var10000 = class420.field4545[var0][var1 + 1]; // L: 490 + var10000[var2] |= 585; + var10000 = class420.field4545[var0][var1]; // L: 491 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 493 + var10000 = class420.field4545[var0][var1]; // L: 494 + var10000[var2] |= 1170; + var10000 = class420.field4545[var0][var1]; // L: 495 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 498 + var7.method3872(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 499 + var6.method4748(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 502 + if (var8.animationId == -1 && var8.transforms == null) { // L: 504 + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 505 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 506 + if (var8.clipped) { // L: 507 + if (var4 == 0) { // L: 508 + class392.field4374[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 509 + class392.field4374[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 510 + class392.field4374[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 511 + class392.field4374[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 513 + var7.method3872(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 516 + if (var8.animationId == -1 && var8.transforms == null) { // L: 518 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 519 + } + + var6.method4882(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 520 + if (var8.interactType != 0 && var7 != null) { // L: 521 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 522 + var6.method4748(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 525 + if (var8.animationId == -1 && var8.transforms == null) { // L: 527 + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 528 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field990[var4], 0, 0, 0, var19, var21); // L: 529 + } else { + long var23; + Object var25; + if (var5 == 5) { // L: 532 + var22 = 16; // L: 533 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 534 + if (0L != var23) { // L: 535 + var22 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 537 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 538 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field990[var4], 0, var22 * Tiles.field992[var4], var22 * Tiles.field993[var4], var19, var21); // L: 539 + } else if (var5 == 6) { // L: 542 + var22 = 8; // L: 543 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 544 + if (var23 != 0L) { // L: 545 + var22 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 547 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 548 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field997[var4], var22 * Tiles.field995[var4], var19, var21); // L: 549 + } else if (var5 == 7) { // L: 552 + var28 = var4 + 2 & 3; // L: 554 + if (var8.animationId == -1 && var8.transforms == null) { // L: 555 + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 556 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 557 + } else if (var5 == 8) { // L: 560 + var22 = 8; // L: 561 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 562 + if (0L != var23) { // L: 563 + var22 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 566 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 567 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 568 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 569 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 572 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 573 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field997[var4], var22 * Tiles.field995[var4], var19, var21); // L: 575 + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 388 + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 389 + } + + if (var29 != null && var6.method4882(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 390 391 + var28 = 15; // L: 392 + if (var29 instanceof Model) { // L: 393 + var28 = ((Model)var29).method5014() / 4; // L: 394 + if (var28 > 30) { // L: 395 + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { // L: 397 + for (int var32 = 0; var32 <= var10; ++var32) { // L: 398 + if (var28 > class392.field4374[var0][var31 + var1][var32 + var2]) { // L: 399 + class392.field4374[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 404 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + } // L: 384 405 414 451 465 500 514 523 530 540 550 558 576 578 + + @ObfuscatedName("lw") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-62" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 12393 + PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 12395 + var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 12396 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12397 + Client.packetWriter.addNode(var1); // L: 12398 + } + } // L: 12399 } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index c57963fba0..c6e6a0718b 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,42 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("hh") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lje;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - @Export("socketTask") - static Task socketTask; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 814110167 + intValue = 205058023 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lks;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lks;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILko;Lko;)V" + descriptor = "(ILks;Lks;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; // L: 11 @@ -47,34 +35,21 @@ public class WorldMapEvent { this.coord2 = var3; // L: 13 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "1302" + descriptor = "(Lln;I)V", + garbageValue = "-1383377565" ) - static final void method5136(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79 - for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80 - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81 - GrandExchangeOfferNameComparator.field4010[0][var5][var4] = 127; // L: 82 - if (var0 == var5 && var5 > 0) { // L: 83 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } + public static void method4506(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 - if (var5 == var0 + var2 && var5 < 103) { // L: 84 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { // L: 85 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var3 + var1 == var4 && var4 < 103) { // L: 86 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } // L: 90 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-615981815" + ) + public static boolean method4505(int var0) { + return var0 == WorldMapDecorationType.field3519.id; // L: 46 + } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 9f957ebd94..f2d4f033d4 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,70 +4,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("hm") @Implements("WorldMapID") public class WorldMapID { + @ObfuscatedName("ua") + @ObfuscatedGetter( + longValue = -1968541600004373947L + ) + static long field2388; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lhm;" ) - static final WorldMapID field2829; - @ObfuscatedName("o") + static final WorldMapID field2383; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lhm;" ) - static final WorldMapID field2826; - @ObfuscatedName("n") + static final WorldMapID field2387; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lky;" ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("h") + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1857886715 + intValue = 1523273113 + ) + static int field2386; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 171627445 ) @Export("value") final int value; static { - field2829 = new WorldMapID(0); // L: 4 - field2826 = new WorldMapID(1); // L: 5 + field2383 = new WorldMapID(0); // L: 4 + field2387 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { - this.value = var1; // L: 9 + this.value = var1; } // L: 10 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "91" + descriptor = "(II)I", + garbageValue = "1758610928" ) - public static void method5000(int var0) { - if (var0 != -1) { // L: 261 - if (Frames.Widget_loadedInterfaces[var0]) { // L: 262 - class122.Widget_archive.clearFilesGroup(var0); // L: 263 - if (EnumComposition.Widget_interfaceComponents[var0] != null) { // L: 264 - boolean var1 = true; // L: 265 + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 9 + } - for (int var2 = 0; var2 < EnumComposition.Widget_interfaceComponents[var0].length; ++var2) { // L: 266 - if (EnumComposition.Widget_interfaceComponents[var0][var2] != null) { // L: 267 - if (EnumComposition.Widget_interfaceComponents[var0][var2].type != 2) { // L: 268 - EnumComposition.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; // L: 269 - } - } - } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-670115477" + ) + public static boolean method4360() { + ReflectionCheck var0 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 28 + return var0 != null; // L: 29 + } - if (var1) { - EnumComposition.Widget_interfaceComponents[var0] = null; // L: 272 - } - - Frames.Widget_loadedInterfaces[var0] = false; // L: 273 - } - } + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "(IZZZB)Llx;", + garbageValue = "-70" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 1972 + if (JagexCache.JagexCache_dat2File != null) { // L: 1973 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class115.JagexCache_idxFiles[var0], 1000000); } - } // L: 274 + + return new Archive(var4, class182.masterDisk, var0, var1, var2, var3); // L: 1974 + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index c9c1b081e2..a1a6669c09 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,188 +4,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("gr") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { + @ObfuscatedName("r") + public static short[] field2300; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1237030909 + intValue = -500474045 ) @Export("element") final int element; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lho;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1097869871 + intValue = 1264890287 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -587135887 + intValue = -1575477647 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lko;Lko;ILiw;)V" + descriptor = "(Lks;Lks;ILho;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); // L: 14 this.element = var3; // L: 15 this.label = var4; // L: 16 - WorldMapElement var5 = class19.WorldMapElement_get(this.getElement()); // L: 17 - SpritePixels var6 = var5.getSpriteBool(false); + WorldMapElement var5 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 17 + SpritePixels var6 = var5.getSpriteBool(false); // L: 18 if (var6 != null) { // L: 19 this.subWidth = var6.subWidth; // L: 20 - this.subHeight = var6.subHeight; + this.subHeight = var6.subHeight; // L: 21 } else { - this.subWidth = 0; - this.subHeight = 0; + this.subWidth = 0; // L: 24 + this.subHeight = 0; // L: 25 } - } + } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2078584239" + garbageValue = "364835409" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 30 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "-2105037058" + descriptor = "(B)Lho;", + garbageValue = "-32" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 34 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "388705804" + garbageValue = "-915724910" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; + return this.subWidth; // L: 38 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-54" + descriptor = "(I)I", + garbageValue = "1982860019" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lpd;Ljava/lang/String;B)I", - garbageValue = "23" - ) - public static int method4900(Buffer var0, String var1) { - int var2 = var0.offset; // L: 18 - int var4 = var1.length(); // L: 21 - byte[] var5 = new byte[var4]; // L: 22 - - for (int var6 = 0; var6 < var4; ++var6) { // L: 23 - char var7 = var1.charAt(var6); // L: 24 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25 - var5[var6] = (byte)var7; - } else if (var7 == 8364) { // L: 26 - var5[var6] = -128; - } else if (var7 == 8218) { // L: 27 - var5[var6] = -126; - } else if (var7 == 402) { // L: 28 - var5[var6] = -125; - } else if (var7 == 8222) { // L: 29 - var5[var6] = -124; - } else if (var7 == 8230) { // L: 30 - var5[var6] = -123; - } else if (var7 == 8224) { // L: 31 - var5[var6] = -122; - } else if (var7 == 8225) { // L: 32 - var5[var6] = -121; - } else if (var7 == 710) { // L: 33 - var5[var6] = -120; - } else if (var7 == 8240) { // L: 34 - var5[var6] = -119; - } else if (var7 == 352) { // L: 35 - var5[var6] = -118; - } else if (var7 == 8249) { // L: 36 - var5[var6] = -117; - } else if (var7 == 338) { // L: 37 - var5[var6] = -116; - } else if (var7 == 381) { // L: 38 - var5[var6] = -114; - } else if (var7 == 8216) { // L: 39 - var5[var6] = -111; - } else if (var7 == 8217) { // L: 40 - var5[var6] = -110; - } else if (var7 == 8220) { // L: 41 - var5[var6] = -109; - } else if (var7 == 8221) { // L: 42 - var5[var6] = -108; - } else if (var7 == 8226) { // L: 43 - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; // L: 44 - } else if (var7 == 8212) { // L: 45 - var5[var6] = -105; - } else if (var7 == 732) { // L: 46 - var5[var6] = -104; - } else if (var7 == 8482) { // L: 47 - var5[var6] = -103; - } else if (var7 == 353) { // L: 48 - var5[var6] = -102; - } else if (var7 == 8250) { // L: 49 - var5[var6] = -101; - } else if (var7 == 339) { // L: 50 - var5[var6] = -100; - } else if (var7 == 382) { // L: 51 - var5[var6] = -98; - } else if (var7 == 376) { // L: 52 - var5[var6] = -97; - } else { - var5[var6] = 63; // L: 53 - } - } - - var0.writeSmartByteShort(var5.length); // L: 58 - var0.offset += class282.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 - return var0.offset - var2; // L: 60 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-22" - ) - static final int method4901(int var0, int var1) { - if (var0 == -1) { // L: 1013 - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; // L: 1014 - if (var1 < 2) { // L: 1015 - var1 = 2; - } else if (var1 > 126) { // L: 1016 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 1017 - } + return this.subHeight; // L: 42 } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 4cc48b781c..530c0f0987 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -3,56 +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("hz") +@ObfuscatedName("gy") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("sb") - @ObfuscatedSignature( - descriptor = "Laa;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -460630695 + intValue = -1439678685 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhc;" + descriptor = "Lgd;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 308451519 + intValue = 1837597233 ) @Export("element") int element; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lho;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1213792301 + intValue = 129612535 ) @Export("subWidth") int subWidth; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1841576609 + intValue = 325263315 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lko;Lko;ILhc;)V" + descriptor = "(Lks;Lks;ILgd;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); // L: 17 @@ -64,13 +57,13 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-58815243" + garbageValue = "-1679326087" ) @Export("init") void init() { - this.element = class116.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(class19.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = class19.WorldMapElement_get(this.getElement()); // L: 26 + this.element = class146.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(UserComparator7.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 26 SpritePixels var2 = var1.getSpriteBool(false); // L: 27 if (var2 != null) { // L: 28 this.subWidth = var2.subWidth; // L: 29 @@ -82,472 +75,64 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2078584239" + garbageValue = "364835409" ) @Export("getElement") public int getElement() { - return this.element; // L: 40 + return this.element; // L: 39 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "-2105037058" + descriptor = "(B)Lho;", + garbageValue = "-32" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 45 + return this.label; // L: 43 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "388705804" + garbageValue = "-915724910" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; // L: 50 + return this.subWidth; // L: 47 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-54" + descriptor = "(I)I", + garbageValue = "1982860019" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; // L: 55 + return this.subHeight; // L: 51 } - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIIIILgs;Lgf;I)V", - garbageValue = "-1640512620" + descriptor = "(Lpi;IB)Ljava/lang/String;", + garbageValue = "50" ) - @Export("addObjects") - static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 355 356 357 - if (var0 < Tiles.Tiles_minPlane) { // L: 360 - Tiles.Tiles_minPlane = var0; + static String method3933(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); // L: 65 + if (var2 > var1) { // L: 66 + var2 = var1; } - ObjectComposition var8 = class116.getObjectDefinition(var3); // L: 361 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 364 - var9 = var8.sizeX; // L: 369 - var10 = var8.sizeY; // L: 370 - } else { - var9 = var8.sizeY; // L: 365 - var10 = var8.sizeX; // L: 366 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 376 - var11 = (var9 >> 1) + var1; // L: 377 - var12 = (var9 + 1 >> 1) + var1; // L: 378 - } else { - var11 = var1; // L: 381 - var12 = var1 + 1; // L: 382 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 384 - var13 = (var10 >> 1) + var2; // L: 385 - var14 = var2 + (var10 + 1 >> 1); // L: 386 - } else { - var13 = var2; // L: 389 - var14 = var2 + 1; // L: 390 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 392 - int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; // L: 393 - int var17 = (var1 << 7) + (var9 << 6); // L: 394 - int var18 = (var2 << 7) + (var10 << 6); // L: 395 - long var19 = MilliClock.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 396 - int var21 = var5 + (var4 << 6); // L: 397 - if (var8.int3 == 1) { // L: 398 - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { // L: 399 - ObjectSound var22 = new ObjectSound(); // L: 400 - var22.plane = var0; // L: 401 - var22.x = var1 * 128; // L: 402 - var22.y = var2 * 128; // L: 403 - var23 = var8.sizeX; // L: 404 - var24 = var8.sizeY; // L: 405 - if (var4 == 1 || var4 == 3) { // L: 406 - var23 = var8.sizeY; // L: 407 - var24 = var8.sizeX; // L: 408 - } - - var22.maxX = (var23 + var1) * 128; // L: 410 - var22.maxY = (var24 + var2) * 128; // L: 411 - var22.soundEffectId = var8.ambientSoundId; // L: 412 - var22.field813 = var8.int7 * 128; // L: 413 - var22.field809 = var8.int5; // L: 414 - var22.field819 = var8.int6; // L: 415 - var22.soundEffectIds = var8.soundEffectIds; // L: 416 - if (var8.transforms != null) { // L: 417 - var22.obj = var8; // L: 418 - var22.set(); // L: 419 - } - - ObjectSound.objectSounds.addFirst(var22); // L: 421 - if (var22.soundEffectIds != null) { // L: 422 - var22.field821 = var22.field809 + (int)(Math.random() * (double)(var22.field819 - var22.field809)); - } - } - - Object var34; - if (var5 == 22) { // L: 424 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 425 - if (var8.animationId == -1 && var8.transforms == null) { // L: 427 - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 428 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 429 - if (var8.interactType == 1 && var7 != null) { // L: 430 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { // L: 433 - int[] var10000; - if (var5 >= 12) { // L: 454 - if (var8.animationId == -1 && var8.transforms == null) { // L: 456 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 457 - } - - var6.method4138(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 458 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 459 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 460 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 463 - if (var8.animationId == -1 && var8.transforms == null) { // L: 465 - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 466 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, var19, var21); // L: 467 - if (var4 == 0) { // L: 468 - if (var8.clipped) { // L: 469 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; // L: 470 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; // L: 471 - } - - if (var8.modelClipped) { // L: 473 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 475 - if (var8.clipped) { // L: 476 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; // L: 477 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; // L: 478 - } - - if (var8.modelClipped) { // L: 480 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { // L: 482 - if (var8.clipped) { // L: 483 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; // L: 484 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; // L: 485 - } - - if (var8.modelClipped) { // L: 487 - var10000 = DirectByteArrayCopier.field3277[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 489 - if (var8.clipped) { // L: 490 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; // L: 491 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; // L: 492 - } - - if (var8.modelClipped) { // L: 494 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 496 - var7.method3838(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 497 - var6.method4144(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 500 - if (var8.animationId == -1 && var8.transforms == null) { // L: 502 - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 503 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 504 - if (var8.clipped) { // L: 505 - if (var4 == 0) { // L: 506 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 507 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 508 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 509 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 511 - var7.method3838(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { // L: 514 - var28 = var4 + 1 & 3; // L: 515 - Object var31; - Object var32; - if (var8.animationId == -1 && var8.transforms == null) { // L: 518 - var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 519 - var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 520 - } else { - var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 523 - var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 524 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field988[var4], Tiles.field988[var28], var19, var21); // L: 526 - if (var8.modelClipped) { // L: 527 - if (var4 == 0) { // L: 528 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 529 - var10000[var2] |= 585; - var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 530 - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { // L: 532 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 533 - var10000[1 + var2] |= 1170; - var10000 = DirectByteArrayCopier.field3277[var0][var1 + 1]; // L: 534 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 536 - var10000 = DirectByteArrayCopier.field3277[var0][var1 + 1]; // L: 537 - var10000[var2] |= 585; - var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 538 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 540 - var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 541 - var10000[var2] |= 1170; - var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 542 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 545 - var7.method3838(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 546 - var6.method4144(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 549 - if (var8.animationId == -1 && var8.transforms == null) { // L: 551 - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 552 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 553 - if (var8.clipped) { // L: 554 - if (var4 == 0) { // L: 555 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 556 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 557 - GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 558 - GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 560 - var7.method3838(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 563 - if (var8.animationId == -1 && var8.transforms == null) { // L: 565 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 566 - } - - var6.method4138(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 567 - if (var8.interactType != 0 && var7 != null) { // L: 568 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 569 - var6.method4144(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 572 - if (var8.animationId == -1 && var8.transforms == null) { // L: 574 - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 575 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, 0, 0, var19, var21); // L: 576 - } else { - Object var25; - long var29; - if (var5 == 5) { // L: 579 - var28 = 16; // L: 580 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 581 - if (0L != var29) { // L: 582 - var28 = class116.getObjectDefinition(class121.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 584 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 585 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field988[var4], 0, var28 * Tiles.field990[var4], var28 * Tiles.field991[var4], var19, var21); // L: 586 - } else if (var5 == 6) { // L: 589 - var28 = 8; // L: 590 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 591 - if (0L != var29) { // L: 592 - var28 = class116.getObjectDefinition(class121.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 594 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 595 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field1000[var4], var28 * Tiles.field993[var4], var19, var21); // L: 596 - } else if (var5 == 7) { // L: 599 - var23 = var4 + 2 & 3; // L: 601 - if (var8.animationId == -1 && var8.transforms == null) { // L: 602 - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 603 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 604 - } else if (var5 == 8) { // L: 607 - var28 = 8; // L: 608 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 609 - if (0L != var29) { // L: 610 - var28 = class116.getObjectDefinition(class121.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 613 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 614 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 615 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 616 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 619 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 620 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field1000[var4], var28 * Tiles.field993[var4], var19, var21); // L: 622 - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 435 - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 436 - } - - if (var34 != null && var6.method4138(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 437 438 - var23 = 15; // L: 439 - if (var34 instanceof Model) { // L: 440 - var23 = ((Model)var34).method4360() / 4; // L: 441 - if (var23 > 30) { // L: 442 - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { // L: 444 - for (int var33 = 0; var33 <= var10; ++var33) { // L: 445 - if (var23 > GrandExchangeOfferNameComparator.field4010[var0][var24 + var1][var33 + var2]) { // L: 446 - GrandExchangeOfferNameComparator.field4010[var0][var24 + var1][var33 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 451 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } // L: 431 452 461 498 512 547 561 570 577 587 597 605 623 625 - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "694250385" - ) - static int method4559(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3789 - class295.Interpreter_intStackSize -= 2; // L: 3790 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3791 - int var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3792 - if (!Client.isCameraLocked) { // L: 3793 - Client.camAngleX = var3; // L: 3794 - Client.camAngleY = var4; // L: 3795 - } - - return 1; // L: 3797 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3799 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3800 - return 1; // L: 3801 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3803 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3804 - return 1; // L: 3805 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3807 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3808 - if (var3 < 0) { // L: 3809 - var3 = 0; - } - - Client.camFollowHeight = var3; // L: 3810 - return 1; // L: 3811 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3813 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3814 - return 1; // L: 3815 - } else { - return 2; // L: 3817 + byte[] var3 = new byte[var2]; // L: 67 + var0.offset += class282.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 68 + String var4 = class118.decodeStringCp1252(var3, 0, var2); // L: 69 + return var4; // L: 70 + } catch (Exception var6) { // L: 72 + return "Cabbage"; // L: 73 } } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 4c2140bddc..28d3342ccd 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,42 +1,38 @@ +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("iw") +@ObfuscatedName("ho") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; @ObfuscatedName("v") @Export("text") String text; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2139007223 + intValue = -748694571 ) @Export("width") int width; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2127405993 + intValue = 703588799 ) @Export("height") int height; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lgp;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILhh;)V" + descriptor = "(Ljava/lang/String;IILgp;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; // L: 10 @@ -45,12 +41,372 @@ public class WorldMapLabel { this.size = var4; // L: 13 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)J", - garbageValue = "-39" + descriptor = "(II)Lfq;", + garbageValue = "-1327829114" ) - public static long method4997(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 52 + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 + if (var1 != null) { // L: 28 + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 + var1 = new KitDefinition(); // L: 30 + if (var2 != null) { // L: 31 + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 + } } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-1060633923" + ) + static int method4354(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3267 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3268 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3269 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3270 + return 1; // L: 3271 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 3273 + class122.Interpreter_stringStackSize -= 2; // L: 3274 + var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3275 + var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3276 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3277 + return 1; // L: 3278 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3280 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3281 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3282 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + ItemLayer.intToString(var9, true); // L: 3283 + return 1; // L: 3284 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3286 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3287 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3288 + return 1; // L: 3289 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 3291 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3292 + long var13 = (11745L + (long)var10) * 86400000L; // L: 3293 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3294 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 3295 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3296 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3297 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3298 + return 1; // L: 3299 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3301 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3309 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3310 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3311 + return 1; // L: 3312 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3314 + class122.Interpreter_stringStackSize -= 2; // L: 3315 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannelMember.method2869(PlayerType.compareStrings(Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1], Skills.clientLanguage)); // L: 3316 + return 1; // L: 3317 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3319 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3320 + Interpreter.Interpreter_intStackSize -= 2; // L: 3321 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3322 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3323 + var11 = class166.archive13.takeFile(var5, 0); // L: 3324 + var12 = new Font(var11); // L: 3325 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3326 + return 1; // L: 3327 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3329 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3330 + Interpreter.Interpreter_intStackSize -= 2; // L: 3331 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3332 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3333 + var11 = class166.archive13.takeFile(var5, 0); // L: 3334 + var12 = new Font(var11); // L: 3335 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3336 + return 1; // L: 3337 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3339 + class122.Interpreter_stringStackSize -= 2; // L: 3340 + var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3341 + var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3342 + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 3343 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4; // L: 3344 + } + + return 1; // L: 3345 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3347 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3348 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3349 + return 1; // L: 3350 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3352 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3353 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3354 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3355 + return 1; // L: 3356 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3358 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3359 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPreferences.isCharPrintable((char)var10) ? 1 : 0; // L: 3360 + return 1; // L: 3361 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3363 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3364 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3365 + return 1; // L: 3366 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3368 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3369 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SoundSystem.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3370 + return 1; // L: 3371 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3373 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3374 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapElement.isDigit((char)var10) ? 1 : 0; // L: 3375 + return 1; // L: 3376 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3378 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3379 + if (var3 != null) { // L: 3380 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3381 + } + + return 1; // L: 3382 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3384 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3385 + Interpreter.Interpreter_intStackSize -= 2; // L: 3386 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3387 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3388 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3389 + return 1; // L: 3390 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3392 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3393 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3394 + boolean var16 = false; // L: 3395 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3396 + char var7 = var3.charAt(var6); // L: 3397 + if (var7 == '<') { // L: 3398 + var16 = true; + } else if (var7 == '>') { // L: 3399 + var16 = false; + } else if (!var16) { // L: 3400 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3402 + return 1; // L: 3403 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3405 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3406 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3407 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3408 + return 1; // L: 3409 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3411 + class122.Interpreter_stringStackSize -= 2; // L: 3412 + var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3413 + var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3414 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3415 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3416 + return 1; // L: 3417 + } else if (var0 == 4122) { // L: 3419 + var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3420 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3421 + return 1; // L: 3422 + } else { + return 2; // L: 3424 + } + } + } else { + class122.Interpreter_stringStackSize -= 2; // L: 3302 + var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3303 + var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3304 + if (GrandExchangeEvents.localPlayer.appearance != null && GrandExchangeEvents.localPlayer.appearance.isFemale) { // L: 3305 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3; // L: 3306 + } + + return 1; // L: 3307 + } + } + } + } + + @ObfuscatedName("hw") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-543558308" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5432 + int var4 = var1 >> 7; // L: 5433 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5434 + int var5 = var2; // L: 5435 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5436 + var5 = var2 + 1; + } + + int var6 = var0 & 127; // L: 5437 + int var7 = var1 & 127; // L: 5438 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5439 + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5440 + return var7 * var9 + var8 * (128 - var7) >> 7; // L: 5441 + } else { + return 0; + } + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1796221797" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class143.method3072(); // L: 12041 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 12043 + if (var1.obj != null) { // L: 12044 + var1.set(); + } + } + + int var3 = class134.VarpDefinition_get(var0).type; // L: 12047 + if (var3 != 0) { // L: 12048 + int var2 = Varps.Varps_main[var0]; // L: 12049 + if (var3 == 1) { // L: 12050 + if (var2 == 1) { // L: 12051 + KitDefinition.method3453(0.9D); + } + + if (var2 == 2) { // L: 12052 + KitDefinition.method3453(0.8D); + } + + if (var2 == 3) { // L: 12053 + KitDefinition.method3453(0.7D); + } + + if (var2 == 4) { // L: 12054 + KitDefinition.method3453(0.6D); + } + } + + if (var3 == 3) { // L: 12056 + if (var2 == 0) { // L: 12057 + class1.method11(255); + } + + if (var2 == 1) { // L: 12058 + class1.method11(192); + } + + if (var2 == 2) { // L: 12059 + class1.method11(128); + } + + if (var2 == 3) { // L: 12060 + class1.method11(64); + } + + if (var2 == 4) { // L: 12061 + class1.method11(0); + } + } + + if (var3 == 4) { // L: 12063 + if (var2 == 0) { // L: 12064 + class126.method2824(127); + } + + if (var2 == 1) { // L: 12065 + class126.method2824(96); + } + + if (var2 == 2) { // L: 12066 + class126.method2824(64); + } + + if (var2 == 3) { // L: 12067 + class126.method2824(32); + } + + if (var2 == 4) { // L: 12068 + class126.method2824(0); + } + } + + if (var3 == 5) { // L: 12070 + Client.leftClickOpensMenu = var2; + } + + if (var3 == 6) { + Client.chatEffects = var2; // L: 12071 + } + + if (var3 == 9) { // L: 12072 + Client.field524 = var2; + } + + if (var3 == 10) { // L: 12073 + if (var2 == 0) { // L: 12074 + class127.method2830(127); + } + + if (var2 == 1) { // L: 12075 + class127.method2830(96); + } + + if (var2 == 2) { // L: 12076 + class127.method2830(64); + } + + if (var2 == 3) { // L: 12077 + class127.method2830(32); + } + + if (var2 == 4) { // L: 12078 + class127.method2830(0); + } + } + + if (var3 == 17) { // L: 12080 + Client.followerIndex = var2 & 65535; // L: 12081 + } + + if (var3 == 18) { // L: 12083 + Client.playerAttackOption = (AttackOption)MusicPatchPcmStream.findEnumerated(FriendSystem.method1743(), var2); // L: 12084 + if (Client.playerAttackOption == null) { // L: 12085 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var3 == 19) { // L: 12087 + if (var2 == -1) { // L: 12088 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 12089 + } + } + + if (var3 == 22) { // L: 12091 + Client.npcAttackOption = (AttackOption)MusicPatchPcmStream.findEnumerated(FriendSystem.method1743(), var2); // L: 12092 + if (Client.npcAttackOption == null) { // L: 12093 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 12095 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 5f699736c1..3a7f165429 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,602 +4,226 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("gp") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lgp;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lgp;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lgp;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 20552781 + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "[Lqi;" ) - final int field2655; - @ObfuscatedName("l") + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("if") @ObfuscatedGetter( - intValue = -1586043627 + intValue = -131170417 ) - final int field2659; + @Export("cameraX") + static int cameraX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1256735251 + ) + final int field2208; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 624849635 + ) + final int field2215; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1941962617 + intValue = -1061569375 ) - final int field2660; + final int field2210; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 - WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); // L: 9 + WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); // L: 7 + WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); // L: 8 + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); // L: 9 } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2655 = var1; // L: 15 - this.field2659 = var2; // L: 16 - this.field2660 = var3; // L: 17 - } // L: 18 + this.field2208 = var1; // L: 19 + this.field2215 = var2; // L: 20 + this.field2210 = var3; // L: 21 + } // L: 22 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(FB)Z", + garbageValue = "89" + ) + boolean method3902(float var1) { + return var1 >= (float)this.field2210; // L: 25 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(FI)Z", - garbageValue = "1896293500" + descriptor = "(I)[Lgp;", + garbageValue = "10456859" ) - boolean method4532(float var1) { - return var1 >= (float)this.field2660; // L: 21 + static WorldMapLabelSize[] method3901() { + return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; // L: 15 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)Lhh;", - garbageValue = "316575905" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-697751860" ) - static WorldMapLabelSize method4536(int var0) { - WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 28 - WorldMapLabelSize[] var2 = var1; // L: 30 + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 131 + int var2 = 0; // L: 132 - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 - WorldMapLabelSize var4 = var2[var3]; // L: 32 - if (var0 == var4.field2659) { // L: 34 - return var4; // L: 35 - } + for (int var3 = 0; var3 < var1; ++var3) { // L: 133 + var2 = (var2 << 5) - var2 + class327.charToByteCp1252(var0.charAt(var3)); } - return null; // L: 40 + return var2; // L: 134 } - @ObfuscatedName("l") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpy;II)V", - garbageValue = "-2009640546" + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-2017129698" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 199 - if (var2) { // L: 200 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } + static final void method3903(String var0, int var1) { + PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 214 + var2.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 215 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 216 + var2.packetBuffer.method7804(var1); // L: 217 + Client.packetWriter.addNode(var2); // L: 218 + } // L: 219 - int var3 = var0.readBits(2); // L: 201 - Player var4 = Client.players[var1]; // L: 202 - if (var3 == 0) { // L: 203 - if (var2) { // L: 204 - var4.field1109 = false; // L: 205 - } else if (Client.localPlayerIndex == var1) { // L: 208 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class250.baseY + var4.pathY[0] >> 13) + (ApproximateRouteStrategy.baseX + var4.pathX[0] >> 13 << 14); // L: 209 - if (var4.field1160 != -1) { // L: 210 - Players.Players_orientations[var1] = var4.field1160; - } else { - Players.Players_orientations[var1] = var4.orientation; // L: 211 - } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 212 - Client.players[var1] = null; // L: 213 - if (var0.readBits(1) != 0) { // L: 214 - class9.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { // L: 217 - var5 = var0.readBits(3); // L: 218 - var6 = var4.pathX[0]; // L: 219 - var7 = var4.pathY[0]; // L: 220 - if (var5 == 0) { // L: 221 - --var6; // L: 222 - --var7; // L: 223 - } else if (var5 == 1) { // L: 225 - --var7; - } else if (var5 == 2) { // L: 226 - ++var6; // L: 227 - --var7; // L: 228 - } else if (var5 == 3) { // L: 230 - --var6; - } else if (var5 == 4) { // L: 231 - ++var6; - } else if (var5 == 5) { // L: 232 - --var6; // L: 233 - ++var7; // L: 234 - } else if (var5 == 6) { // L: 236 - ++var7; - } else if (var5 == 7) { // L: 237 - ++var6; // L: 238 - ++var7; // L: 239 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 241 - var4.resetPath(var6, var7); // L: 242 - var4.field1109 = false; // L: 243 - } else if (var2) { // L: 245 - var4.field1109 = true; // L: 246 - var4.tileX = var6; // L: 247 - var4.tileY = var7; // L: 248 - } else { - var4.field1109 = false; // L: 251 - var4.method2144(var6, var7, Players.field1285[var1]); // L: 252 - } - - } else if (var3 == 2) { // L: 256 - var5 = var0.readBits(4); // L: 257 - var6 = var4.pathX[0]; // L: 258 - var7 = var4.pathY[0]; // L: 259 - if (var5 == 0) { // L: 260 - var6 -= 2; // L: 261 - var7 -= 2; // L: 262 - } else if (var5 == 1) { // L: 264 - --var6; // L: 265 - var7 -= 2; // L: 266 - } else if (var5 == 2) { // L: 268 - var7 -= 2; - } else if (var5 == 3) { // L: 269 - ++var6; // L: 270 - var7 -= 2; // L: 271 - } else if (var5 == 4) { // L: 273 - var6 += 2; // L: 274 - var7 -= 2; // L: 275 - } else if (var5 == 5) { // L: 277 - var6 -= 2; // L: 278 - --var7; // L: 279 - } else if (var5 == 6) { // L: 281 - var6 += 2; // L: 282 - --var7; // L: 283 - } else if (var5 == 7) { // L: 285 - var6 -= 2; - } else if (var5 == 8) { // L: 286 - var6 += 2; - } else if (var5 == 9) { // L: 287 - var6 -= 2; // L: 288 - ++var7; // L: 289 - } else if (var5 == 10) { // L: 291 - var6 += 2; // L: 292 - ++var7; // L: 293 - } else if (var5 == 11) { // L: 295 - var6 -= 2; // L: 296 - var7 += 2; // L: 297 - } else if (var5 == 12) { // L: 299 - --var6; // L: 300 - var7 += 2; // L: 301 - } else if (var5 == 13) { // L: 303 - var7 += 2; - } else if (var5 == 14) { // L: 304 - ++var6; // L: 305 - var7 += 2; // L: 306 - } else if (var5 == 15) { // L: 308 - var6 += 2; // L: 309 - var7 += 2; // L: 310 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 312 - var4.resetPath(var6, var7); // L: 313 - var4.field1109 = false; // L: 314 - } else if (var2) { // L: 316 - var4.field1109 = true; // L: 317 - var4.tileX = var6; // L: 318 - var4.tileY = var7; // L: 319 - } else { - var4.field1109 = false; // L: 322 - var4.method2144(var6, var7, Players.field1285[var1]); // L: 323 - } - - } else { - var5 = var0.readBits(1); // L: 327 - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { // L: 328 - var6 = var0.readBits(12); // L: 329 - var7 = var6 >> 10; // L: 330 - var8 = var6 >> 5 & 31; // L: 331 - if (var8 > 15) { // L: 332 - var8 -= 32; - } - - var9 = var6 & 31; // L: 333 - if (var9 > 15) { // L: 334 - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; // L: 335 - var11 = var9 + var4.pathY[0]; // L: 336 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 337 - var4.resetPath(var10, var11); // L: 338 - var4.field1109 = false; // L: 339 - } else if (var2) { // L: 341 - var4.field1109 = true; // L: 342 - var4.tileX = var10; // L: 343 - var4.tileY = var11; // L: 344 - } else { - var4.field1109 = false; // L: 347 - var4.method2144(var10, var11, Players.field1285[var1]); // L: 348 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 350 - if (Client.localPlayerIndex == var1) { // L: 351 - class160.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); // L: 354 - var7 = var6 >> 28; // L: 355 - var8 = var6 >> 14 & 16383; // L: 356 - var9 = var6 & 16383; // L: 357 - var10 = (var8 + ApproximateRouteStrategy.baseX + var4.pathX[0] & 16383) - ApproximateRouteStrategy.baseX; // L: 358 - var11 = (var9 + class250.baseY + var4.pathY[0] & 16383) - class250.baseY; // L: 359 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 360 - var4.resetPath(var10, var11); // L: 361 - var4.field1109 = false; // L: 362 - } else if (var2) { // L: 364 - var4.field1109 = true; // L: 365 - var4.tileX = var10; // L: 366 - var4.tileY = var11; // L: 367 - } else { - var4.field1109 = false; // L: 370 - var4.method2144(var10, var11, Players.field1285[var1]); // L: 371 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 373 - if (Client.localPlayerIndex == var1) { // L: 374 - class160.Client_plane = var4.plane; - } - - } - } - } - } // L: 206 215 254 325 352 375 - - @ObfuscatedName("hl") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(Lco;IB)V", - garbageValue = "-2" + descriptor = "(IIIILjava/lang/String;B)V", + garbageValue = "-40" ) - static final void method4533(Actor var0, int var1) { - class10.worldToScreen(var0.x, var0.y, var1); // L: 4976 - } // L: 4977 - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(Lkn;IIB)V", - garbageValue = "-77" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 10397 - SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10398 - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10401 - var3 = InvDefinition.Widget_getSpellActionName(var0); // L: 10402 - if (var3 != null) { // L: 10403 - SecureRandomFuture.insertMenuItemNoShift(var3, ChatChannel.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10404 + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ItemComposition.getWidgetChild(var1, var2); // L: 9688 + if (var5 != null) { // L: 9689 + if (var5.onOp != null) { // L: 9690 + ScriptEvent var6 = new ScriptEvent(); // L: 9691 + var6.widget = var5; // L: 9692 + var6.opIndex = var0; // L: 9693 + var6.targetName = var4; // L: 9694 + var6.args = var5.onOp; // L: 9695 + ClanSettings.runScriptEvent(var6); // L: 9696 } - } - if (var0.buttonType == 3) { // L: 10408 - SecureRandomFuture.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10409 - } + boolean var11 = true; // L: 9698 + if (var5.contentType > 0) { // L: 9699 + var11 = ModeWhere.method6100(var5); + } - if (var0.buttonType == 4) { // L: 10412 - SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10413 - } - - if (var0.buttonType == 5) { // L: 10416 - SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10417 - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10420 - SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10421 - } - - int var4; - int var13; - if (var0.type == 2) { // L: 10424 - var13 = 0; // L: 10425 - - for (var4 = 0; var4 < var0.height; ++var4) { // L: 10426 - for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10427 - int var16 = (var0.paddingX + 32) * var15; // L: 10428 - int var7 = (var0.paddingY + 32) * var4; // L: 10429 - if (var13 < 20) { // L: 10430 - var16 += var0.inventoryXOffsets[var13]; // L: 10431 - var7 += var0.inventoryYOffsets[var13]; // L: 10432 + if (var11) { // L: 9700 + int var8 = class326.getWidgetFlags(var5); // L: 9702 + int var9 = var0 - 1; // L: 9703 + boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9705 + if (var7) { // L: 9707 + PacketBufferNode var10; + if (var0 == 1) { // L: 9710 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2908, Client.packetWriter.isaacCipher); // L: 9712 + var10.packetBuffer.writeInt(var1); // L: 9713 + var10.packetBuffer.writeShort(var2); // L: 9714 + var10.packetBuffer.writeShort(var3); // L: 9715 + Client.packetWriter.addNode(var10); // L: 9716 } - if (var1 >= var16 && var2 >= var7 && var1 < var16 + 32 && var2 < var7 + 32) { // L: 10434 - Client.dragItemSlotDestination = var13; // L: 10435 - GrandExchangeEvent.hoveredItemContainer = var0; // L: 10436 - if (var0.itemIds[var13] > 0) { // L: 10437 - ItemComposition var8 = class67.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10438 - if (Client.isItemSelected == 1 && FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10439 - if (var0.id != PendingSpawn.selectedItemWidget || var13 != class19.selectedItemSlot) { // L: 10440 - SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10441 - } - } else if (Client.isSpellSelected && FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10445 - if ((class154.selectedSpellFlags & 16) == 16) { // L: 10446 - SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10447 - } - } else { - String[] var9 = var8.inventoryActions; // L: 10452 - int var10 = -1; // L: 10453 - if (Client.shiftClickDrop) { // L: 10454 - boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10457 - if (var11) { // L: 10459 - var10 = var8.getShiftClickIndex(); // L: 10460 - } - } - - int var17; - if (FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10463 - for (var17 = 4; var17 >= 3; --var17) { // L: 10464 - if (var10 != var17) { // L: 10465 - DirectByteArrayCopier.addWidgetItemMenuItem(var0, var8, var13, var17, false); // L: 10466 - } - } - } - - if (VarbitComposition.method3561(WorldMapSection2.getWidgetFlags(var0))) { // L: 10469 - SecureRandomFuture.insertMenuItemNoShift("Use", ChatChannel.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10470 - } - - if (FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10473 - for (var17 = 2; var17 >= 0; --var17) { // L: 10474 - if (var10 != var17) { // L: 10475 - DirectByteArrayCopier.addWidgetItemMenuItem(var0, var8, var13, var17, false); // L: 10476 - } - } - - if (var10 >= 0) { // L: 10478 - DirectByteArrayCopier.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10479 - } - } - - var9 = var0.itemActions; // L: 10482 - if (var9 != null) { // L: 10483 - for (var17 = 4; var17 >= 0; --var17) { // L: 10484 - if (var9[var17] != null) { // L: 10485 - byte var12 = 0; // L: 10486 - if (var17 == 0) { // L: 10487 - var12 = 39; - } - - if (var17 == 1) { // L: 10488 - var12 = 40; - } - - if (var17 == 2) { // L: 10489 - var12 = 41; - } - - if (var17 == 3) { // L: 10490 - var12 = 42; - } - - if (var17 == 4) { // L: 10491 - var12 = 43; - } - - SecureRandomFuture.insertMenuItemNoShift(var9[var17], ChatChannel.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10492 - } - } - } - - SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10497 - } - } + if (var0 == 2) { // L: 9718 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2945, Client.packetWriter.isaacCipher); // L: 9720 + var10.packetBuffer.writeInt(var1); // L: 9721 + var10.packetBuffer.writeShort(var2); // L: 9722 + var10.packetBuffer.writeShort(var3); // L: 9723 + Client.packetWriter.addNode(var10); // L: 9724 + } + + if (var0 == 3) { // L: 9726 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2941, Client.packetWriter.isaacCipher); // L: 9728 + var10.packetBuffer.writeInt(var1); // L: 9729 + var10.packetBuffer.writeShort(var2); // L: 9730 + var10.packetBuffer.writeShort(var3); // L: 9731 + Client.packetWriter.addNode(var10); // L: 9732 + } + + if (var0 == 4) { // L: 9734 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2966, Client.packetWriter.isaacCipher); // L: 9736 + var10.packetBuffer.writeInt(var1); // L: 9737 + var10.packetBuffer.writeShort(var2); // L: 9738 + var10.packetBuffer.writeShort(var3); // L: 9739 + Client.packetWriter.addNode(var10); // L: 9740 + } + + if (var0 == 5) { // L: 9742 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 9744 + var10.packetBuffer.writeInt(var1); // L: 9745 + var10.packetBuffer.writeShort(var2); // L: 9746 + var10.packetBuffer.writeShort(var3); // L: 9747 + Client.packetWriter.addNode(var10); // L: 9748 + } + + if (var0 == 6) { // L: 9750 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2944, Client.packetWriter.isaacCipher); // L: 9752 + var10.packetBuffer.writeInt(var1); // L: 9753 + var10.packetBuffer.writeShort(var2); // L: 9754 + var10.packetBuffer.writeShort(var3); // L: 9755 + Client.packetWriter.addNode(var10); // L: 9756 + } + + if (var0 == 7) { // L: 9758 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2982, Client.packetWriter.isaacCipher); // L: 9760 + var10.packetBuffer.writeInt(var1); // L: 9761 + var10.packetBuffer.writeShort(var2); // L: 9762 + var10.packetBuffer.writeShort(var3); // L: 9763 + Client.packetWriter.addNode(var10); // L: 9764 + } + + if (var0 == 8) { // L: 9766 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 9768 + var10.packetBuffer.writeInt(var1); // L: 9769 + var10.packetBuffer.writeShort(var2); // L: 9770 + var10.packetBuffer.writeShort(var3); // L: 9771 + Client.packetWriter.addNode(var10); // L: 9772 + } + + if (var0 == 9) { // L: 9774 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9776 + var10.packetBuffer.writeInt(var1); // L: 9777 + var10.packetBuffer.writeShort(var2); // L: 9778 + var10.packetBuffer.writeShort(var3); // L: 9779 + Client.packetWriter.addNode(var10); // L: 9780 + } + + if (var0 == 10) { // L: 9782 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2917, Client.packetWriter.isaacCipher); // L: 9784 + var10.packetBuffer.writeInt(var1); // L: 9785 + var10.packetBuffer.writeShort(var2); // L: 9786 + var10.packetBuffer.writeShort(var3); // L: 9787 + Client.packetWriter.addNode(var10); // L: 9788 } - ++var13; // L: 10502 } } } - - if (var0.isIf3) { // L: 10506 - if (Client.isSpellSelected) { // L: 10507 - var4 = WorldMapSection2.getWidgetFlags(var0); // L: 10509 - boolean var18 = (var4 >> 21 & 1) != 0; // L: 10511 - if (var18 && (class154.selectedSpellFlags & 32) == 32) { // L: 10513 - SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10514 - } - } else { - for (var13 = 9; var13 >= 5; --var13) { // L: 10519 - String var14; - if (!class142.method3004(WorldMapSection2.getWidgetFlags(var0), var13) && var0.onOp == null) { // L: 10522 - var14 = null; // L: 10523 - } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { // L: 10526 - var14 = var0.actions[var13]; // L: 10530 - } else { - var14 = null; // L: 10527 - } - - if (var14 != null) { // L: 10533 - SecureRandomFuture.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10534 - } - } - - var3 = InvDefinition.Widget_getSpellActionName(var0); // L: 10538 - if (var3 != null) { // L: 10539 - SecureRandomFuture.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10540 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 10543 - String var5; - if (!class142.method3004(WorldMapSection2.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10546 - var5 = null; // L: 10547 - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10550 - var5 = var0.actions[var4]; // L: 10554 - } else { - var5 = null; // L: 10551 - } - - if (var5 != null) { // L: 10557 - DynamicObject.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10558 - } - } - - if (class431.method7673(WorldMapSection2.getWidgetFlags(var0))) { // L: 10562 - SecureRandomFuture.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10563 - } - } - } - - } // L: 10568 - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(Lkn;IIII)V", - garbageValue = "-809248194" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - MouseHandler.playPcmPlayers(); // L: 11557 - SpriteMask var4 = var0.getSpriteMask(false); // L: 11558 - if (var4 != null) { // L: 11559 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11560 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11561 - int var5 = Client.camAngleY & 2047; // L: 11562 - int var6 = class19.localPlayer.x / 32 + 48; // L: 11563 - int var7 = 464 - class19.localPlayer.y / 32; // L: 11564 - MusicPatchNode2.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11565 - - int var8; - int var10; - int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11566 - var16 = Client.mapIconXs[var8] * 4 + 2 - class19.localPlayer.x / 32; // L: 11567 - var10 = Client.mapIconYs[var8] * 4 + 2 - class19.localPlayer.y / 32; // L: 11568 - Messages.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11569 - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 11571 - for (var16 = 0; var16 < 104; ++var16) { // L: 11572 - NodeDeque var14 = Client.groundItems[class160.Client_plane][var8][var16]; // L: 11573 - if (var14 != null) { // L: 11574 - var11 = var8 * 4 + 2 - class19.localPlayer.x / 32; // L: 11575 - var12 = var16 * 4 + 2 - class19.localPlayer.y / 32; // L: 11576 - Messages.drawSpriteOnMinimap(var1, var2, var11, var12, class142.mapDotSprites[0], var4); // L: 11577 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11581 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11582 - if (var9 != null && var9.isVisible()) { // L: 11583 - NPCComposition var18 = var9.definition; // L: 11584 - if (var18 != null && var18.transforms != null) { // L: 11585 - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11586 - var11 = var9.x / 32 - class19.localPlayer.x / 32; // L: 11587 - var12 = var9.y / 32 - class19.localPlayer.y / 32; // L: 11588 - Messages.drawSpriteOnMinimap(var1, var2, var11, var12, class142.mapDotSprites[1], var4); // L: 11589 - } - } - } - - var8 = Players.Players_count; // L: 11593 - int[] var17 = Players.Players_indices; // L: 11594 - - for (var10 = 0; var10 < var8; ++var10) { // L: 11595 - Player var15 = Client.players[var17[var10]]; // L: 11596 - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class19.localPlayer) { // L: 11597 - var12 = var15.x / 32 - class19.localPlayer.x / 32; // L: 11598 - int var13 = var15.y / 32 - class19.localPlayer.y / 32; // L: 11599 - if (var15.isFriend()) { // L: 11600 - Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[3], var4); - } else if (class19.localPlayer.team != 0 && var15.team != 0 && var15.team == class19.localPlayer.team) { // L: 11601 - Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { // L: 11602 - Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { // L: 11603 - Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[6], var4); - } else { - Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[2], var4); // L: 11604 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11607 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11608 - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11609 - if (var19 != null) { // L: 11610 - var11 = var19.x / 32 - class19.localPlayer.x / 32; // L: 11611 - var12 = var19.y / 32 - class19.localPlayer.y / 32; // L: 11612 - NetFileRequest.worldToMinimap(var1, var2, var11, var12, class17.mapMarkerSprites[1], var4); // L: 11613 - } - } - - if (Client.hintArrowType == 2) { // L: 11616 - var10 = Client.hintArrowX * 4 - ApproximateRouteStrategy.baseX * 4 + 2 - class19.localPlayer.x / 32; // L: 11617 - var11 = Client.hintArrowY * 4 - class250.baseY * 4 + 2 - class19.localPlayer.y / 32; // L: 11618 - NetFileRequest.worldToMinimap(var1, var2, var10, var11, class17.mapMarkerSprites[1], var4); // L: 11619 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11621 - Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11622 - if (var20 != null) { // L: 11623 - var11 = var20.x / 32 - class19.localPlayer.x / 32; // L: 11624 - var12 = var20.y / 32 - class19.localPlayer.y / 32; // L: 11625 - NetFileRequest.worldToMinimap(var1, var2, var11, var12, class17.mapMarkerSprites[1], var4); // L: 11626 - } - } - } - - if (Client.destinationX != 0) { // L: 11630 - var10 = Client.destinationX * 4 + 2 - class19.localPlayer.x / 32; // L: 11631 - var11 = Client.destinationY * 4 + 2 - class19.localPlayer.y / 32; // L: 11632 - Messages.drawSpriteOnMinimap(var1, var2, var10, var11, class17.mapMarkerSprites[0], var4); // L: 11633 - } - - if (!class19.localPlayer.isHidden) { // L: 11635 - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11637 - } - - Client.field651[var3] = true; // L: 11638 - } - } // L: 11639 + } // L: 9708 9790 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 27951cd50f..21f2a15993 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,98 +9,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("gq") @Implements("WorldMapManager") public final class WorldMapManager { @ObfuscatedName("v") @Export("loaded") boolean loaded; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lhi;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqi;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("l") + @ObfuscatedName("b") @Export("icons") HashMap icons; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[Lhc;" + descriptor = "[[Lgd;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("d") + @ObfuscatedName("s") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lqx;" + descriptor = "[Lqq;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("k") + @ObfuscatedName("r") @Export("fonts") final HashMap fonts; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2068751219 + intValue = -851451677 ) @Export("tileX") int tileX; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2084876633 + intValue = 1258410279 ) @Export("tileY") int tileY; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1750023639 + intValue = 925141589 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -193114835 + intValue = -1725085239 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2082806479 + intValue = 1463105989 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lqx;Ljava/util/HashMap;Llq;Llq;)V" + descriptor = "([Lqq;Ljava/util/HashMap;Lln;Lln;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 this.loadStarted = false; // L: 17 - this.scaleHandlers = new HashMap(); // L: 22 + this.scaleHandlers = new HashMap(); this.pixelsPerTile = 0; // L: 31 this.mapSceneSprites = var1; // L: 34 this.fonts = var2; // L: 35 @@ -110,8 +110,8 @@ public final class WorldMapManager { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Ljava/lang/String;ZI)V", - garbageValue = "-396551164" + descriptor = "(Lln;Ljava/lang/String;ZI)V", + garbageValue = "-2044848511" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -119,10 +119,10 @@ public final class WorldMapManager { this.loaded = false; // L: 44 this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field2849.name); // L: 47 + int var4 = var1.getGroupId(WorldMapCacheName.field2413.name); // L: 47 int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2849.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2847.name, var2)); // L: 50 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2413.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2414.name, var2)); // L: 50 System.nanoTime(); // L: 51 System.nanoTime(); // L: 52 this.mapAreaData = new WorldMapAreaData(); // L: 53 @@ -144,320 +144,330 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 System.nanoTime(); // L: 69 System.nanoTime(); // L: 70 - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 72 - this.regions = new WorldMapRegion[var16][var9]; // L: 74 - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 75 + AbstractWorldMapIcon.method4429(); // L: 71 + this.regions = new WorldMapRegion[var16][var9]; // L: 72 + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 while (var10.hasNext()) { - WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 76 - int var12 = var11.regionX; // L: 78 - int var13 = var11.regionY; // L: 79 - int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 80 - int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 81 - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 82 - this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 83 + WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 + int var12 = var11.regionX; // L: 76 + int var13 = var11.regionY; // L: 77 + int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78 + int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79 + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 80 + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 81 } - for (int var17 = 0; var17 < var16; ++var17) { // L: 86 - for (int var18 = 0; var18 < var9; ++var18) { // L: 87 - if (this.regions[var17][var18] == null) { // L: 88 - this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 89 - this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 90 + for (int var17 = 0; var17 < var16; ++var17) { // L: 84 + for (int var18 = 0; var18 < var9; ++var18) { // L: 85 + if (this.regions[var17][var18] == null) { // L: 86 + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87 + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88 } } } - System.nanoTime(); // L: 94 - System.nanoTime(); // L: 95 - if (var1.isValidFileName(WorldMapCacheName.field2846.name, var2)) { // L: 96 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2846.name, var2); // L: 97 - this.compositeTextureSprite = class29.method433(var20); // L: 98 + System.nanoTime(); // L: 92 + System.nanoTime(); // L: 93 + if (var1.isValidFileName(WorldMapCacheName.field2418.name, var2)) { // L: 94 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2418.name, var2); // L: 95 + this.compositeTextureSprite = Interpreter.method1889(var20); // L: 96 } - System.nanoTime(); // L: 100 - var1.clearGroups(); // L: 101 - var1.clearFiles(); // L: 102 - this.loaded = true; // L: 103 + System.nanoTime(); // L: 98 + var1.clearGroups(); // L: 99 + var1.clearFiles(); // L: 100 + this.loaded = true; // L: 101 } - } // L: 42 104 + } // L: 42 102 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "32" + garbageValue = "-59" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 107 - } // L: 108 + this.icons = null; // L: 105 + } // L: 106 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIIIIIIS)V", - garbageValue = "7979" + descriptor = "(IIIIIIIII)V", + garbageValue = "-2135709682" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 111 - int var10 = Rasterizer2D.Rasterizer2D_width; // L: 112 - int var11 = Rasterizer2D.Rasterizer2D_height; // L: 113 - int[] var12 = new int[4]; // L: 114 - Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 115 - WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 116 - float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 117 - int var15 = (int)Math.ceil((double)var14); // L: 118 - this.pixelsPerTile = var15; // L: 119 - if (!this.scaleHandlers.containsKey(var15)) { // L: 120 - WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 121 - var16.init(); // L: 122 - this.scaleHandlers.put(var15, var16); // L: 123 + int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109 + int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110 + int var11 = Rasterizer2D.Rasterizer2D_height; // L: 111 + int[] var12 = new int[4]; // L: 112 + Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 113 + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114 + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 115 + int var15 = (int)Math.ceil((double)var14); // L: 116 + this.pixelsPerTile = var15; // L: 117 + if (!this.scaleHandlers.containsKey(var15)) { // L: 118 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 119 + var16.init(); // L: 120 + this.scaleHandlers.put(var15, var16); // L: 121 } - int var23 = var13.width + var13.x - 1; // L: 125 - int var17 = var13.height + var13.y - 1; // L: 126 + int var23 = var13.x + var13.width - 1; // L: 123 + int var17 = var13.y + var13.height - 1; // L: 124 int var18; int var19; - for (var18 = var13.x; var18 <= var23; ++var18) { // L: 127 - for (var19 = var13.y; var19 <= var17; ++var19) { // L: 128 - this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 129 + for (var18 = var13.x; var18 <= var23; ++var18) { // L: 125 + for (var19 = var13.y; var19 <= var17; ++var19) { // L: 126 + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 127 } } - Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 132 - Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 133 - var18 = (int)(var14 * 64.0F); // L: 134 - var19 = this.tileX + var1; // L: 135 - int var20 = var2 + this.tileY; // L: 136 + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130 + Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131 + var18 = (int)(var14 * 64.0F); // L: 132 + var19 = this.tileX + var1; // L: 133 + int var20 = var2 + this.tileY; // L: 134 - for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 137 - for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 138 - this.regions[var21][var22].method4677(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 + for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 135 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 136 + this.regions[var21][var22].method4039(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137 } } - } // L: 142 + } // L: 140 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-864172126" + garbageValue = "-2068355734" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { - WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 145 - float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146 - int var16 = (int)(64.0F * var15); // L: 147 - int var17 = this.tileX + var1; // L: 148 - int var18 = var2 + this.tileY; // L: 149 + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143 + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144 + int var16 = (int)(64.0F * var15); // L: 145 + int var17 = this.tileX + var1; // L: 146 + int var18 = var2 + this.tileY; // L: 147 int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 150 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151 - if (var13) { // L: 152 - this.regions[var19][var20].initWorldMapIcon1s(); // L: 153 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 148 + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 149 + if (var13) { // L: 150 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 } - this.regions[var19][var20].method4682(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 + this.regions[var19][var20].method4097(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153 } } - if (var10 != null && var11 > 0) { // L: 158 - for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 159 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160 - this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161 + if (var10 != null && var11 > 0) { // L: 156 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 157 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 158 + this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 } } } - } // L: 165 + } // L: 163 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;III)V", - garbageValue = "-1480785183" + descriptor = "(IIIILjava/util/HashSet;IIB)V", + garbageValue = "-36" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { - if (this.compositeTextureSprite != null) { // L: 168 - this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 171 - if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 172 - if (this.icons == null) { // L: 175 - this.buildIcons0(); // L: 176 + if (this.compositeTextureSprite != null) { // L: 166 + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169 + if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170 + if (this.icons == null) { // L: 173 + this.buildIcons0(); // L: 174 } - Iterator var8 = var5.iterator(); // L: 178 + Iterator var8 = var5.iterator(); // L: 176 while (true) { List var10; do { if (!var8.hasNext()) { - return; // L: 195 + return; // L: 193 } - int var9 = (Integer)var8.next(); // L: 179 - var10 = (List)this.icons.get(var9); // L: 181 - } while(var10 == null); // L: 182 + int var9 = (Integer)var8.next(); // L: 177 + var10 = (List)this.icons.get(var9); // L: 179 + } while(var10 == null); // L: 180 - Iterator var11 = var10.iterator(); // L: 185 + Iterator var11 = var10.iterator(); // L: 183 - while (var11.hasNext()) { - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186 - int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188 - int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 190 + while (var11.hasNext()) { // L: 190 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 184 + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 186 + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 187 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 188 } } } } - } // L: 169 173 + } // L: 167 171 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "2009648637" + descriptor = "(IIIIIIIIIIB)Ljava/util/List;", + garbageValue = "-46" ) - public List method4806(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - LinkedList var11 = new LinkedList(); // L: 198 - if (!this.loaded) { // L: 199 - return var11; // L: 200 + public List method4186(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + LinkedList var11 = new LinkedList(); // L: 196 + if (!this.loaded) { // L: 197 + return var11; // L: 198 } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202 - float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203 - int var14 = (int)(var13 * 64.0F); // L: 204 - int var15 = this.tileX + var1; // L: 205 - int var16 = var2 + this.tileY; // L: 206 + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200 + float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201 + int var14 = (int)(64.0F * var13); // L: 202 + int var15 = this.tileX + var1; // L: 203 + int var16 = var2 + this.tileY; // L: 204 - for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 207 - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 208 - List var19 = this.regions[var17][var18].method4703(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209 - if (!var19.isEmpty()) { // L: 210 - var11.addAll(var19); // L: 211 + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 205 + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 206 + List var19 = this.regions[var17][var18].method4069(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207 + if (!var19.isEmpty()) { // L: 208 + var11.addAll(var19); // L: 209 } } } - return var11; // L: 215 + return var11; // L: 213 } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIII)Liz;", - garbageValue = "-1833992171" + descriptor = "(IIIII)Lhj;", + garbageValue = "-1952906949" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { - WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 219 - int var6 = this.tileX + var1; // L: 220 - int var7 = var2 + this.tileY; // L: 221 - int var8 = var3 + this.tileX; // L: 222 - int var9 = var4 + this.tileY; // L: 223 - int var10 = var6 / 64; // L: 224 - int var11 = var7 / 64; // L: 225 - int var12 = var8 / 64; // L: 226 - int var13 = var9 / 64; // L: 227 - var5.width = var12 - var10 + 1; // L: 228 - var5.height = var13 - var11 + 1; // L: 229 - var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 230 - var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 231 - if (var5.x < 0) { // L: 232 - var5.width += var5.x; // L: 233 - var5.x = 0; // L: 234 + WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217 + int var6 = this.tileX + var1; // L: 218 + int var7 = var2 + this.tileY; // L: 219 + int var8 = var3 + this.tileX; // L: 220 + int var9 = var4 + this.tileY; // L: 221 + int var10 = var6 / 64; // L: 222 + int var11 = var7 / 64; // L: 223 + int var12 = var8 / 64; // L: 224 + int var13 = var9 / 64; // L: 225 + var5.width = var12 - var10 + 1; // L: 226 + var5.height = var13 - var11 + 1; // L: 227 + var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 228 + var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 229 + if (var5.x < 0) { // L: 230 + var5.width += var5.x; // L: 231 + var5.x = 0; // L: 232 } - if (var5.x > this.regions.length - var5.width) { // L: 236 - var5.width = this.regions.length - var5.x; // L: 237 + if (var5.x > this.regions.length - var5.width) { // L: 234 + var5.width = this.regions.length - var5.x; // L: 235 } - if (var5.y < 0) { // L: 239 - var5.height += var5.y; // L: 240 - var5.y = 0; // L: 241 + if (var5.y < 0) { // L: 237 + var5.height += var5.y; // L: 238 + var5.y = 0; // L: 239 } - if (var5.y > this.regions[0].length - var5.height) { // L: 243 - var5.height = this.regions[0].length - var5.y; // L: 244 + if (var5.y > this.regions[0].length - var5.height) { // L: 241 + var5.height = this.regions[0].length - var5.y; // L: 242 } - var5.width = Math.min(var5.width, this.regions.length); // L: 246 - var5.height = Math.min(var5.height, this.regions[0].length); // L: 247 - return var5; // L: 248 + var5.width = Math.min(var5.width, this.regions.length); // L: 244 + var5.height = Math.min(var5.height, this.regions[0].length); // L: 245 + return var5; // L: 246 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1503029363" + ) + @Export("isLoaded") + public boolean isLoaded() { + return this.loaded; // L: 250 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Ljava/util/HashMap;", + garbageValue = "-9" + ) + @Export("buildIcons") + public HashMap buildIcons() { + this.buildIcons0(); // L: 254 + return this.icons; // L: 255 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-465034080" + ) + @Export("buildIcons0") + void buildIcons0() { + if (this.icons == null) { // L: 259 + this.icons = new HashMap(); // L: 260 + } + + this.icons.clear(); // L: 262 + + for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264 + List var3 = this.regions[var1][var2].icons(); // L: 265 + Iterator var4 = var3.iterator(); // L: 266 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267 + if (var5.hasValidElement()) { // L: 269 + int var6 = var5.getElement(); // L: 270 + if (!this.icons.containsKey(var6)) { // L: 271 + LinkedList var7 = new LinkedList(); // L: 272 + var7.add(var5); // L: 273 + this.icons.put(var6, var7); // L: 274 + } else { + List var8 = (List)this.icons.get(var6); // L: 277 + var8.add(var5); // L: 278 + } + } + } + } + } + + } // L: 284 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)F", + garbageValue = "-1925282400" + ) + @Export("getPixelsPerTile") + float getPixelsPerTile(int var1, int var2) { + float var3 = (float)var1 / (float)var2; // L: 287 + if (var3 > 8.0F) { // L: 288 + return 8.0F; + } else if (var3 < 1.0F) { // L: 289 + return 1.0F; + } else { + int var4 = Math.round(var3); // L: 290 + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292 + } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-64" + descriptor = "(I)[Lka;", + garbageValue = "-1779749419" ) - @Export("isLoaded") - public boolean isLoaded() { - return this.loaded; // L: 252 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "2100612281" - ) - @Export("buildIcons") - public HashMap buildIcons() { - this.buildIcons0(); // L: 256 - return this.icons; // L: 257 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-532162687" - ) - @Export("buildIcons0") - void buildIcons0() { - if (this.icons == null) { // L: 261 - this.icons = new HashMap(); // L: 262 - } - - this.icons.clear(); // L: 264 - - for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 265 - for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 266 - List var3 = this.regions[var1][var2].icons(); // L: 267 - Iterator var4 = var3.iterator(); // L: 268 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 269 - if (var5.hasValidElement()) { // L: 271 - int var6 = var5.getElement(); // L: 272 - if (!this.icons.containsKey(var6)) { // L: 273 - LinkedList var7 = new LinkedList(); // L: 274 - var7.add(var5); // L: 275 - this.icons.put(var6, var7); // L: 276 - } else { - List var8 = (List)this.icons.get(var6); // L: 279 - var8.add(var5); // L: 280 - } - } - } - } - } - - } // L: 286 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(III)F", - garbageValue = "1791106416" - ) - @Export("getPixelsPerTile") - float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; // L: 289 - if (var3 > 8.0F) { // L: 290 - return 8.0F; - } else if (var3 < 1.0F) { // L: 291 - return 1.0F; - } else { - int var4 = Math.round(var3); // L: 292 - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 293 294 - } + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_normal, PlayerType.field3920, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.field3927, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman, PlayerType.field3923}; // L: 22 } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 67693298b7..74a0ae67d2 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,62 +1,60 @@ -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("iz") +@ObfuscatedName("hj") @Implements("WorldMapRectangle") public final class WorldMapRectangle { + @ObfuscatedName("si") + @ObfuscatedSignature( + descriptor = "Las;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("p") + public static short[][] field2356; + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive18") + static Archive archive18; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -345392389 + intValue = -916427651 ) @Export("width") int width; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1589949227 + intValue = 34585137 ) @Export("height") int height; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1759029699 + intValue = -504322827 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 594773905 + intValue = -1729721737 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lgq;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lhv;)V" + descriptor = "(Lgq;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; // L: 305 + this.this$0 = var1; // L: 303 } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "5" - ) - static void method4987() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 66 - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 67 - var1.clearIsFromIgnored(); // L: 69 - } - - } // L: 72 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 4c97902606..e99d278af1 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,169 +10,148 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("gd") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("ti") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1321531033 + intValue = 1770017441 ) - static int field2706; - @ObfuscatedName("l") + @Export("clientType") + public static int clientType; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lie;" ) @Export("WorldMapRegion_cachedSprites") - static DemotingHashTable WorldMapRegion_cachedSprites; + public static DemotingHashTable WorldMapRegion_cachedSprites; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1652001983 + intValue = 2095222453 ) @Export("regionX") int regionX; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 175632235 + intValue = 2124136901 ) @Export("regionY") int regionY; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhn;" + descriptor = "Lge;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -862418989 + intValue = 827222531 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1514122443 + intValue = 465516293 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("icon0List") List icon0List; - @ObfuscatedName("c") + @ObfuscatedName("w") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("fonts") final HashMap fonts; static { - WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); + WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26 } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - this.regionX = var1; // L: 50 - this.regionY = var2; // L: 51 - this.worldMapData1List = new LinkedList(); // L: 52 - this.icon0List = new LinkedList(); // L: 53 - this.iconMap = new HashMap(); // L: 54 - this.backgroundColor = var3 | -16777216; // L: 55 - this.fonts = var4; // L: 56 - } // L: 57 + this.regionX = var1; // L: 51 + this.regionY = var2; // L: 52 + this.worldMapData1List = new LinkedList(); // L: 53 + this.icon0List = new LinkedList(); // L: 54 + this.iconMap = new HashMap(); // L: 55 + this.backgroundColor = var3 | -16777216; // L: 56 + this.fonts = var4; // L: 57 + } // L: 58 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1350544983" + descriptor = "(IIIB)V", + garbageValue = "-32" ) - void method4677(int var1, int var2, int var3) { - SpritePixels var4 = class28.method423(this.regionX, this.regionY, this.pixelsPerTile); // L: 60 - if (var4 != null) { // L: 61 - if (var3 == this.pixelsPerTile * 64) { // L: 62 - var4.drawAt(var1, var2); // L: 63 + void method4039(int var1, int var2, int var3) { + SpritePixels var4 = UserComparator5.method2599(this.regionX, this.regionY, this.pixelsPerTile); // L: 61 + if (var4 != null) { // L: 62 + if (var3 == this.pixelsPerTile * 64) { // L: 63 + var4.drawAt(var1, var2); // L: 64 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 66 + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 67 } } - } // L: 68 + } // L: 69 - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhn;Ljava/util/List;B)V", - garbageValue = "0" + descriptor = "(Lge;Ljava/util/List;B)V", + garbageValue = "25" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 71 - this.worldMapData_0 = var1; // L: 72 - this.addAllToIconList(var2); // L: 73 - } // L: 74 + this.iconMap.clear(); // L: 72 + this.worldMapData_0 = var1; // L: 73 + this.addAllToIconList(var2); // L: 74 + } // L: 75 - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-691680416" + garbageValue = "674550029" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 77 - Iterator var3 = var1.iterator(); // L: 78 + this.iconMap.clear(); // L: 78 + Iterator var3 = var1.iterator(); // L: 79 while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 79 - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 81 - this.worldMapData1List.add(var4); // L: 82 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 80 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 82 + this.worldMapData1List.add(var4); // L: 83 } } - this.addAllToIconList(var2); // L: 86 - } // L: 87 + this.addAllToIconList(var2); // L: 87 + } // L: 88 - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIILiu;I)V", - garbageValue = "554525387" + descriptor = "(IIIILhz;S)V", + garbageValue = "8217" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 90 - label75: - for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 91 - for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 92 - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 93 - if (var9 != null && var9.length != 0) { // L: 94 - WorldMapDecoration[] var10 = var9; // L: 98 + for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 91 + label50: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 92 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 93 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 94 + if (var9 != null && var9.length != 0) { // L: 95 + WorldMapDecoration[] var10 = var9; // L: 99 - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 99 - ObjectComposition var13; - boolean var14; - label66: { - WorldMapDecoration var12 = var10[var11]; // L: 100 - var13 = class116.getObjectDefinition(var12.objectDefinitionId); // L: 102 - if (var13.transforms != null) { // L: 105 - int[] var15 = var13.transforms; // L: 107 - - for (int var16 = 0; var16 < var15.length; ++var16) { // L: 108 - int var17 = var15[var16]; // L: 109 - ObjectComposition var18 = class116.getObjectDefinition(var17); // L: 111 - if (var18.mapIconId != -1) { // L: 112 - var14 = true; // L: 113 - break label66; - } - } - } else if (var13.mapIconId != -1) { // L: 120 - var14 = true; // L: 121 - break label66; // L: 122 - } - - var14 = false; // L: 124 - } - - if (var14) { // L: 126 - this.getIcon(var13, var8, var6, var7, var5); // L: 129 - continue label75; // L: 130 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 100 + WorldMapDecoration var12 = var10[var11]; // L: 101 + ObjectComposition var13 = class146.getObjectDefinition(var12.objectDefinitionId); // L: 103 + if (VerticalAlignment.method3539(var13)) { // L: 104 + this.getIcon(var13, var8, var6, var7, var5); // L: 107 + continue label50; } } } @@ -180,1028 +159,747 @@ public class WorldMapRegion { } } - } // L: 137 + } // L: 115 - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgx;IIILiu;B)V", - garbageValue = "3" + descriptor = "(Lgj;IIILhz;I)V", + garbageValue = "-1962947985" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 140 - Coord var7 = null; // L: 141 - if (this.worldMapData_0 != null) { // L: 142 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 143 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 118 + Coord var7 = null; // L: 119 + if (this.worldMapData_0 != null) { // L: 120 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 121 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 146 - var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 147 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 124 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 125 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 150 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 151 + if (var1.transforms != null) { // L: 128 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 129 } else { - var9 = class19.WorldMapElement_get(var1.mapIconId); // L: 154 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 155 + var9 = UserComparator7.WorldMapElement_get(var1.mapIconId); // L: 132 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 133 } - var9 = class19.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 157 - if (var9.field1835) { // L: 158 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 159 + var9 = UserComparator7.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 135 + if (var9.field1822) { // L: 136 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 137 } - } // L: 161 + } // L: 139 - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1628100931" + descriptor = "(B)V", + garbageValue = "-86" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 164 + Iterator var1 = this.iconMap.values().iterator(); // L: 142 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 165 - if (var2 instanceof WorldMapIcon_1) { // L: 167 - ((WorldMapIcon_1)var2).init(); // L: 168 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 143 + if (var2 instanceof WorldMapIcon_1) { // L: 145 + ((WorldMapIcon_1)var2).init(); // L: 146 } } - } // L: 172 + } // L: 150 - @ObfuscatedName("r") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/util/List;I)V", - garbageValue = "-883306894" + garbageValue = "-867806211" ) @Export("addAllToIconList") void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 175 + Iterator var2 = var1.iterator(); // L: 153 - while (var2.hasNext()) { // L: 186 - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 176 - if (class19.WorldMapElement_get(var3.element).field1835 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 178 181 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4675(var3.element)); // L: 182 - this.icon0List.add(var4); // L: 183 + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 154 + if (UserComparator7.WorldMapElement_get(var3.element).field1822 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 156 159 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4082(var3.element)); // L: 160 + this.icon0List.add(var4); // L: 161 } } - } // L: 187 + } // L: 165 - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2141874289" + descriptor = "(B)V", + garbageValue = "-84" ) - void method4679() { - if (this.worldMapData_0 != null) { // L: 190 - this.worldMapData_0.reset(); // L: 191 + void method4046() { + if (this.worldMapData_0 != null) { // L: 168 + this.worldMapData_0.reset(); // L: 169 } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 194 + Iterator var1 = this.worldMapData1List.iterator(); // L: 172 - while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 195 - var2.reset(); // L: 197 + while (var1.hasNext()) { // L: 177 + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 173 + var2.reset(); // L: 175 } } - } // L: 201 + } // L: 179 - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Llq;I)Z", - garbageValue = "-1638134467" + descriptor = "(Lln;I)Z", + garbageValue = "1708143981" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 204 - if (this.worldMapData_0 != null) { // L: 205 - this.worldMapData_0.loadGeography(var1); // L: 206 - if (this.worldMapData_0.isFullyLoaded()) { // L: 207 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 208 - return true; // L: 209 + this.iconMap.clear(); // L: 182 + if (this.worldMapData_0 != null) { // L: 183 + this.worldMapData_0.loadGeography(var1); // L: 184 + if (this.worldMapData_0.isFullyLoaded()) { // L: 185 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 186 + return true; // L: 187 } else { - return false; // L: 211 + return false; // L: 189 } } else { - boolean var2 = true; // L: 214 + boolean var2 = true; // L: 192 Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 215 219 - var4 = (WorldMapData_1)var3.next(); // L: 216 - var4.loadGeography(var1); // L: 218 + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 193 197 + var4 = (WorldMapData_1)var3.next(); // L: 194 + var4.loadGeography(var1); // L: 196 } - if (var2) { // L: 222 - var3 = this.worldMapData1List.iterator(); // L: 223 + if (var2) { // L: 200 + var3 = this.worldMapData1List.iterator(); // L: 201 while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 224 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 226 + var4 = (WorldMapData_1)var3.next(); // L: 202 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 204 } } - return var2; // L: 230 + return var2; // L: 208 } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ILie;[Lqx;Llq;Llq;I)V", - garbageValue = "-1187149260" + descriptor = "(ILhx;[Lqq;Lln;Lln;I)V", + garbageValue = "-350994346" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 235 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 236 - if (class28.method423(this.regionX, this.regionY, var1) == null) { // L: 239 - boolean var6 = true; // L: 242 - var6 &= this.loadGeography(var4); // L: 243 - int var8; - if (this.worldMapData_0 != null) { // L: 246 - var8 = this.worldMapData_0.groupId; // L: 247 + this.pixelsPerTile = var1; // L: 213 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 214 + int var7 = this.regionX; // L: 218 + int var8 = this.regionY; // L: 219 + DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 221 + long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 224 + SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 226 + if (var6 == null) { // L: 228 + boolean var21 = true; // L: 231 + var21 &= this.loadGeography(var4); // L: 232 + int var11; + if (this.worldMapData_0 != null) { // L: 235 + var11 = this.worldMapData_0.groupId; // L: 236 } else { - var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 250 + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 239 } - var6 &= var5.tryLoadGroup(var8); // L: 252 - if (var6) { // L: 253 - byte[] var7 = var5.takeFileFlat(var8); // L: 254 - WorldMapSprite var9; - if (var7 == null) { // L: 257 - var9 = new WorldMapSprite(); // L: 258 + var21 &= var5.tryLoadGroup(var11); // L: 241 + if (var21) { // L: 242 + byte[] var22 = var5.takeFileFlat(var11); // L: 243 + WorldMapSprite var12 = Interpreter.method1798(var22); // L: 244 + SpritePixels var13 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 245 + var13.setRaster(); // L: 246 + if (this.worldMapData_0 != null) { // L: 247 + this.method4124(var2, var3, var12); // L: 248 } else { - var9 = new WorldMapSprite(class29.method433(var7).pixels); // L: 261 + this.method4144(var2, var3, var12); // L: 251 } - SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 264 - var11.setRaster(); // L: 265 - if (this.worldMapData_0 != null) { // L: 266 - this.method4684(var2, var3, var9); // L: 267 - } else { - this.method4714(var2, var3, var9); // L: 270 - } - - int var12 = this.regionX; // L: 272 - int var13 = this.regionY; // L: 273 - int var14 = this.pixelsPerTile; // L: 274 - WorldMapRegion_cachedSprites.put(var11, class65.method1867(var12, var13, var14), var11.pixels.length * 4); // L: 276 - this.method4679(); // L: 278 + int var14 = this.regionX; // L: 253 + int var15 = this.regionY; // L: 254 + int var16 = this.pixelsPerTile; // L: 255 + DemotingHashTable var17 = WorldMapRegion_cachedSprites; // L: 257 + long var19 = (long)(var16 << 16 | var14 << 8 | var15); // L: 261 + var17.put(var13, var19, var13.pixels.length * 4); // L: 263 + this.method4046(); // L: 265 } } } - } // L: 237 240 279 + } // L: 215 229 266 - @ObfuscatedName("j") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "-268050800" + descriptor = "(IIILjava/util/HashSet;B)V", + garbageValue = "13" ) - void method4682(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 282 - var4 = new HashSet(); // L: 283 + void method4097(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 269 + var4 = new HashSet(); // L: 270 } - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 285 - this.drawMapLinks(var1, var2, var4, var3); // L: 286 - } // L: 287 + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 272 + this.drawMapLinks(var1, var2, var4, var3); // L: 273 + } // L: 274 - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "1089200955" + garbageValue = "463084567" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 290 + Iterator var4 = this.iconMap.values().iterator(); // L: 277 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 291 - if (var5.hasValidElement()) { // L: 293 - int var6 = var5.getElement(); // L: 294 - if (var1.contains(var6)) { // L: 295 - WorldMapElement var7 = class19.WorldMapElement_get(var6); // L: 296 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 297 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 278 + if (var5.hasValidElement()) { // L: 280 + int var6 = var5.getElement(); // L: 281 + if (var1.contains(var6)) { // L: 282 + WorldMapElement var7 = UserComparator7.WorldMapElement_get(var6); // L: 283 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 284 } } } - this.method4693(var1, var2, var3); // L: 301 - } // L: 302 + this.method4059(var1, var2, var3); // L: 288 + } // L: 289 - @ObfuscatedName("s") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lie;[Lqx;Lis;I)V", - garbageValue = "954232927" + descriptor = "(Lhx;[Lqq;Lhn;S)V", + garbageValue = "-30301" ) - void method4684(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method4124(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 305 - for (var5 = 0; var5 < 64; ++var5) { // L: 306 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 307 - this.method4688(var4, var5, this.worldMapData_0, var1); // L: 308 + for (var4 = 0; var4 < 64; ++var4) { // L: 292 + for (var5 = 0; var5 < 64; ++var5) { // L: 293 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 294 + this.method4055(var4, var5, this.worldMapData_0, var1); // L: 295 } } - for (var4 = 0; var4 < 64; ++var4) { // L: 311 - for (var5 = 0; var5 < 64; ++var5) { // L: 312 - this.method4687(var4, var5, this.worldMapData_0, var1, var2); // L: 313 + for (var4 = 0; var4 < 64; ++var4) { // L: 298 + for (var5 = 0; var5 < 64; ++var5) { // L: 299 + this.method4053(var4, var5, this.worldMapData_0, var1, var2); // L: 300 } } - } // L: 316 + } // L: 303 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lie;[Lqx;Lis;I)V", - garbageValue = "1932235022" + descriptor = "(Lhx;[Lqq;Lhn;I)V", + garbageValue = "-1984333842" ) - void method4714(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 319 + void method4144(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 306 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 320 + var5 = (WorldMapData_1)var4.next(); // L: 307 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 322 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 323 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 324 - this.method4688(var6, var7, var5, var1); // L: 325 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 309 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 310 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 311 + this.method4055(var6, var7, var5, var1); // L: 312 } } } - var4 = this.worldMapData1List.iterator(); // L: 330 + var4 = this.worldMapData1List.iterator(); // L: 317 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 331 + var5 = (WorldMapData_1)var4.next(); // L: 318 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 333 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 334 - this.method4687(var6, var7, var5, var1, var2); // L: 335 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 320 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 321 + this.method4053(var6, var7, var5, var1, var2); // L: 322 } } } - } // L: 340 + } // L: 327 - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IILiu;Lie;[Lqx;S)V", - garbageValue = "-17045" + descriptor = "(IILhz;Lhx;[Lqq;B)V", + garbageValue = "-27" ) - void method4687(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method4706(var1, var2, var3); // L: 343 - this.method4690(var1, var2, var3, var5); // L: 344 - } // L: 345 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(IILiu;Lie;Lis;I)V", - garbageValue = "-845219169" - ) - @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 348 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 349 - if (var6 == -1 && var7 == -1) { // L: 350 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 351 - } - - int var8 = 16711935; // L: 353 - int var9; - if (var7 != -1) { // L: 354 - int var10 = this.backgroundColor; // L: 356 - FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); // L: 360 - FloorOverlayDefinition var11; - if (var12 != null) { // L: 361 - var11 = var12; // L: 362 - } else { - byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); // L: 365 - var12 = new FloorOverlayDefinition(); // L: 366 - if (var13 != null) { // L: 367 - var12.decode(new Buffer(var13), var7); - } - - var12.postDecode(); // L: 368 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); // L: 369 - var11 = var12; // L: 370 - } - - if (var11 == null) { // L: 373 - var9 = var10; // L: 374 - } else if (var11.secondaryRgb >= 0) { // L: 377 - var9 = var11.secondaryRgb | -16777216; // L: 378 - } else { - int var14; - int var22; - if (var11.texture >= 0) { // L: 380 - var14 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture); // L: 382 - byte var15 = 96; // L: 383 - int var21; - if (var14 == -2) { // L: 385 - var21 = 12345678; // L: 386 - } else if (var14 == -1) { // L: 389 - if (var15 < 0) { // L: 390 - var15 = 0; // L: 391 - } else if (var15 > 127) { // L: 393 - var15 = 127; // L: 394 - } - - var22 = 127 - var15; // L: 396 - var21 = var22; // L: 397 - } else { - var22 = var15 * (var14 & 127) / 128; // L: 400 - if (var22 < 2) { // L: 401 - var22 = 2; - } else if (var22 > 126) { // L: 402 - var22 = 126; - } - - var21 = var22 + (var14 & 65408); // L: 403 - } - - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var21] | -16777216; // L: 406 - } else if (var11.primaryRgb == 16711935) { // L: 408 - var9 = var10; // L: 409 - } else { - var14 = var11.hue; // L: 413 - var22 = var11.saturation; // L: 414 - int var16 = var11.lightness; // L: 415 - if (var16 > 179) { // L: 417 - var22 /= 2; - } - - if (var16 > 192) { // L: 418 - var22 /= 2; - } - - if (var16 > 217) { // L: 419 - var22 /= 2; - } - - if (var16 > 243) { // L: 420 - var22 /= 2; - } - - int var17 = (var22 / 32 << 7) + var16 / 2 + (var14 / 4 << 10); // L: 421 - byte var19 = 96; // L: 426 - int var18; - if (var17 == -2) { // L: 428 - var18 = 12345678; // L: 429 - } else { - int var23; - if (var17 == -1) { // L: 432 - if (var19 < 0) { // L: 433 - var19 = 0; // L: 434 - } else if (var19 > 127) { // L: 436 - var19 = 127; // L: 437 - } - - var23 = 127 - var19; // L: 439 - var18 = var23; // L: 440 - } else { - var23 = var19 * (var17 & 127) / 128; // L: 443 - if (var23 < 2) { // L: 444 - var23 = 2; - } else if (var23 > 126) { // L: 445 - var23 = 126; - } - - var18 = var23 + (var17 & 65408); // L: 446 - } - } - - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; // L: 449 - } - } - - var8 = var9; // L: 452 - } - - if (var7 > -1 && var3.field2793[0][var1][var2] == 0) { // L: 454 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 455 - } else { - var9 = this.method4671(var1, var2, var3, var5); // L: 458 - if (var7 == -1) { // L: 459 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 460 - } else { - var4.method5091(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2793[0][var1][var2], var3.field2792[0][var1][var2]); // L: 463 - } - } - } // L: 456 461 464 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IILiu;Lie;I)V", - garbageValue = "1864797508" - ) - void method4688(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 467 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 468 - if (var6 > -1) { // L: 469 - int var8 = this.backgroundColor; // L: 471 - FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); // L: 475 - FloorOverlayDefinition var9; - if (var10 != null) { // L: 476 - var9 = var10; // L: 477 - } else { - byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); // L: 480 - var10 = new FloorOverlayDefinition(); // L: 481 - if (var11 != null) { // L: 482 - var10.decode(new Buffer(var11), var6); - } - - var10.postDecode(); // L: 483 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); // L: 484 - var9 = var10; // L: 485 - } - - int var7; - if (var9 == null) { // L: 488 - var7 = var8; // L: 489 - } else if (var9.secondaryRgb >= 0) { // L: 492 - var7 = var9.secondaryRgb | -16777216; // L: 493 - } else { - int var12; - int var21; - if (var9.texture >= 0) { // L: 495 - var12 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture); // L: 497 - byte var13 = 96; // L: 498 - int var19; - if (var12 == -2) { // L: 500 - var19 = 12345678; // L: 501 - } else if (var12 == -1) { // L: 504 - if (var13 < 0) { // L: 505 - var13 = 0; // L: 506 - } else if (var13 > 127) { // L: 508 - var13 = 127; // L: 509 - } - - var21 = 127 - var13; // L: 511 - var19 = var21; // L: 512 - } else { - var21 = var13 * (var12 & 127) / 128; // L: 515 - if (var21 < 2) { - var21 = 2; // L: 516 - } else if (var21 > 126) { // L: 517 - var21 = 126; - } - - var19 = var21 + (var12 & 65408); // L: 518 - } - - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var19] | -16777216; // L: 521 - } else if (var9.primaryRgb == 16711935) { // L: 523 - var7 = var8; // L: 524 - } else { - var12 = var9.hue; // L: 528 - var21 = var9.saturation; // L: 529 - int var14 = var9.lightness; // L: 530 - if (var14 > 179) { // L: 532 - var21 /= 2; - } - - if (var14 > 192) { // L: 533 - var21 /= 2; - } - - if (var14 > 217) { // L: 534 - var21 /= 2; - } - - if (var14 > 243) { // L: 535 - var21 /= 2; - } - - int var15 = (var21 / 32 << 7) + var14 / 2 + (var12 / 4 << 10); // L: 536 - byte var17 = 96; // L: 541 - int var16; - if (var15 == -2) { // L: 543 - var16 = 12345678; // L: 544 - } else { - int var22; - if (var15 == -1) { // L: 547 - if (var17 < 0) { // L: 548 - var17 = 0; // L: 549 - } else if (var17 > 127) { // L: 551 - var17 = 127; // L: 552 - } - - var22 = 127 - var17; // L: 554 - var16 = var22; // L: 555 - } else { - var22 = var17 * (var15 & 127) / 128; // L: 558 - if (var22 < 2) { // L: 559 - var22 = 2; - } else if (var22 > 126) { // L: 560 - var22 = 126; - } - - var16 = var22 + (var15 & 65408); // L: 561 - } - } - - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216; // L: 564 - } - } - - if (var3.field2793[var5][var1][var2] == 0) { // L: 568 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 569 - } else { - var4.method5091(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2793[var5][var1][var2], var3.field2792[var5][var1][var2]); // L: 572 - } - } - } - - } // L: 576 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IILiu;Lis;I)I", - garbageValue = "-1949774050" - ) - int method4671(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 579 580 582 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IILiu;[Lqx;B)V", - garbageValue = "94" - ) - void method4690(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 586 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 587 - if (var6 != null && var6.length != 0) { // L: 588 - WorldMapDecoration[] var7 = var6; // L: 592 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 593 - WorldMapDecoration var9 = var7[var8]; // L: 594 - int var11 = var9.decoration; // L: 597 - boolean var10 = var11 >= WorldMapDecorationType.field3513.id && var11 <= WorldMapDecorationType.field3532.id; // L: 599 - if (!var10) { // L: 602 - int var13 = var9.decoration; // L: 604 - boolean var12 = var13 == WorldMapDecorationType.field3520.id; // L: 606 - if (!var12) { // L: 608 - continue; - } - } - - ObjectComposition var14 = class116.getObjectDefinition(var9.objectDefinitionId); // L: 610 - if (var14.mapSceneId != -1) { // L: 611 - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 612 - var4[var14.mapSceneId].method8161(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 616 - } else { - var4[var14.mapSceneId].method8161(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 613 - } - } - } - } - } - - } // L: 624 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IILiu;B)V", - garbageValue = "-88" - ) - void method4706(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 627 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 628 - if (var5 != null && var5.length != 0) { // L: 629 - WorldMapDecoration[] var6 = var5; // L: 633 - - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 634 - WorldMapDecoration var8 = var6[var7]; // L: 635 - if (class14.method175(var8.decoration)) { // L: 637 - ObjectComposition var9 = class116.getObjectDefinition(var8.objectDefinitionId); // L: 638 - int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 639 - if (var8.decoration == WorldMapDecorationType.field3519.id) { // L: 640 - this.method4739(var1, var2, var8.rotation, var10); // L: 641 - } - - if (var8.decoration == WorldMapDecorationType.field3512.id) { // L: 643 - this.method4739(var1, var2, var8.rotation, -3355444); // L: 644 - this.method4739(var1, var2, var8.rotation + 1, var10); // L: 645 - } - - if (var8.decoration == WorldMapDecorationType.field3511.id) { // L: 647 - if (var8.rotation == 0) { // L: 648 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); - } - - if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 649 - } - - if (var8.rotation == 2) { // L: 650 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); - } - - if (var8.rotation == 3) { // L: 651 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); - } - } - - if (var8.decoration == WorldMapDecorationType.field3514.id) { // L: 653 - int var11 = var8.rotation % 2; // L: 654 - int var12; - if (var11 == 0) { // L: 655 - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 656 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 657 - } - } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 661 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 662 - } - } - } - } - } - } - } - - } // L: 671 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-162919389" - ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 674 - float var6 = var5 / 2.0F; // L: 675 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 676 - - while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 677 - Coord var9 = (Coord)var8.getKey(); // L: 679 - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); // L: 680 - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 681 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 682 - if (var12 != null && var12.hasValidElement()) { // L: 683 - var12.screenX = var10; // L: 684 - var12.screenY = var11; // L: 685 - WorldMapElement var13 = class19.WorldMapElement_get(var12.getElement()); // L: 686 - if (!var3.contains(var13.getObjectId())) { // L: 687 - this.method4695(var12, var10, var11, var5); // L: 688 - } - } - } - - } // L: 693 + void method4053(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method4098(var1, var2, var3); // L: 330 + this.method4057(var1, var2, var3, var5); // L: 331 + } // L: 332 @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-127" + descriptor = "(IILhz;Lhx;Lhn;I)V", + garbageValue = "-1568059728" ) - void method4693(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 696 + @Export("drawTileGround") + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 335 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 336 + if (var6 == -1 && var7 == -1) { // L: 337 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 338 + } - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 697 - if (var5.hasValidElement()) { // L: 699 - WorldMapElement var6 = class19.WorldMapElement_get(var5.getElement()); // L: 700 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 701 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 702 + int var8 = 16711935; // L: 340 + if (var7 != -1) { // L: 341 + var8 = class7.method53(var7, this.backgroundColor); // L: 342 + } + + if (var7 > -1 && var3.field2334[0][var1][var2] == 0) { // L: 344 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 345 + } else { + int var9 = this.method4056(var1, var2, var3, var5); // L: 348 + if (var7 == -1) { // L: 349 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 350 + } else { + var4.method4461(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2334[0][var1][var2], var3.field2342[0][var1][var2]); // L: 353 + } + } + } // L: 346 351 354 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IILhz;Lhx;B)V", + garbageValue = "0" + ) + void method4055(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 357 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 358 + if (var6 > -1) { // L: 359 + int var7 = class7.method53(var6, this.backgroundColor); // L: 360 + if (var3.field2334[var5][var1][var2] == 0) { // L: 361 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 362 + } else { + var4.method4461(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2334[var5][var1][var2], var3.field2342[var5][var1][var2]); // L: 365 } } } - } // L: 706 + } // L: 369 - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lfs;IIIIB)V", - garbageValue = "-10" + descriptor = "(IILhz;Lhn;I)I", + garbageValue = "-952737975" + ) + int method4056(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 372 373 375 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IILhz;[Lqq;I)V", + garbageValue = "-902447610" + ) + void method4057(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 379 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 380 + if (var6 != null && var6.length != 0) { // L: 381 + WorldMapDecoration[] var7 = var6; // L: 385 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 386 + WorldMapDecoration var9 = var7[var8]; // L: 387 + if (class137.method2938(var9.decoration) || WorldMapEvent.method4505(var9.decoration)) { // L: 389 + ObjectComposition var10 = class146.getObjectDefinition(var9.objectDefinitionId); // L: 390 + if (var10.mapSceneId != -1) { // L: 391 + if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 392 + var4[var10.mapSceneId].method8054(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 396 + } else { + var4[var10.mapSceneId].method8054(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 393 + } + } + } + } + } + } + + } // L: 404 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IILhz;B)V", + garbageValue = "-2" + ) + void method4098(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 407 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 408 + if (var5 != null && var5.length != 0) { // L: 409 + WorldMapDecoration[] var6 = var5; // L: 413 + + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 414 + WorldMapDecoration var8 = var6[var7]; // L: 415 + int var10 = var8.decoration; // L: 418 + boolean var9 = var10 >= WorldMapDecorationType.field3517.id && var10 <= WorldMapDecorationType.field3500.id || var10 == WorldMapDecorationType.field3501.id; // L: 420 + if (var9) { // L: 422 + ObjectComposition var11 = class146.getObjectDefinition(var8.objectDefinitionId); // L: 423 + int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 424 + if (var8.decoration == WorldMapDecorationType.field3517.id) { // L: 425 + this.method4071(var1, var2, var8.rotation, var12); // L: 426 + } + + if (var8.decoration == WorldMapDecorationType.field3509.id) { // L: 428 + this.method4071(var1, var2, var8.rotation, -3355444); // L: 429 + this.method4071(var1, var2, var8.rotation + 1, var12); // L: 430 + } + + if (var8.decoration == WorldMapDecorationType.field3500.id) { // L: 432 + if (var8.rotation == 0) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); // L: 433 + } + + if (var8.rotation == 1) { // L: 434 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); + } + + if (var8.rotation == 2) { // L: 435 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + } + + if (var8.rotation == 3) { // L: 436 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + } + } + + if (var8.decoration == WorldMapDecorationType.field3501.id) { // L: 438 + int var13 = var8.rotation % 2; // L: 439 + int var14; + if (var13 == 0) { // L: 440 + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 441 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 442 + } + } else { + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 446 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 447 + } + } + } + } + } + } + } + + } // L: 456 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1736856412" + ) + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 459 + float var6 = var5 / 2.0F; // L: 460 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 461 + + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 462 + Coord var9 = (Coord)var8.getKey(); // L: 464 + int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); // L: 465 + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 466 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 467 + if (var12 != null && var12.hasValidElement()) { // L: 468 + var12.screenX = var10; // L: 469 + var12.screenY = var11; // L: 470 + WorldMapElement var13 = UserComparator7.WorldMapElement_get(var12.getElement()); // L: 471 + if (!var3.contains(var13.getObjectId())) { // L: 472 + this.method4064(var12, var10, var11, var5); // L: 473 + } + } + } + + } // L: 478 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "-7" + ) + void method4059(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 481 + + while (var4.hasNext()) { // L: 490 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 482 + if (var5.hasValidElement()) { // L: 484 + WorldMapElement var6 = UserComparator7.WorldMapElement_get(var5.getElement()); // L: 485 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 486 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 487 + } + } + } + + } // L: 491 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lfe;IIIIB)V", + garbageValue = "-104" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 709 - if (var6 != null) { // L: 710 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 713 - if (var4 % var5 < var5 / 2) { // L: 714 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 715 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 716 + SpritePixels var6 = var1.getSpriteBool(false); // L: 494 + if (var6 != null) { // L: 495 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 498 + if (var4 % var5 < var5 / 2) { // L: 499 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 500 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 501 } } - } // L: 711 718 + } // L: 496 503 - @ObfuscatedName("ac") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lic;IIFI)V", - garbageValue = "1970229100" + descriptor = "(Lhq;IIFI)V", + garbageValue = "-19271127" ) - void method4695(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class19.WorldMapElement_get(var1.getElement()); // L: 721 - this.method4696(var5, var2, var3); // L: 722 - this.method4789(var1, var5, var2, var3, var4); // L: 723 - } // L: 724 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lfs;IIB)V", - garbageValue = "44" - ) - void method4696(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 727 - if (var4 != null) { // L: 728 - int var5 = this.method4710(var4, var1.horizontalAlignment); // L: 729 - int var6 = this.method4700(var4, var1.verticalAlignment); // L: 730 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 731 - } - - } // L: 733 - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lic;Lfs;IIFS)V", - garbageValue = "-3122" - ) - void method4789(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 736 - if (var6 != null) { // L: 737 - if (var6.size.method4532(var5)) { // L: 740 - Font var7 = (Font)this.fonts.get(var6.size); // L: 743 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1833, 0, 1, 0, var7.ascent / 2); // L: 744 - } - } - } // L: 738 741 745 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IS)V", - garbageValue = "16351" - ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 748 - Iterator var6 = this.icon0List.iterator(); // L: 749 - - while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 750 - if (var7.hasValidElement()) { // L: 752 - int var8 = var7.coord2.x % 64; // L: 753 - int var9 = var7.coord2.y % 64; // L: 754 - var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 755 - var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); // L: 756 - if (!var3.contains(var7.getElement())) { // L: 757 - this.method4695(var7, var7.screenX, var7.screenY, var5); // L: 760 - } - } - } - - } // L: 763 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lql;Lfg;I)I", - garbageValue = "1542273594" - ) - int method4710(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 766 - case 0: - return 0; // L: 769 - case 1: - return -var1.subWidth / 2; // L: 777 - default: - return -var1.subWidth; // L: 773 - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lql;Lfm;I)I", - garbageValue = "-646566813" - ) - int method4700(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 783 - case 0: - return -var1.subHeight / 2; // L: 794 - case 2: - return 0; // L: 790 - default: - return -var1.subHeight; // L: 786 - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)Liw;", - garbageValue = "836188853" - ) - WorldMapLabel method4675(int var1) { - WorldMapElement var2 = class19.WorldMapElement_get(var1); // L: 800 - return this.createMapLabel(var2); // L: 801 - } + void method4064(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = UserComparator7.WorldMapElement_get(var1.getElement()); // L: 506 + this.method4062(var5, var2, var3); // L: 507 + this.method4063(var1, var5, var2, var3, var4); // L: 508 + } // L: 509 @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfs;I)Liw;", - garbageValue = "-2050165109" + descriptor = "(Lfe;III)V", + garbageValue = "-714774385" ) - @Export("createMapLabel") - WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 805 - WorldMapLabelSize var2 = WorldMapLabelSize.method4536(var1.textSize); // L: 808 - if (var2 == null) { // L: 809 - return null; // L: 810 - } else { - Font var3 = (Font)this.fonts.get(var2); // L: 812 - if (var3 == null) { // L: 813 - return null; // L: 814 - } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 816 - String[] var5 = new String[var4]; // L: 817 - var3.breakLines(var1.name, (int[])null, var5); // L: 818 - int var6 = var5.length * var3.ascent / 2; // L: 819 - int var7 = 0; // L: 820 - String[] var8 = var5; // L: 822 + void method4062(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 512 + if (var4 != null) { // L: 513 + int var5 = this.method4161(var4, var1.horizontalAlignment); // L: 514 + int var6 = this.method4123(var4, var1.verticalAlignment); // L: 515 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 516 + } - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 823 - String var10 = var8[var9]; // L: 824 - int var11 = var3.stringWidth(var10); // L: 826 - if (var11 > var7) { // L: 827 - var7 = var11; // L: 828 - } - } + } // L: 518 - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 833 + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(Lhq;Lfe;IIFI)V", + garbageValue = "1984252761" + ) + void method4063(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 521 + if (var6 != null) { // L: 522 + if (var6.size.method3902(var5)) { // L: 525 + Font var7 = (Font)this.fonts.get(var6.size); // L: 528 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1819, 0, 1, 0, var7.ascent / 2); // L: 529 + } + } + } // L: 523 526 530 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1065289794" + ) + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 533 + Iterator var6 = this.icon0List.iterator(); // L: 534 + + while (var6.hasNext()) { // L: 543 + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 535 + if (var7.hasValidElement()) { // L: 537 + int var8 = var7.coord2.x % 64; // L: 538 + int var9 = var7.coord2.y % 64; // L: 539 + var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 540 + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 541 + if (!var3.contains(var7.getElement())) { // L: 542 + this.method4064(var7, var7.screenX, var7.screenY, var5); // L: 545 } } - } else { - return null; // L: 806 + } + + } // L: 548 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(Lqi;Lfw;I)I", + garbageValue = "1167261995" + ) + int method4161(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 551 + case 1: + return -var1.subWidth / 2; // L: 562 + case 2: + return 0; // L: 558 + default: + return -var1.subWidth; // L: 554 } } - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "123" + descriptor = "(Lqi;Lfg;I)I", + garbageValue = "1110187464" ) - List method4703(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 837 - if (var4 >= var1 && var5 >= var2) { // L: 838 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 839 + int method4123(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 568 + case 1: + return -var1.subHeight / 2; // L: 579 + case 2: + return 0; // L: 575 + default: + return -var1.subHeight; // L: 571 + } + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IB)Lho;", + garbageValue = "-108" + ) + WorldMapLabel method4082(int var1) { + WorldMapElement var2 = UserComparator7.WorldMapElement_get(var1); // L: 606 + return this.createMapLabel(var2); // L: 607 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lfe;I)Lho;", + garbageValue = "2017474757" + ) + @Export("createMapLabel") + WorldMapLabel createMapLabel(WorldMapElement var1) { + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 611 + int var3 = var1.textSize; // L: 615 + WorldMapLabelSize[] var4 = WorldMapLabelSize.method3901(); // L: 618 + int var5 = 0; + + WorldMapLabelSize var2; + while (true) { + if (var5 >= var4.length) { + var2 = null; // L: 629 + break; + } + + WorldMapLabelSize var6 = var4[var5]; // L: 620 + if (var3 == var6.field2215) { // L: 622 + var2 = var6; // L: 623 + break; + } + + ++var5; // L: 619 + } + + if (var2 == null) { // L: 632 + return null; // L: 633 + } else { + Font var14 = (Font)this.fonts.get(var2); // L: 635 + if (var14 == null) { // L: 636 + return null; // L: 637 + } else { + int var15 = var14.lineCount(var1.name, 1000000); // L: 639 + String[] var7 = new String[var15]; // L: 640 + var14.breakLines(var1.name, (int[])null, var7); // L: 641 + int var8 = var7.length * var14.ascent / 2; // L: 642 + int var9 = 0; // L: 643 + String[] var10 = var7; // L: 645 + + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 646 + String var12 = var10[var11]; // L: 647 + int var13 = var14.stringWidth(var12); // L: 649 + if (var13 > var9) { // L: 650 + var9 = var13; // L: 651 + } + } + + return new WorldMapLabel(var1.name, var9, var8, var2); // L: 656 + } + } + } else { + return null; // L: 612 + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(IIIIII)Ljava/util/List;", + garbageValue = "-1950583236" + ) + List method4069(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 660 + if (var4 >= var1 && var5 >= var2) { // L: 661 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 662 Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; - while (var7.hasNext()) { // L: 840 - var8 = (AbstractWorldMapIcon)var7.next(); // L: 841 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 843 - var6.add(var8); // L: 844 + while (var7.hasNext()) { // L: 663 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 664 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 666 + var6.add(var8); // L: 667 } } - var7 = this.icon0List.iterator(); // L: 848 + var7 = this.icon0List.iterator(); // L: 671 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 849 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 851 - var6.add(var8); // L: 852 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 672 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 674 + var6.add(var8); // L: 675 } } - return var6; // L: 856 + return var6; // L: 679 } else { - return var6; // L: 847 + return var6; // L: 670 } } else { return var6; } } - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/List;", - garbageValue = "32" + descriptor = "(I)Ljava/util/List;", + garbageValue = "1649195814" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 860 - var1.addAll(this.icon0List); // L: 861 - var1.addAll(this.iconMap.values()); // L: 862 - return var1; // L: 863 + LinkedList var1 = new LinkedList(); // L: 683 + var1.addAll(this.icon0List); // L: 684 + var1.addAll(this.iconMap.values()); // L: 685 + return var1; // L: 686 } - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1810808163" + garbageValue = "2107740024" ) - void method4739(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 867 - if (var3 == 0) { // L: 868 + void method4071(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 690 + if (var3 == 0) { // L: 691 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 869 + if (var3 == 1) { // L: 692 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 870 - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 2) { // L: 693 + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 871 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 694 } - } // L: 872 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2014559127" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26 - VarbitComposition var1; - if (var2 != null) { // L: 27 - var1 = var2; // L: 28 - } else { - byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31 - var2 = new VarbitComposition(); // L: 32 - if (var3 != null) { // L: 33 - var2.decode(new Buffer(var3)); - } - - VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34 - var1 = var2; // L: 35 - } - - int var7 = var1.baseVar; // L: 38 - int var4 = var1.startBit; // L: 39 - int var5 = var1.endBit; // L: 40 - int var6 = Varps.Varps_masks[var5 - var4]; // L: 41 - return Varps.Varps_main[var7] >> var4 & var6; // L: 42 - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(Lck;B)V", - garbageValue = "3" - ) - static final void method4795(PendingSpawn var0) { - long var1 = 0L; // L: 7373 - int var3 = -1; // L: 7374 - int var4 = 0; // L: 7375 - int var5 = 0; // L: 7376 - if (var0.type == 0) { // L: 7377 - var1 = FriendSystem.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { // L: 7378 - var1 = FriendSystem.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { // L: 7379 - var1 = FriendSystem.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { // L: 7380 - var1 = FriendSystem.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (0L != var1) { // L: 7381 - int var6 = FriendSystem.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7382 - var3 = class121.Entity_unpackID(var1); // L: 7383 - var4 = var6 & 31; // L: 7384 - var5 = var6 >> 6 & 3; // L: 7385 - } - - var0.objectId = var3; // L: 7387 - var0.field1119 = var4; // L: 7388 - var0.field1117 = var5; // L: 7389 - } // L: 7390 - - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "56012862" - ) - static void method4798(Buffer var0, int var1) { - FontName.method7510(var0.array, var1); // L: 11875 - if (JagexCache.JagexCache_randomDat != null) { // L: 11877 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 11879 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11880 - } catch (Exception var3) { // L: 11882 - } - } - - } // L: 11885 + } // L: 695 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index ce84479475..4597c0d344 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -3,18 +3,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ie") +@ObfuscatedName("hx") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 694071541 + intValue = 1151407941 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("tileTemplates") byte[][][] tileTemplates; @@ -25,22 +24,22 @@ public class WorldMapScaleHandler { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "-2044024529" + garbageValue = "344755963" ) - void method5091(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method4461(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { // L: 14 - var8 = this.method5133(var8, var7); // L: 15 - var7 = this.method5093(var7); // L: 16 + var8 = this.method4462(var8, var7); // L: 15 + var7 = this.method4501(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } // L: 18 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1091300418" + garbageValue = "672085434" ) - int method5133(int var1, int var2) { + int method4462(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -56,12 +55,12 @@ public class WorldMapScaleHandler { return var1; // L: 24 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-606524764" + garbageValue = "-134477259" ) - int method5093(int var1) { + int method4501(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -69,10 +68,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1510815448" + descriptor = "(B)V", + garbageValue = "2" ) @Export("init") void init() { @@ -89,10 +88,10 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1267924905" + garbageValue = "-919476586" ) @Export("init0") void init0() { @@ -117,8 +116,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 - if (var4 <= var3) { - var1[var2] = -1; // L: 62 + if (var4 <= var3) { // L: 62 + var1[var2] = -1; } ++var2; // L: 63 @@ -158,8 +157,8 @@ public class WorldMapScaleHandler { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-25" + descriptor = "(I)V", + garbageValue = "-548231611" ) @Export("init1") void init1() { @@ -198,10 +197,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][1] = var1; // L: 109 var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 - var2 = 0; + var2 = 0; // L: 111 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 112 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 113 if (var4 <= var3 >> 1) { // L: 114 var1[var2] = -1; } @@ -210,9 +209,9 @@ public class WorldMapScaleHandler { } } - this.tileTemplates[1][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[1][2] = var1; // L: 118 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 + var2 = 0; // L: 120 for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 121 for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 122 @@ -227,21 +226,21 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1211446776" + garbageValue = "146729374" ) @Export("init2") void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 int var2 = 0; // L: 132 int var3; int var4; for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 133 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 >> 1) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 134 + if (var4 <= var3 >> 1) { // L: 135 var1[var2] = -1; } @@ -249,11 +248,11 @@ public class WorldMapScaleHandler { } } - this.tileTemplates[2][0] = var1; + this.tileTemplates[2][0] = var1; // L: 139 var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 140 var2 = 0; // L: 141 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 if (var4 >= var3 << 1) { var1[var2] = -1; // L: 144 @@ -264,51 +263,51 @@ public class WorldMapScaleHandler { } this.tileTemplates[2][1] = var1; // L: 148 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 149 + var2 = 0; // L: 150 for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 151 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 152 - if (var4 <= var3 >> 1) { + if (var4 <= var3 >> 1) { // L: 153 var1[var2] = -1; } - ++var2; + ++var2; // L: 154 } } this.tileTemplates[2][2] = var1; // L: 157 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 158 + var2 = 0; // L: 159 for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 160 for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 161 - if (var4 >= var3 << 1) { + if (var4 >= var3 << 1) { // L: 162 var1[var2] = -1; } - ++var2; + ++var2; // L: 163 } } - this.tileTemplates[2][3] = var1; + this.tileTemplates[2][3] = var1; // L: 166 } // L: 167 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1003972417" + descriptor = "(B)V", + garbageValue = "-31" ) @Export("init3") void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 int var2 = 0; // L: 171 int var3; int var4; for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 172 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 173 - if (var4 >= var3 >> 1) { + if (var4 >= var3 >> 1) { // L: 174 var1[var2] = -1; } @@ -361,10 +360,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-936012936" + descriptor = "(S)V", + garbageValue = "3447" ) @Export("init4") void init4() { @@ -389,8 +388,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 - if (var4 <= var3 << 1) { - var1[var2] = -1; // L: 222 + if (var4 <= var3 << 1) { // L: 222 + var1[var2] = -1; } ++var2; // L: 223 @@ -428,10 +427,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "313760974" + garbageValue = "4210752" ) @Export("init5") void init5() { @@ -497,10 +496,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-367257295" + garbageValue = "356151267" ) @Export("init6") void init6() { @@ -566,10 +565,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1603557132" + garbageValue = "-894345580" ) @Export("init7") void init7() { @@ -610,8 +609,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 352 for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 353 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 - var1[var5] = -1; + if (var4 >= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; // L: 354 } ++var5; // L: 355 @@ -634,123 +633,4 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lgf;I)V", - garbageValue = "-1027511011" - ) - static final void method5135(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for (int var9 = 0; var9 < 8; ++var9) { // L: 111 - for (var10 = 0; var10 < 8; ++var10) { // L: 112 - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 113 - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var10 + var3] &= -16777217; - } - } - } - - Buffer var28 = new Buffer(var0); // L: 116 - - for (var10 = 0; var10 < 4; ++var10) { // L: 117 - for (int var11 = 0; var11 < 64; ++var11) { // L: 118 - for (int var12 = 0; var12 < 64; ++var12) { // L: 119 - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120 - int var17 = var11 & 7; // L: 125 - int var18 = var12 & 7; // L: 126 - int var19 = var7 & 3; // L: 129 - int var16; - if (var19 == 0) { // L: 130 - var16 = var17; // L: 131 - } else if (var19 == 1) { // L: 134 - var16 = var18; // L: 135 - } else if (var19 == 2) { // L: 138 - var16 = 7 - var17; // L: 139 - } else { - var16 = 7 - var18; // L: 142 - } - - int var22 = var2 + var16; // L: 146 - int var25 = var11 & 7; // L: 149 - int var26 = var12 & 7; // L: 150 - int var27 = var7 & 3; // L: 153 - int var24; - if (var27 == 0) { // L: 154 - var24 = var26; // L: 155 - } else if (var27 == 1) { // L: 158 - var24 = 7 - var25; // L: 159 - } else if (var27 == 2) { // L: 162 - var24 = 7 - var26; // L: 163 - } else { - var24 = var25; // L: 166 - } - - class127.loadTerrain(var28, var1, var22, var24 + var3, 0, 0, var7); // L: 168 - } else { - class127.loadTerrain(var28, 0, -1, -1, 0, 0, 0); // L: 170 - } - } - } - } - - } // L: 174 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "22" - ) - static int method5134(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 818 - var0 -= 1000; // L: 819 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 820 - } else { - var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 822 - } - - class290.invalidateWidget(var3); // L: 823 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 824 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 844 - var3.modelType = 2; // L: 845 - var3.modelId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 846 - return 1; // L: 847 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 849 - var3.modelType = 3; // L: 850 - var3.modelId = class19.localPlayer.appearance.getChatHeadId(); // L: 851 - return 1; // L: 852 - } else { - return 2; // L: 854 - } - } else { - class295.Interpreter_intStackSize -= 2; // L: 825 - int var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 826 - int var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 827 - var3.itemId = var4; // L: 828 - var3.itemQuantity = var5; // L: 829 - ItemComposition var6 = class67.ItemDefinition_get(var4); // L: 830 - var3.modelAngleX = var6.xan2d; // L: 831 - var3.modelAngleY = var6.yan2d; // L: 832 - var3.modelAngleZ = var6.zan2d; // L: 833 - var3.modelOffsetX = var6.offsetX2d; // L: 834 - var3.modelOffsetY = var6.offsetY2d; // L: 835 - var3.modelZoom = var6.zoom2d; // L: 836 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 837 - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 838 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 839 - } - - if (var3.field3398 > 0) { // L: 840 - var3.modelZoom = var3.modelZoom * 32 / var3.field3398; - } else if (var3.rawWidth > 0) { // L: 841 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 842 - } - } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 662bf0fe4e..44eaa68de7 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("ik") +@ObfuscatedName("hs") @Implements("WorldMapSection") public interface WorldMapSection { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhw;I)V", - garbageValue = "-1521793701" + descriptor = "(Lgu;I)V", + garbageValue = "964088357" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2091891709" + garbageValue = "-1337137401" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-59" + descriptor = "(III)Z", + garbageValue = "1769831605" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-604533765" + garbageValue = "1941144122" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lko;", - garbageValue = "-41254697" + descriptor = "(III)Lks;", + garbageValue = "-670243838" ) @Export("coord") Coord coord(int var1, int var2); @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "119" + descriptor = "(Lpi;I)V", + garbageValue = "-860121653" ) @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 0323229a07..acff6a796d 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("ha") +@ObfuscatedName("gk") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 344231223 + intValue = -2145116039 ) @Export("oldZ") int oldZ; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1035393563 + intValue = 1492900833 ) @Export("newZ") int newZ; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1997888961 + intValue = -1446835647 ) @Export("oldX") int oldX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1272815325 + intValue = -900342197 ) @Export("oldY") int oldY; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 656734223 + intValue = -1517609517 ) @Export("newX") int newX; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2030926423 + intValue = -643341675 ) @Export("newY") int newY; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 854326889 + intValue = 838630171 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -175837381 + intValue = -2088226529 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 276851 + intValue = 1613017713 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1589908823 + intValue = 917626923 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("k") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -534968503 + intValue = -492614719 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1567190027 + intValue = 935129113 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1196152405 + intValue = -2057232245 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2098383461 + intValue = 1809947597 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -97,126 +97,178 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhw;I)V", - garbageValue = "-1521793701" + descriptor = "(Lgu;I)V", + garbageValue = "964088357" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { // L: 26 + if (var1.regionLowX > this.newX) { // L: 25 var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; // L: 27 + var1.regionHighX = this.newX; // L: 26 } - if (var1.regionLowY > this.newY) { // L: 28 + if (var1.regionLowY > this.newY) { // L: 27 var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { // L: 29 + if (var1.regionHighY < this.newY) { // L: 28 var1.regionHighY = this.newY; } - } // L: 30 + } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2091891709" + garbageValue = "-1337137401" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 34 - return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 37 + if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 32 + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35 } else { - return false; // L: 35 + return false; // L: 33 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-59" + descriptor = "(III)Z", + garbageValue = "1769831605" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 42 + return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-604533765" + garbageValue = "1941144122" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 47 - return null; // L: 48 + if (!this.containsCoord(var1, var2, var3)) { // L: 43 + return null; // L: 44 } else { - int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 50 51 52 - return var4; // L: 53 + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 + return var4; // L: 49 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lko;", - garbageValue = "-41254697" + descriptor = "(III)Lks;", + garbageValue = "-670243838" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 58 - return null; // L: 59 + if (!this.containsPosition(var1, var2)) { // L: 53 + return null; // L: 54 } else { - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 61 - int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 62 - return new Coord(this.oldZ, var3, var4); // L: 63 + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 + return new Coord(this.oldZ, var3, var4); // L: 58 } } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "119" + descriptor = "(Lpi;I)V", + garbageValue = "-860121653" ) @Export("read") public void read(Buffer var1) { - this.oldZ = var1.readUnsignedByte(); // L: 68 - this.newZ = var1.readUnsignedByte(); // L: 69 - this.oldX = var1.readUnsignedShort(); // L: 70 - this.oldChunkXLow = var1.readUnsignedByte(); // L: 71 - this.oldChunkXHigh = var1.readUnsignedByte(); // L: 72 - this.oldY = var1.readUnsignedShort(); // L: 73 - this.oldChunkYLow = var1.readUnsignedByte(); // L: 74 - this.oldChunkYHigh = var1.readUnsignedByte(); // L: 75 - this.newX = var1.readUnsignedShort(); // L: 76 - this.newChunkXLow = var1.readUnsignedByte(); // L: 77 - this.newChunkXHigh = var1.readUnsignedByte(); // L: 78 - this.newY = var1.readUnsignedShort(); // L: 79 - this.newChunkYLow = var1.readUnsignedByte(); // L: 80 - this.newChunkYHigh = var1.readUnsignedByte(); // L: 81 - this.postRead(); // L: 82 - } // L: 83 + this.oldZ = var1.readUnsignedByte(); + this.newZ = var1.readUnsignedByte(); // L: 63 + this.oldX = var1.readUnsignedShort(); + this.oldChunkXLow = var1.readUnsignedByte(); + this.oldChunkXHigh = var1.readUnsignedByte(); + this.oldY = var1.readUnsignedShort(); // L: 67 + this.oldChunkYLow = var1.readUnsignedByte(); + this.oldChunkYHigh = var1.readUnsignedByte(); + this.newX = var1.readUnsignedShort(); // L: 70 + this.newChunkXLow = var1.readUnsignedByte(); // L: 71 + this.newChunkXHigh = var1.readUnsignedByte(); // L: 72 + this.newY = var1.readUnsignedShort(); // L: 73 + this.newChunkYLow = var1.readUnsignedByte(); // L: 74 + this.newChunkYHigh = var1.readUnsignedByte(); + this.postRead(); // L: 76 + } // L: 77 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1570988725" + garbageValue = "-1290063965" ) @Export("postRead") void postRead() { - } // L: 85 + } // L: 79 - @ObfuscatedName("kq") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1704295952" + descriptor = "(CI)Z", + garbageValue = "-1330681104" ) - static final void method4940(int var0) { - var0 = Math.max(Math.min(var0, 100), 0); // L: 11340 - var0 = 100 - var0; // L: 11341 - float var1 = (float)var0 / 200.0F + 0.5F; // L: 11342 - class175.method3439((double)var1); // L: 11343 - } // L: 11344 + public static boolean method4303(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 61 + return true; + } else { + if (var0 != 0) { // L: 62 + char[] var1 = class345.cp1252AsciiExtension; // L: 64 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 65 + char var3 = var1[var2]; // L: 66 + if (var0 == var3) { // L: 68 + return true; // L: 69 + } + } + } + + return false; // L: 75 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "91" + ) + static final void method4283() { + if (!ViewportMouse.ViewportMouse_false0) { // L: 88 + int var0 = Scene.Scene_cameraPitchSine; // L: 89 + int var1 = Scene.Scene_cameraPitchCosine; // L: 90 + int var2 = Scene.Scene_cameraYawSine; // L: 91 + int var3 = Scene.Scene_cameraYawCosine; // L: 92 + byte var4 = 50; // L: 93 + short var5 = 3500; // L: 94 + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 95 + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 96 + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 97 + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 98 + int var10 = Rasterizer3D.method4656(var7, var4, var1, var0); // L: 100 + int var11 = Rasterizer3D.method4630(var7, var4, var1, var0); // L: 101 + var7 = var10; // L: 102 + var10 = Rasterizer3D.method4656(var9, var5, var1, var0); // L: 103 + int var12 = Rasterizer3D.method4630(var9, var5, var1, var0); // L: 104 + var9 = var10; // L: 105 + var10 = Rasterizer3D.method4627(var6, var11, var3, var2); // L: 106 + var11 = Rasterizer3D.method4628(var6, var11, var3, var2); // L: 107 + var6 = var10; // L: 108 + var10 = Rasterizer3D.method4627(var8, var12, var3, var2); // L: 109 + var12 = Rasterizer3D.method4628(var8, var12, var3, var2); // L: 110 + FaceNormal.field2664 = (var10 + var6) / 2; // L: 112 + ItemComposition.field2076 = (var7 + var9) / 2; // L: 113 + ViewportMouse.field2802 = (var11 + var12) / 2; // L: 114 + ViewportMouse.field2805 = (var10 - var6) / 2; // L: 115 + ViewportMouse.field2804 = (var9 - var7) / 2; // L: 116 + class18.field95 = (var12 - var11) / 2; // L: 117 + class9.field35 = Math.abs(ViewportMouse.field2805); // L: 118 + ViewportMouse.field2808 = Math.abs(ViewportMouse.field2804); // L: 119 + class196.field2204 = Math.abs(class18.field95); // L: 120 + } + } // L: 121 } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 2d889f61e4..be5a78d641 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -1,48 +1,59 @@ +import java.awt.FontMetrics; +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("il") +@ObfuscatedName("hd") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("w") - @Export("cacheSubPaths") - public static String[] cacheSubPaths; + @ObfuscatedName("l") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1670816889 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("ak") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 337700621 + intValue = -660682519 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -871255259 + intValue = 1314045431 ) @Export("planes") int planes; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 380425473 + intValue = 911829811 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -925378869 + intValue = -1785911481 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1275046463 + intValue = 587301171 ) @Export("regionEndX") int regionEndX; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -899633607 + intValue = 1342465229 ) @Export("regionEndY") int regionEndY; @@ -52,106 +63,341 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhw;I)V", - garbageValue = "-1521793701" + descriptor = "(Lgu;I)V", + garbageValue = "964088357" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { // L: 18 + if (var1.regionLowX > this.regionEndX) { // L: 17 var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; // L: 19 + var1.regionHighX = this.regionEndX; // L: 18 } - if (var1.regionLowY > this.regionEndY) { // L: 20 + if (var1.regionLowY > this.regionEndY) { // L: 19 var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { // L: 21 + if (var1.regionHighY < this.regionEndY) { // L: 20 var1.regionHighY = this.regionEndY; } - } // L: 22 + } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2091891709" + garbageValue = "-1337137401" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 26 - return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 29 + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 24 + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27 } else { - return false; // L: 27 + return false; // L: 25 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-59" + descriptor = "(III)Z", + garbageValue = "1769831605" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34 + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-604533765" + garbageValue = "1941144122" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 39 - return null; // L: 40 + if (!this.containsCoord(var1, var2, var3)) { // L: 35 + return null; // L: 36 } else { - int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 42 43 44 - return var4; // L: 45 + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 38 39 40 + return var4; // L: 41 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lko;", - garbageValue = "-41254697" + descriptor = "(III)Lks;", + garbageValue = "-670243838" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 50 - return null; // L: 51 + if (!this.containsPosition(var1, var2)) { // L: 45 + return null; // L: 46 } else { - int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 53 - int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 54 - return new Coord(this.minPlane, var3, var4); // L: 55 + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 48 + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 49 + return new Coord(this.minPlane, var3, var4); // L: 50 } } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "119" + descriptor = "(Lpi;I)V", + garbageValue = "-860121653" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); // L: 60 - this.planes = var1.readUnsignedByte(); // L: 61 - this.regionStartX = var1.readUnsignedShort(); // L: 62 - this.regionStartY = var1.readUnsignedShort(); // L: 63 - this.regionEndX = var1.readUnsignedShort(); // L: 64 - this.regionEndY = var1.readUnsignedShort(); // L: 65 - this.postRead(); // L: 66 - } // L: 67 + this.minPlane = var1.readUnsignedByte(); // L: 54 + this.planes = var1.readUnsignedByte(); // L: 55 + this.regionStartX = var1.readUnsignedShort(); // L: 56 + this.regionStartY = var1.readUnsignedShort(); // L: 57 + this.regionEndX = var1.readUnsignedShort(); // L: 58 + this.regionEndY = var1.readUnsignedShort(); // L: 59 + this.postRead(); // L: 60 + } // L: 61 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" + descriptor = "(I)V", + garbageValue = "1338654039" ) @Export("postRead") void postRead() { + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "40" + ) + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 + if (var1 != null) { // L: 64 + for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 + var1.ids[var2] = -1; // L: 66 + var1.quantities[var2] = 0; // L: 67 + } + + } } // L: 69 + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(ZLpz;B)V", + garbageValue = "71" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field626 = 0; // L: 8045 + Client.field547 = 0; // L: 8046 + PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8048 + var2.importIndex(); // L: 8049 + int var3 = var2.readBits(8); // L: 8050 + int var4; + if (var3 < Client.npcCount) { // L: 8051 + for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8052 + Client.field627[++Client.field626 - 1] = Client.npcIndices[var4]; + } + } + + if (var3 > Client.npcCount) { // L: 8054 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 8055 + + int var5; + int var7; + int var8; + int var10; + for (var4 = 0; var4 < var3; ++var4) { // L: 8056 + var5 = Client.npcIndices[var4]; // L: 8057 + NPC var13 = Client.npcs[var5]; // L: 8058 + var7 = var2.readBits(1); // L: 8059 + if (var7 == 0) { // L: 8060 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8061 + var13.npcCycle = Client.cycle; // L: 8062 + } else { + var8 = var2.readBits(2); // L: 8065 + if (var8 == 0) { // L: 8066 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8067 + var13.npcCycle = Client.cycle; // L: 8068 + Client.field548[++Client.field547 - 1] = var5; // L: 8069 + } else { + int var9; + if (var8 == 1) { // L: 8072 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8073 + var13.npcCycle = Client.cycle; // L: 8074 + var9 = var2.readBits(3); // L: 8075 + var13.method2347(var9, class193.field2185); // L: 8076 + var10 = var2.readBits(1); // L: 8077 + if (var10 == 1) { // L: 8078 + Client.field548[++Client.field547 - 1] = var5; + } + } else if (var8 == 2) { // L: 8081 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8082 + var13.npcCycle = Client.cycle; // L: 8083 + if (var2.readBits(1) == 1) { // L: 8084 + var9 = var2.readBits(3); // L: 8085 + var13.method2347(var9, class193.field2187); // L: 8086 + var10 = var2.readBits(3); // L: 8087 + var13.method2347(var10, class193.field2187); // L: 8088 + } else { + var9 = var2.readBits(3); // L: 8091 + var13.method2347(var9, class193.field2184); // L: 8092 + } + + var9 = var2.readBits(1); // L: 8094 + if (var9 == 1) { // L: 8095 + Client.field548[++Client.field547 - 1] = var5; + } + } else if (var8 == 3) { // L: 8098 + Client.field627[++Client.field626 - 1] = var5; // L: 8099 + } + } + } + } + + int var11; + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 8106 + var11 = var1.readBits(15); // L: 8107 + if (var11 == 32767) { // L: 8108 + break; + } + + boolean var14 = false; // L: 8109 + if (Client.npcs[var11] == null) { // L: 8110 + Client.npcs[var11] = new NPC(); // L: 8111 + var14 = true; // L: 8112 + } + + NPC var12 = Client.npcs[var11]; // L: 8114 + Client.npcIndices[++Client.npcCount - 1] = var11; // L: 8115 + var12.npcCycle = Client.cycle; // L: 8116 + int var6; + boolean var15; + if (class431.field4602) { // L: 8120 + if (var0) { // L: 8121 + var6 = var1.readBits(8); // L: 8122 + if (var6 > 127) { // L: 8123 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 8126 + if (var6 > 15) { // L: 8127 + var6 -= 32; + } + } + + var5 = var1.readBits(1); // L: 8129 + var8 = Client.defaultRotations[var1.readBits(3)]; // L: 8130 + if (var14) { // L: 8131 + var12.orientation = var12.rotation = var8; + } + + var12.definition = KeyHandler.getNpcDefinition(var1.readBits(14)); // L: 8132 + if (var0) { // L: 8133 + var7 = var1.readBits(8); // L: 8134 + if (var7 > 127) { // L: 8135 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 8138 + if (var7 > 15) { // L: 8139 + var7 -= 32; + } + } + + var15 = var1.readBits(1) == 1; // L: 8141 + if (var15) { // L: 8142 + var1.readBits(32); // L: 8143 + } + + var10 = var1.readBits(1); // L: 8145 + if (var10 == 1) { // L: 8146 + Client.field548[++Client.field547 - 1] = var11; + } + } else { + var5 = var1.readBits(1); // L: 8149 + var8 = var1.readBits(1); // L: 8150 + if (var8 == 1) { // L: 8151 + Client.field548[++Client.field547 - 1] = var11; + } + + if (var0) { // L: 8152 + var7 = var1.readBits(8); // L: 8153 + if (var7 > 127) { // L: 8154 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 8157 + if (var7 > 15) { // L: 8158 + var7 -= 32; + } + } + + var15 = var1.readBits(1) == 1; // L: 8160 + if (var15) { // L: 8161 + var1.readBits(32); // L: 8162 + } + + if (var0) { // L: 8164 + var6 = var1.readBits(8); // L: 8165 + if (var6 > 127) { // L: 8166 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 8169 + if (var6 > 15) { // L: 8170 + var6 -= 32; + } + } + + var12.definition = KeyHandler.getNpcDefinition(var1.readBits(14)); // L: 8172 + var10 = Client.defaultRotations[var1.readBits(3)]; // L: 8173 + if (var14) { // L: 8174 + var12.orientation = var12.rotation = var10; + } + } + + var12.field1150 = var12.definition.size; // L: 8176 + var12.field1175 = var12.definition.rotation; // L: 8177 + if (var12.field1175 == 0) { // L: 8178 + var12.rotation = 0; + } + + var12.walkSequence = var12.definition.walkSequence; // L: 8179 + var12.walkBackSequence = var12.definition.walkBackSequence; // L: 8180 + var12.walkLeftSequence = var12.definition.walkLeftSequence; // L: 8181 + var12.walkRightSequence = var12.definition.walkRightSequence; // L: 8182 + var12.idleSequence = var12.definition.idleSequence; // L: 8183 + var12.turnLeftSequence = var12.definition.turnLeftSequence; // L: 8184 + var12.turnRightSequence = var12.definition.turnRightSequence; // L: 8185 + var12.method2348(GrandExchangeEvents.localPlayer.pathX[0] + var6, GrandExchangeEvents.localPlayer.pathY[0] + var7, var5 == 1); // L: 8186 + } + + var1.exportIndex(); // L: 8188 + MouseHandler.method593(var1); // L: 8190 + + for (var11 = 0; var11 < Client.field626; ++var11) { // L: 8191 + var3 = Client.field627[var11]; // L: 8192 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8193 + Client.npcs[var3].definition = null; // L: 8194 + Client.npcs[var3] = null; // L: 8195 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8198 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var11 = 0; var11 < Client.npcCount; ++var11) { // L: 8199 + if (Client.npcs[Client.npcIndices[var11]] == null) { // L: 8200 + throw new RuntimeException(var11 + "," + Client.npcCount); // L: 8201 + } + } + + } + } + } // L: 8204 } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index ac805f7ac2..ae1edf5371 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,98 +4,104 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("ga") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -609118689 + intValue = -2086357139 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -922097575 + intValue = 891943535 ) @Export("planes") int planes; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -962629091 + intValue = 72025167 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 487814859 + intValue = 456925677 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -820840621 + intValue = 620959139 ) @Export("regionEndX") int regionEndX; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1924618585 + intValue = -1044341743 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1193578549 + intValue = 1229812531 ) - int field2670; - @ObfuscatedName("f") + int field2233; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1466637361 + intValue = -1125733411 ) - int field2674; - @ObfuscatedName("u") + int field2234; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -7961391 + intValue = -1336777703 ) - int field2678; - @ObfuscatedName("r") + int field2230; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 311755747 + intValue = -980729145 ) - int field2679; + int field2232; WorldMapSection2() { } // L: 18 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhw;I)V", - garbageValue = "-1521793701" + descriptor = "(Lgu;I)V", + garbageValue = "964088357" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2670) { // L: 22 - var1.regionLowX = this.field2670; + if (var1.regionLowX > this.field2233) { // L: 21 + var1.regionLowX = this.field2233; } - if (var1.regionHighX < this.field2678) { - var1.regionHighX = this.field2678; // L: 23 + if (var1.regionHighX < this.field2230) { + var1.regionHighX = this.field2230; // L: 22 } - if (var1.regionLowY > this.field2674) { // L: 24 - var1.regionLowY = this.field2674; + if (var1.regionLowY > this.field2234) { // L: 23 + var1.regionLowY = this.field2234; } - if (var1.regionHighY < this.field2679) { // L: 25 - var1.regionHighY = this.field2679; + if (var1.regionHighY < this.field2232) { // L: 24 + var1.regionHighY = this.field2232; } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2091891709" + garbageValue = "-1337137401" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -106,109 +112,102 @@ public class WorldMapSection2 implements WorldMapSection { } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-59" + descriptor = "(III)Z", + garbageValue = "1769831605" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2670 && var1 >> 6 <= this.field2678 && var2 >> 6 >= this.field2674 && var2 >> 6 <= this.field2679; // L: 38 + return var1 >> 6 >= this.field2233 && var1 >> 6 <= this.field2230 && var2 >> 6 >= this.field2234 && var2 >> 6 <= this.field2232; } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-604533765" + garbageValue = "1941144122" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 43 - return null; // L: 44 + if (!this.containsCoord(var1, var2, var3)) { + return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field2670 * 64 - this.regionStartX * 64), var3 + (this.field2674 * 64 - this.regionStartY * 64)}; // L: 46 47 48 - return var4; // L: 49 + int[] var4 = new int[]{var2 + (this.field2233 * 64 - this.regionStartX * 64), var3 + (this.field2234 * 64 - this.regionStartY * 64)}; // L: 42 44 + return var4; // L: 45 } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lko;", - garbageValue = "-41254697" + descriptor = "(III)Lks;", + garbageValue = "-670243838" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 54 - return null; // L: 55 + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 } else { - int var3 = this.regionStartX * 64 - this.field2670 * 64 + var1; // L: 57 - int var4 = var2 + (this.regionStartY * 64 - this.field2674 * 64); // L: 58 - return new Coord(this.minPlane, var3, var4); // L: 59 + int var3 = this.regionStartX * 64 - this.field2233 * 64 + var1; // L: 52 + int var4 = var2 + (this.regionStartY * 64 - this.field2234 * 64); // L: 53 + return new Coord(this.minPlane, var3, var4); // L: 54 } } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "119" + descriptor = "(Lpi;I)V", + garbageValue = "-860121653" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); // L: 64 - this.planes = var1.readUnsignedByte(); // L: 65 - this.regionStartX = var1.readUnsignedShort(); // L: 66 - this.regionStartY = var1.readUnsignedShort(); // L: 67 - this.regionEndX = var1.readUnsignedShort(); // L: 68 - this.regionEndY = var1.readUnsignedShort(); // L: 69 - this.field2670 = var1.readUnsignedShort(); // L: 70 - this.field2674 = var1.readUnsignedShort(); // L: 71 - this.field2678 = var1.readUnsignedShort(); // L: 72 - this.field2679 = var1.readUnsignedShort(); // L: 73 - this.postRead(); // L: 74 - } // L: 75 + this.minPlane = var1.readUnsignedByte(); // L: 58 + this.planes = var1.readUnsignedByte(); // L: 59 + this.regionStartX = var1.readUnsignedShort(); // L: 60 + this.regionStartY = var1.readUnsignedShort(); // L: 61 + this.regionEndX = var1.readUnsignedShort(); // L: 62 + this.regionEndY = var1.readUnsignedShort(); // L: 63 + this.field2233 = var1.readUnsignedShort(); // L: 64 + this.field2234 = var1.readUnsignedShort(); // L: 65 + this.field2230 = var1.readUnsignedShort(); // L: 66 + this.field2232 = var1.readUnsignedShort(); // L: 67 + this.postRead(); // L: 68 + } // L: 69 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1066929614" + descriptor = "(S)V", + garbageValue = "255" ) @Export("postRead") void postRead() { - } // L: 77 + } // L: 71 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;IIIZI)V", - garbageValue = "1018081729" + descriptor = "(B)V", + garbageValue = "-16" ) - public static void method4561(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class273.musicPlayerStatus = 1; // L: 26 - class147.musicTrackArchive = var0; // L: 27 - ArchiveLoader.musicTrackGroupId = var1; // L: 28 - class273.musicTrackFileId = var2; // L: 29 - DevicePcmPlayerProvider.musicTrackVolume = var3; // L: 30 - class260.musicTrackBoolean = var4; // L: 31 - class273.pcmSampleLength = 10000; // L: 32 - } // L: 33 + static void method3959() { + class326.field4041 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; // L: 27 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2085345947" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 17 - } + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 + var3 = class163.method3320((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); // L: 30 + class326.field4041[var0] = var3; // L: 31 + ++var0; // L: 29 + } - @ObfuscatedName("lg") - @ObfuscatedSignature( - descriptor = "(Lkn;I)I", - garbageValue = "-1150366457" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11787 - return var1 != null ? var1.integer : var0.flags; // L: 11788 11789 - } + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < class326.field4041.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = class163.method3320((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class326.field4041.length; ++var0) { // L: 37 38 + class326.field4041[var0] = var4; // L: 39 + } + } + + } // L: 43 } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index a91f2bd67a..5696ce4cb4 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,56 +1,59 @@ +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 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("hs") +@ObfuscatedName("he") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhe;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(2, (byte)0), - @ObfuscatedName("o") + WORLDMAPSECTIONTYPE0(3, (byte)0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhe;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(3, (byte)1), - @ObfuscatedName("h") + WORLDMAPSECTIONTYPE1(2, (byte)1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhe;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhe;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("su") + @ObfuscatedName("a") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 703478945 + intValue = -2117760903 ) - static int field2778; - @ObfuscatedName("x") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("fn") + static int field2321; + @ObfuscatedName("hy") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -854711519 - ) - static int field2768; - @ObfuscatedName("hw") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 263983215 + intValue = 1196340151 ) @Export("type") final int type; @@ -63,218 +66,422 @@ public enum WorldMapSectionType implements MouseWheel { this.id = var4; // L: 22 } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 27 + return this.id; // L: 26 } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)[Lhs;", - garbageValue = "330222458" + descriptor = "(JLjava/lang/String;I)I", + garbageValue = "-23723856" ) - static WorldMapSectionType[] method4949() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0}; // L: 17 + static final int method4312(long var0, String var2) { + Random var3 = new Random(); // L: 65 + Buffer var4 = new Buffer(128); // L: 66 + Buffer var5 = new Buffer(128); // L: 67 + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 68 69 70 71 72 + var4.writeByte(10); + + int var7; + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.writeInt(var6[0]); // L: 77 + var4.writeInt(var6[1]); // L: 78 + var4.writeLong(var0); // L: 79 + var4.writeLong(0L); // L: 80 + + for (var7 = 0; var7 < 4; ++var7) { // L: 81 + var4.writeInt(var3.nextInt()); // L: 82 + } + + var4.encryptRsa(class65.field863, class65.field864); // L: 84 + var5.writeByte(10); // L: 85 + + for (var7 = 0; var7 < 3; ++var7) { // L: 86 + var5.writeInt(var3.nextInt()); // L: 87 + } + + var5.writeLong(var3.nextLong()); // L: 89 + var5.writeLongMedium(var3.nextLong()); // L: 90 + if (Client.randomDatData != null) { // L: 92 + var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 93 + } else { + byte[] var8 = new byte[24]; // L: 98 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 100 + JagexCache.JagexCache_randomDat.readFully(var8); // L: 101 + + int var9; + for (var9 = 0; var9 < 24 && var8[var9] == 0; ++var9) { // L: 102 103 104 + } + + if (var9 >= 24) { // L: 106 + throw new IOException(); + } + } catch (Exception var24) { + for (int var10 = 0; var10 < 24; ++var10) { // L: 109 + var8[var10] = -1; + } + } + + var5.writeBytes(var8, 0, var8.length); // L: 114 + } + + var5.writeLong(var3.nextLong()); // L: 116 + var5.encryptRsa(class65.field863, class65.field864); // L: 117 + var7 = class425.stringCp1252NullTerminatedByteSize(var2); // L: 118 + if (var7 % 8 != 0) { // L: 119 + var7 += 8 - var7 % 8; + } + + Buffer var25 = new Buffer(var7); // L: 120 + var25.writeStringCp1252NullTerminated(var2); // L: 121 + var25.offset = var7; // L: 122 + var25.xteaEncryptAll(var6); // L: 123 + Buffer var18 = new Buffer(var4.offset + var5.offset + var25.offset + 5); // L: 124 + var18.writeByte(2); // L: 125 + var18.writeByte(var4.offset); // L: 126 + var18.writeBytes(var4.array, 0, var4.offset); // L: 127 + var18.writeByte(var5.offset); // L: 128 + var18.writeBytes(var5.array, 0, var5.offset); // L: 129 + var18.writeShort(var25.offset); // L: 130 + var18.writeBytes(var25.array, 0, var25.offset); // L: 131 + String var20 = ApproximateRouteStrategy.method1125(var18.array); // L: 132 + + try { + URL var11 = new URL(ArchiveLoader.method2063("services", false) + "m=accountappeal/login.ws"); // L: 134 + URLConnection var12 = var11.openConnection(); // L: 135 + var12.setDoInput(true); // L: 136 + var12.setDoOutput(true); // L: 137 + var12.setConnectTimeout(5000); // L: 138 + OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); // L: 139 + var13.write("data2=" + class270.method5206(var20) + "&dest=" + class270.method5206("passwordchoice.ws")); // L: 140 + var13.flush(); // L: 141 + InputStream var14 = var12.getInputStream(); // L: 142 + var18 = new Buffer(new byte[1000]); // L: 143 + + do { + int var15 = var14.read(var18.array, var18.offset, 1000 - var18.offset); // L: 145 + if (var15 == -1) { // L: 146 + var13.close(); // L: 152 + var14.close(); // L: 153 + String var21 = new String(var18.array); // L: 154 + if (var21.startsWith("OFFLINE")) { // L: 155 + return 4; // L: 156 + } else if (var21.startsWith("WRONG")) { // L: 158 + return 7; // L: 159 + } else if (var21.startsWith("RELOAD")) { // L: 161 + return 3; // L: 162 + } else if (var21.startsWith("Not permitted for social network accounts.")) { // L: 164 + return 6; // L: 165 + } else { + var18.xteaDecryptAll(var6); // L: 167 + + while (var18.offset > 0 && var18.array[var18.offset - 1] == 0) { // L: 168 + --var18.offset; // L: 169 + } + + var21 = new String(var18.array, 0, var18.offset); // L: 171 + boolean var16; + if (var21 == null) { // L: 174 + var16 = false; // L: 175 + } else { + label106: { + try { + new URL(var21); + } catch (MalformedURLException var22) { // L: 181 + var16 = false; // L: 182 + break label106; // L: 183 + } + + var16 = true; // L: 185 + } + } + + if (var16) { // L: 187 + class391.openURL(var21, true, false); // L: 188 + return 2; // L: 189 + } else { + return 5; // L: 191 + } + } + } + + var18.offset += var15; // L: 147 + } while(var18.offset < 1000); // L: 148 + + return 5; // L: 149 + } catch (Throwable var23) { // L: 193 + var23.printStackTrace(); // L: 194 + return 5; // L: 195 + } } - @ObfuscatedName("u") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lhe;", + garbageValue = "-868172814" + ) + static WorldMapSectionType[] method4305() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0}; // L: 17 + } + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "334656571" + garbageValue = "1441766816" ) - static int method4942(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 - if (var1 == null) { // L: 76 + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 + if (var1 == null) { // L: 74 return -1; } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 77 78 + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 } } - @ObfuscatedName("b") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lkn;I)I", - garbageValue = "100950073" + descriptor = "(ILbd;ZI)I", + garbageValue = "-2088968249" ) - static int method4952(Widget var0) { - if (var0.type != 11) { // L: 1238 - Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1239 - return 1; // L: 1240 + static int method4310(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2710 + if (class154.guestClanSettings != null) { // L: 2711 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2712 + Calendar.field3269 = class154.guestClanSettings; // L: 2713 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2715 + } + + return 1; // L: 2716 } else { - String var1 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1242 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var0.method5666(var1); // L: 1243 - return 1; // L: 1244 + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2718 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2719 + if (Client.currentClanSettings[var3] != null) { // L: 2720 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2721 + Calendar.field3269 = Client.currentClanSettings[var3]; // L: 2722 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2724 + } + + return 1; // L: 2725 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2727 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Calendar.field3269.name; // L: 2728 + return 1; // L: 2729 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2731 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.allowGuests ? 1 : 0; // L: 2732 + return 1; // L: 2733 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2735 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1591; // L: 2736 + return 1; // L: 2737 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2739 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1592; // L: 2740 + return 1; // L: 2741 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2743 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1593; // L: 2744 + return 1; // L: 2745 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2747 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1606; // L: 2748 + return 1; // L: 2749 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2751 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.memberCount; // L: 2752 + return 1; // L: 2753 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2755 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2756 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Calendar.field3269.memberNames[var3]; // L: 2757 + return 1; // L: 2758 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2760 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2761 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.memberRanks[var3]; // L: 2762 + return 1; // L: 2763 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2765 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.bannedMemberCount; // L: 2766 + return 1; // L: 2767 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2769 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2770 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Calendar.field3269.bannedMemberNames[var3]; // L: 2771 + return 1; // L: 2772 + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2774 + Interpreter.Interpreter_intStackSize -= 3; // L: 2775 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2776 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2777 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2778 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.method2956(var3, var6, var5); // L: 2779 + return 1; // L: 2780 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2782 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.currentOwner; // L: 2783 + return 1; // L: 2784 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2786 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1604; // L: 2787 + return 1; // L: 2788 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2790 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.method2955(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 2791 + return 1; // L: 2792 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2794 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; // L: 2795 + return 1; // L: 2796 + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2798 + Interpreter.Interpreter_intStackSize -= 2; // L: 2799 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2800 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2801 + class18.method264(var6, var3); // L: 2802 + return 1; // L: 2803 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2805 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2806 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1600[var3]; // L: 2807 + return 1; // L: 2808 + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2810 + Interpreter.Interpreter_intStackSize -= 3; // L: 2811 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2812 + boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2813 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2814 + ClanChannel.method3137(var5, var3, var4); // L: 2815 + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2817 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2818 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1601[var3] ? 1 : 0; // L: 2819 + return 1; // L: 2820 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2822 + if (class21.guestClanChannel != null) { // L: 2823 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2824 + FriendSystem.field808 = class21.guestClanChannel; // L: 2825 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2827 + } + + return 1; // L: 2828 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2830 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2831 + if (Client.currentClanChannels[var3] != null) { // L: 2832 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2833 + FriendSystem.field808 = Client.currentClanChannels[var3]; // L: 2834 + AttackOption.field1255 = var3; // L: 2835 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2837 + } + + return 1; // L: 2838 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2840 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = FriendSystem.field808.name; // L: 2841 + return 1; // L: 2842 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2844 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.field1659; // L: 2845 + return 1; // L: 2846 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2848 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.field1654; // L: 2849 + return 1; // L: 2850 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2852 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.method3119(); // L: 2853 + return 1; // L: 2854 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2856 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2857 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ((ClanChannelMember)FriendSystem.field808.members.get(var3)).username.getName(); // L: 2858 + return 1; // L: 2859 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2861 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2862 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)FriendSystem.field808.members.get(var3)).rank; // L: 2863 + return 1; // L: 2864 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2866 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2867 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)FriendSystem.field808.members.get(var3)).world; // L: 2868 + return 1; // L: 2869 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2871 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2872 + HealthBar.method2328(AttackOption.field1255, var3); // L: 2873 + return 1; // L: 2874 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2876 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.method3116(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 2877 + return 1; // L: 2878 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2880 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; // L: 2881 + return 1; // L: 2882 + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2884 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HorizontalAlignment.field1885 != null ? 1 : 0; // L: 2885 + return 1; // L: 2886 + } else { + return 2; // L: 2888 + } + } + } } } - @ObfuscatedName("fj") + @ObfuscatedName("gj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1416407373" + descriptor = "(III)V", + garbageValue = "815671875" ) - static final void method4945() { - if (Client.field721 != class160.Client_plane) { // L: 3387 - Client.field721 = class160.Client_plane; // L: 3388 - Tile.method3991(class160.Client_plane); // L: 3389 + static final void method4308(int var0, int var1) { + if (var0 < 128) { // L: 3756 + var0 = 128; } - } // L: 3391 + if (var0 > 383) { // L: 3757 + var0 = 383; + } - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(Lco;I)V", - garbageValue = "2020295686" - ) - static final void method4950(Actor var0) { - var0.isWalking = false; // L: 3777 - SequenceDefinition var1; - int var2; - if (var0.movementSequence != -1) { // L: 3778 - var1 = ItemContainer.SequenceDefinition_get(var0.movementSequence); // L: 3779 - if (var1 != null) { // L: 3780 - if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 3781 - ++var0.movementFrameCycle; // L: 3782 - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 3783 - var0.movementFrameCycle = 1; // L: 3784 - ++var0.movementFrame; // L: 3785 - class152.method3102(var1, var0.movementFrame, var0.x, var0.y); // L: 3786 - } - - if (var0.movementFrame >= var1.frameIds.length) { // L: 3788 - var0.movementFrameCycle = 0; // L: 3789 - var0.movementFrame = 0; // L: 3790 - class152.method3102(var1, var0.movementFrame, var0.x, var0.y); // L: 3791 - } - } else if (var1.isCachedModelIdSet()) { // L: 3794 - ++var0.movementFrame; // L: 3795 - var2 = var1.method3827(); // L: 3796 - if (var0.movementFrame < var2) { // L: 3797 - class241.method5002(var1, var0.movementFrame, var0.x, var0.y); // L: 3798 - } else { - var0.movementFrameCycle = 0; // L: 3801 - var0.movementFrame = 0; // L: 3802 - class241.method5002(var1, var0.movementFrame, var0.x, var0.y); // L: 3803 - } - } else { - var0.movementSequence = -1; // L: 3806 - } - } else { - var0.movementSequence = -1; // L: 3808 + if (class147.cameraPitch < var0) { // L: 3758 + class147.cameraPitch = (var0 - class147.cameraPitch) * class386.field4337 / 1000 + class147.cameraPitch + NetFileRequest.field3960; // L: 3759 + if (class147.cameraPitch > var0) { // L: 3760 + class147.cameraPitch = var0; } } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1173) { // L: 3810 - if (var0.spotAnimationFrame < 0) { // L: 3811 - var0.spotAnimationFrame = 0; - } - - int var4 = class6.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3812 - if (var4 != -1) { // L: 3813 - SequenceDefinition var5 = ItemContainer.SequenceDefinition_get(var4); // L: 3814 - if (var5 != null && var5.frameIds != null) { // L: 3815 - ++var0.spotAnimationFrameCycle; // L: 3816 - if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 3817 - var0.spotAnimationFrameCycle = 1; // L: 3818 - ++var0.spotAnimationFrame; // L: 3819 - class152.method3102(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 3820 - } - - if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 3822 3823 - var0.spotAnimation = -1; - } - } else if (var5.isCachedModelIdSet()) { // L: 3826 - ++var0.spotAnimationFrame; // L: 3827 - int var3 = var5.method3827(); // L: 3828 - if (var0.spotAnimationFrame < var3) { // L: 3829 - class241.method5002(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 3830 - } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 3833 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 3836 - } - } else { - var0.spotAnimation = -1; // L: 3838 + if (class147.cameraPitch > var0) { // L: 3762 + class147.cameraPitch -= (class147.cameraPitch - var0) * class386.field4337 / 1000 + NetFileRequest.field3960; // L: 3763 + if (class147.cameraPitch < var0) { // L: 3764 + class147.cameraPitch = var0; } } - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3840 - var1 = ItemContainer.SequenceDefinition_get(var0.sequence); // L: 3841 - if (var1.field2162 == 1 && var0.field1134 > 0 && var0.field1179 <= Client.cycle && var0.field1180 < Client.cycle) { // L: 3842 3843 - var0.sequenceDelay = 1; // L: 3844 - return; // L: 3845 - } + int var2 = var1 - class21.cameraYaw; // L: 3766 + if (var2 > 1024) { // L: 3767 + var2 -= 2048; } - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3849 - var1 = ItemContainer.SequenceDefinition_get(var0.sequence); // L: 3850 - if (var1 != null) { // L: 3851 - if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 3852 - ++var0.sequenceFrameCycle; // L: 3853 - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 3854 - var0.sequenceFrameCycle = 1; // L: 3855 - ++var0.sequenceFrame; // L: 3856 - class152.method3102(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3857 - } - - if (var0.sequenceFrame >= var1.frameIds.length) { // L: 3859 - var0.sequenceFrame -= var1.frameCount; // L: 3860 - ++var0.field1169; // L: 3861 - if (var0.field1169 >= var1.field2169) { // L: 3862 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 3863 - class152.method3102(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3864 - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field2165; // L: 3866 - } else if (var1.isCachedModelIdSet()) { // L: 3868 - ++var0.sequenceFrame; // L: 3869 - var2 = var1.method3801().method2771(); // L: 3870 - if (var0.sequenceFrame < var2) { // L: 3871 - class241.method5002(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3872 - } else { - var0.sequenceFrame -= var1.frameCount; // L: 3875 - ++var0.field1169; // L: 3876 - if (var0.field1169 >= var1.field2169) { // L: 3877 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 3878 - class241.method5002(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3879 - } else { - var0.sequence = -1; - } - } - } else { - var0.sequence = -1; // L: 3882 - } - } else { - var0.sequence = -1; // L: 3884 - } + if (var2 < -1024) { // L: 3768 + var2 += 2048; } - if (var0.sequenceDelay > 0) { // L: 3886 - --var0.sequenceDelay; + if (var2 > 0) { // L: 3769 + class21.cameraYaw = class21.cameraYaw + NetFileRequest.field3960 + var2 * class386.field4337 / 1000; // L: 3770 + class21.cameraYaw &= 2047; // L: 3771 } - } // L: 3887 + if (var2 < 0) { // L: 3773 + class21.cameraYaw -= NetFileRequest.field3960 + -var2 * class386.field4337 / 1000; // L: 3774 + class21.cameraYaw &= 2047; // L: 3775 + } - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(IIB)Lge;", - garbageValue = "1" - ) - static RouteStrategy method4954(int var0, int var1) { - Client.field477.approxDestinationX = var0; // L: 8006 - Client.field477.approxDestinationY = var1; // L: 8007 - Client.field477.approxDestinationSizeX = 1; // L: 8008 - Client.field477.approxDestinationSizeY = 1; // L: 8009 - return Client.field477; // L: 8010 - } + int var3 = var1 - class21.cameraYaw; // L: 3777 + if (var3 > 1024) { // L: 3778 + var3 -= 2048; + } + + if (var3 < -1024) { + var3 += 2048; // L: 3779 + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3780 + class21.cameraYaw = var1; + } + + } // L: 3781 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 44cdf90d2f..72bae29690 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,12 +1,13 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("hn") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("tileColors") final int[] tileColors; @@ -15,13 +16,13 @@ public final class WorldMapSprite { } // L: 12 WorldMapSprite(int[] var1) { - this.tileColors = var1; - } + this.tileColors = var1; // L: 15 + } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "373946087" + garbageValue = "921646370" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { @@ -30,109 +31,91 @@ public final class WorldMapSprite { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1898905069" + descriptor = "(Ljl;Lqv;I)Ljd;", + garbageValue = "-2117269105" ) - public static final synchronized long method4989() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class269.field3153) { // L: 15 - class269.field3154 += class269.field3153 - var0; // L: 16 + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24 + var2 = new PacketBufferNode(); // L: 25 + } else { + var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28 } - class269.field3153 = var0; // L: 18 - return var0 + class269.field3154; // L: 19 + var2.clientPacket = var0; // L: 31 + var2.clientPacketLength = var0.length; // L: 32 + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); // L: 33 + } else if (var2.clientPacketLength == -2) { // L: 34 + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); // L: 35 + } else if (var2.clientPacketLength <= 98) { // L: 36 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 37 + } + + var2.packetBuffer.setIsaacCipher(var1); // L: 38 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39 + var2.index = 0; // L: 40 + return var2; // L: 41 } - @ObfuscatedName("ig") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lcw;IIIB)V", - garbageValue = "-125" + descriptor = "(B)V", + garbageValue = "-64" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class19.localPlayer != var0) { // L: 9499 - if (Client.menuOptionsCount < 400) { // L: 9500 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 9502 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9503 - var7 = var0.combatLevel; // L: 9505 - int var8 = class19.localPlayer.combatLevel; // L: 9506 - int var9 = var8 - var7; // L: 9508 - String var6; - if (var9 < -9) { // L: 9509 - var6 = ChatChannel.colorStartTag(16711680); // L: 9510 - } else if (var9 < -6) { // L: 9513 - var6 = ChatChannel.colorStartTag(16723968); // L: 9514 - } else if (var9 < -3) { // L: 9517 - var6 = ChatChannel.colorStartTag(16740352); // L: 9518 - } else if (var9 < 0) { // L: 9521 - var6 = ChatChannel.colorStartTag(16756736); // L: 9522 - } else if (var9 > 9) { // L: 9525 - var6 = ChatChannel.colorStartTag(65280); // L: 9526 - } else if (var9 > 6) { // L: 9529 - var6 = ChatChannel.colorStartTag(4259584); // L: 9530 - } else if (var9 > 3) { // L: 9533 - var6 = ChatChannel.colorStartTag(8453888); // L: 9534 - } else if (var9 > 0) { // L: 9537 - var6 = ChatChannel.colorStartTag(12648192); // L: 9538 - } else { - var6 = ChatChannel.colorStartTag(16776960); // L: 9541 + static void method4351() { + if (Login.clearLoginScreen) { // L: 249 + Login.titleboxSprite = null; // L: 250 + Login.titlebuttonSprite = null; // L: 251 + Login.runesSprite = null; // L: 252 + class17.leftTitleSprite = null; // L: 253 + ViewportMouse.rightTitleSprite = null; // L: 254 + Decimator.logoSprite = null; // L: 255 + class92.title_muteSprite = null; // L: 256 + WorldMapSection2.options_buttons_0Sprite = null; // L: 257 + class54.options_buttons_2Sprite = null; // L: 258 + class393.worldSelectBackSprites = null; // L: 259 + class400.worldSelectFlagSprites = null; // L: 260 + class126.worldSelectArrows = null; // L: 261 + TileItem.worldSelectStars = null; // L: 262 + class135.field1569 = null; // L: 263 + class341.loginScreenRunesAnimation.method2193(); // L: 264 + Actor.method2183(2); // L: 265 + if (NetCache.NetCache_socket != null) { // L: 267 + try { + Buffer var0 = new Buffer(4); // L: 269 + var0.writeByte(2); // L: 270 + var0.writeMedium(0); // L: 271 + NetCache.NetCache_socket.write(var0.array, 0, 4); // L: 272 + } catch (IOException var3) { + try { + NetCache.NetCache_socket.close(); // L: 276 + } catch (Exception var2) { // L: 278 } - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9543 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9545 + ++NetCache.NetCache_ioExceptions; // L: 279 + NetCache.NetCache_socket = null; // L: 280 } - - int var10; - if (Client.isItemSelected == 1) { // L: 9546 - SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9547 - } else if (Client.isSpellSelected) { // L: 9550 - if ((class154.selectedSpellFlags & 8) == 8) { // L: 9551 - SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9552 - } - } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 9557 - if (Client.playerMenuActions[var10] != null) { // L: 9558 - short var11 = 0; // L: 9559 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9560 - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9561 - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class19.localPlayer.combatLevel) { // L: 9562 - var11 = 2000; // L: 9563 - } - - if (class19.localPlayer.team != 0 && var0.team != 0) { // L: 9565 - if (var0.team == class19.localPlayer.team) { // L: 9566 - var11 = 2000; - } else { - var11 = 0; // L: 9567 - } - } else if (Client.playerAttackOption == AttackOption.field1279 && var0.isClanMember()) { // L: 9569 - var11 = 2000; // L: 9570 - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 9573 - var11 = 2000; - } - - boolean var12 = false; // L: 9574 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9575 - SecureRandomFuture.insertMenuItemNoShift(Client.playerMenuActions[var10], ChatChannel.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9576 - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9581 - if (Client.menuOpcodes[var10] == 23) { // L: 9582 - Client.menuTargets[var10] = ChatChannel.colorStartTag(16777215) + var4; // L: 9583 - break; - } - } - } + + Login.clearLoginScreen = false; // L: 283 } - } // L: 9587 + } // L: 284 + + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1972677763" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 12403 + var0.packetBuffer.writeByte(0); // L: 12404 + Client.packetWriter.addNode(var0); // L: 12405 + } // L: 12406 } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index a6c0872c42..78f1a5d177 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("in") +@ObfuscatedName("iz") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("size") final int size; @@ -17,7 +17,7 @@ public abstract class Wrapper extends DualNode { @Export("get") abstract Object get(); - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 6aff6b0bb8..b374746e36 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -3,31 +3,28 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("v") public class class0 implements class3 { - class0() { - } // L: 8 - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;)Lpd;" + descriptor = "(Lpi;)Lpi;" ) - public Buffer vmethod11(Buffer var1) { - Buffer var2 = new Buffer(100); // L: 12 - this.method2(var1, var2); // L: 13 - return var2; // L: 14 + public Buffer vmethod12(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 9 + this.method2(var1, var2); // L: 10 + return var2; // L: 11 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;Lpd;)V" + descriptor = "(Lpi;Lpi;)V" ) void method2(Buffer var1, Buffer var2) { - class8 var3 = new class8(var1); // L: 18 - class5 var4 = new class5(var3); // L: 19 + class8 var3 = new class8(var1); // L: 15 + class5 var4 = new class5(var3); // L: 16 long var5; - for (var5 = 0L; !var4.method21(var3.method57(), var3.method56(), var5); ++var5) { // L: 20 21 22 + for (var5 = 0L; !var4.method19(var3.method56(), var3.method61(), var5); ++var5) { // L: 17 18 19 } - var2.writeLong(var5); // L: 24 - } // L: 25 + var2.writeLong(var5); // L: 21 + } // L: 22 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 329783424d..058e805ea9 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,48 +1,125 @@ +import java.awt.Image; 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("o") +@ObfuscatedName("c") public class class1 implements Callable { - @ObfuscatedName("cc") - public static char field3; + @ObfuscatedName("av") + static Image field3; + @ObfuscatedName("mt") + @ObfuscatedGetter( + intValue = -1311703195 + ) + @Export("menuY") + static int menuY; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) - final Buffer field4; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lg;" - ) - final class3 field0; - // $FF: synthetic field + final Buffer field0; + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lf;" ) + final class3 field1; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ll;" + ) final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lf;Lpd;Lg;)V" + descriptor = "(Ll;Lpi;Lf;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; // L: 47 - this.field4 = var2; // L: 48 - this.field0 = var3; // L: 49 + this.field0 = var2; // L: 48 + this.field1 = var3; // L: 49 } // L: 50 public Object call() { - return this.field0.vmethod11(this.field4); // L: 54 + return this.field1.vmethod12(this.field0); // L: 53 } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lca;I)V", - garbageValue = "1044420160" + descriptor = "([BIIII[Lgv;I)V", + garbageValue = "1091665610" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - class175.runScript(var0, 500000, 475000); // L: 108 - } // L: 109 + static final void method9(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { // L: 93 + for (var7 = 0; var7 < 64; ++var7) { // L: 94 + for (var8 = 0; var8 < 64; ++var8) { // L: 95 + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var8 + var2] &= -16777217; + } + } + } + } + + Buffer var10 = new Buffer(var0); // L: 100 + + for (var7 = 0; var7 < 4; ++var7) { // L: 101 + for (var8 = 0; var8 < 64; ++var8) { // L: 102 + for (int var9 = 0; var9 < 64; ++var9) { // L: 103 + class20.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + } + } + } + + } // L: 108 + + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(Llx;Ljava/lang/String;I)V", + garbageValue = "-1229961038" + ) + static void method8(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1452 + Client.archiveLoaders.add(var2); // L: 1453 + Client.field782 += var2.groupCount; // L: 1454 + } // L: 1455 + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-43" + ) + static final void method11(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 12008 + if (var0 != class131.clientPreferences.method2321()) { // L: 12009 + if (class131.clientPreferences.method2321() == 0 && Client.currentTrackGroupId != -1) { // L: 12010 + class18.method266(class16.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 12011 + Client.field746 = false; // L: 12012 + } else if (var0 == 0) { // L: 12014 + class273.midiPcmStream.clear(); // L: 12016 + class273.musicPlayerStatus = 1; // L: 12017 + class273.musicTrackArchive = null; // L: 12018 + Client.field746 = false; // L: 12020 + } else if (class273.musicPlayerStatus != 0) { // L: 12023 + class273.musicTrackVolume = var0; + } else { + class273.midiPcmStream.setPcmStreamVolume(var0); // L: 12024 + } + + class131.clientPreferences.method2241(var0); // L: 12026 + } + + } // L: 12028 + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(Lky;B)Z", + garbageValue = "-85" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 12463 + } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index e1ee7a771e..07bfd5fe81 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -16,83 +16,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("k") +@ObfuscatedName("r") public class class10 { - @ObfuscatedName("v") - HttpsURLConnection field49; - @ObfuscatedName("o") - final Map field47; - @ObfuscatedName("h") + @ObfuscatedName("y") + @Export("operatingSystemName") + static String operatingSystemName; + @ObfuscatedName("em") @ObfuscatedSignature( - descriptor = "Lob;" + descriptor = "Llx;" ) - class398 field46; - @ObfuscatedName("g") - Map field48; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lr;" - ) - final class9 field53; - @ObfuscatedName("n") - boolean field51; - @ObfuscatedName("d") - boolean field52; - @ObfuscatedName("f") + @Export("archive2") + static Archive archive2; + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = -1134154975 + intValue = -1267419989 ) - int field50; + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("v") + HttpsURLConnection field40; + @ObfuscatedName("c") + final Map field39; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + class398 field41; + @ObfuscatedName("f") + Map field42; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lo;" + ) + final class9 field50; + @ObfuscatedName("n") + boolean field44; + @ObfuscatedName("s") + boolean field43; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1184056315 + ) + int field46; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lr;)V" + descriptor = "(Ljava/net/URL;Lo;)V" ) public class10(URL var1, class9 var2) throws IOException { - this.field51 = false; // L: 20 - this.field52 = false; // L: 21 - this.field50 = 300000; // L: 22 - if (!var2.method65()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method73()); // L: 25 + this.field44 = false; // L: 20 + this.field43 = false; + this.field46 = 300000; + if (!var2.method63()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method62()); } else { - this.field49 = (HttpsURLConnection)var1.openConnection(); // L: 26 - this.field49.setSSLSocketFactory(new class15()); // L: 27 - this.field53 = var2; // L: 28 - this.field47 = new HashMap(); // L: 29 - this.field48 = new HashMap(); // L: 30 + this.field40 = (HttpsURLConnection)var1.openConnection(); // L: 26 + this.field40.setSSLSocketFactory(new class15()); + this.field50 = var2; + this.field39 = new HashMap(); + this.field42 = new HashMap(); // L: 30 } - } // L: 31 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "113" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1291882131" ) - public void method87(String var1, String var2) { - if (!this.field51) { // L: 34 - this.field47.put(var1, var2); // L: 35 + public void method77(String var1, String var2) { + if (!this.field44) { + this.field39.put(var1, var2); // L: 35 } - } // L: 36 + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1439457532" + garbageValue = "2109426095" ) - String method100() { - ArrayList var1 = new ArrayList(this.field48.entrySet()); // L: 39 - Collections.sort(var1, new class18(this)); // L: 40 - StringBuilder var2 = new StringBuilder(); // L: 53 - Iterator var3 = var1.iterator(); // L: 54 + String method78() { + ArrayList var1 = new ArrayList(this.field42.entrySet()); + Collections.sort(var1, new class18(this)); + StringBuilder var2 = new StringBuilder(); + Iterator var3 = var1.iterator(); - while (var3.hasNext()) { // L: 65 - Entry var4 = (Entry)var3.next(); // L: 55 - if (var2.length() > 0) { // L: 57 + while (var3.hasNext()) { + Entry var4 = (Entry)var3.next(); + if (var2.length() > 0) { var2.append(","); } - var2.append(((class397)var4.getKey()).method7217()); // L: 58 + var2.append(((class397)var4.getKey()).method7142()); float var5 = (Float)var4.getValue(); // L: 59 - if (var5 < 1.0F) { // L: 60 + if (var5 < 1.0F) { String var6 = Float.toString(var5).substring(0, 4); // L: 61 var2.append(";q=" + var6); // L: 62 } @@ -101,157 +116,267 @@ public class class10 { return var2.toString(); // L: 66 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1510318175" + garbageValue = "1987536399" ) - void method89() throws ProtocolException { - if (!this.field51) { // L: 70 - this.field49.setRequestMethod(this.field53.method73()); // L: 71 - if (!this.field48.isEmpty()) { // L: 72 - this.field47.put("Accept", this.method100()); + void method79() throws ProtocolException { + if (!this.field44) { + this.field40.setRequestMethod(this.field50.method62()); + if (!this.field42.isEmpty()) { + this.field39.put("Accept", this.method78()); } - Iterator var1 = this.field47.entrySet().iterator(); // L: 73 + Iterator var1 = this.field39.entrySet().iterator(); while (var1.hasNext()) { - Entry var2 = (Entry)var1.next(); // L: 74 - this.field49.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 + Entry var2 = (Entry)var1.next(); + this.field40.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); } - if (this.field53.method67() && this.field46 != null) { // L: 79 - this.field49.setDoOutput(true); // L: 80 - ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81 + if (this.field50.method66() && this.field41 != null) { + this.field40.setDoOutput(true); + ByteArrayOutputStream var13 = new ByteArrayOutputStream(); try { - var13.write(this.field46.vmethod7229()); // L: 83 - var13.writeTo(this.field49.getOutputStream()); // L: 84 - } catch (IOException var11) { // L: 86 - var11.printStackTrace(); // L: 87 + var13.write(this.field41.vmethod7150()); // L: 83 + var13.writeTo(this.field40.getOutputStream()); // L: 84 + } catch (IOException var11) { + var11.printStackTrace(); } finally { if (var13 != null) { // L: 90 try { - var13.close(); // L: 92 - } catch (IOException var10) { // L: 94 - var10.printStackTrace(); // L: 95 + var13.close(); + } catch (IOException var10) { + var10.printStackTrace(); } } } } - this.field49.setConnectTimeout(this.field50); // L: 100 - this.field49.setInstanceFollowRedirects(this.field52); // L: 101 - this.field51 = true; // L: 102 + this.field40.setConnectTimeout(this.field46); + this.field40.setInstanceFollowRedirects(this.field43); + this.field44 = true; } - } // L: 103 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1894788243" - ) - boolean method105() throws IOException, SocketTimeoutException { - if (!this.field51) { // L: 106 - this.method89(); - } - - this.field49.connect(); // L: 107 - return this.field49.getResponseCode() == -1; // L: 108 } - @ObfuscatedName("l") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "216770945" + ) + boolean method86() throws IOException, SocketTimeoutException { + if (!this.field44) { + this.method79(); + } + + this.field40.connect(); + return this.field40.getResponseCode() == -1; + } + + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)Ly;", - garbageValue = "84" + garbageValue = "-63" ) - class21 method91() { + class21 method81() { try { - if (!this.field51 || this.field49.getResponseCode() == -1) { // L: 114 + if (!this.field44 || this.field40.getResponseCode() == -1) { return new class21("No REST response has been received yet."); } - } catch (IOException var10) { // L: 116 - this.field49.disconnect(); // L: 117 - return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118 + } catch (IOException var10) { + this.field40.disconnect(); + return new class21("Error decoding REST response code: " + var10.getMessage()); } class21 var1 = null; // L: 120 class21 var3; try { - var1 = new class21(this.field49); // L: 122 - return var1; // L: 130 - } catch (IOException var8) { // L: 124 + var1 = new class21(this.field40); // L: 122 + return var1; + } catch (IOException var8) { var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125 } finally { - this.field49.disconnect(); // L: 128 + this.field40.disconnect(); } - return var3; + return var3; // L: 128 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-69" + descriptor = "(Ldt;FI)F", + garbageValue = "1273799052" ) - static final void method106(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 179 - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your friend list first").toString(); - Login.addGameMessage(30, "", var1); // L: 181 - } // L: 183 - - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "-13200" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4980 - int var3 = Archive.getTileHeight(var0, var1, class160.Client_plane) - var2; // L: 4985 - var0 -= EnumComposition.cameraX; // L: 4986 - var3 -= FriendSystem.cameraY; // L: 4987 - var1 -= CollisionMap.cameraZ; // L: 4988 - int var4 = Rasterizer3D.Rasterizer3D_sine[Language.cameraPitch]; // L: 4989 - int var5 = Rasterizer3D.Rasterizer3D_cosine[Language.cameraPitch]; // L: 4990 - int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode2.cameraYaw]; // L: 4991 - int var7 = Rasterizer3D.Rasterizer3D_cosine[MusicPatchNode2.cameraYaw]; // L: 4992 - int var8 = var6 * var1 + var0 * var7 >> 16; // L: 4993 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 4994 - var0 = var8; // L: 4995 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 4996 - var1 = var5 * var1 + var4 * var3 >> 16; // L: 4997 - if (var1 >= 50) { // L: 4999 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5000 - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5001 + static float method92(class117 var0, float var1) { + if (var0 != null && var0.method2715() != 0) { // L: 18 + if (var1 < (float)var0.field1411[0].field1373) { // L: 21 + return var0.field1409 == class116.field1403 ? var0.field1411[0].field1376 : UserComparator9.method2616(var0, var1, true); // L: 22 23 25 + } else if (var1 > (float)var0.field1411[var0.method2715() - 1].field1373) { // L: 27 + return var0.field1410 == class116.field1403 ? var0.field1411[var0.method2715() - 1].field1376 : UserComparator9.method2616(var0, var1, false); // L: 28 29 31 + } else if (var0.field1408) { // L: 33 + return var0.field1411[0].field1376; // L: 34 } else { - Client.viewportTempX = -1; // L: 5004 - Client.viewportTempY = -1; // L: 5005 + class113 var2 = var0.method2736(var1); // L: 36 + boolean var3 = false; // L: 37 + boolean var4 = false; // L: 38 + if (var2 == null) { // L: 39 + return 0.0F; // L: 187 + } else { + float var7; + if (0.0D == (double)var2.field1369 && 0.0D == (double)var2.field1374) { // L: 40 + var3 = true; // L: 41 + } else if (Float.MAX_VALUE == var2.field1369 && var2.field1374 == Float.MAX_VALUE) { // L: 43 + var4 = true; // L: 44 + } else if (var2.field1375 != null) { // L: 46 + if (var0.field1407) { // L: 47 + float[] var5 = new float[4]; // L: 48 + float[] var6 = new float[4]; // L: 49 + var5[0] = (float)var2.field1373; // L: 50 + var6[0] = var2.field1376; // L: 51 + var5[1] = 0.33333334F * var2.field1369 + var5[0]; // L: 52 + var6[1] = var6[0] + var2.field1374 * 0.33333334F; // L: 53 + var5[3] = (float)var2.field1375.field1373; // L: 54 + var6[3] = var2.field1375.field1376; // L: 55 + var5[2] = var5[3] - 0.33333334F * var2.field1375.field1371; // L: 56 + var6[2] = var6[3] - var2.field1375.field1377 * 0.33333334F; // L: 57 + if (var0.field1413) { // L: 58 + if (var0 != null) { // L: 60 + var7 = var5[3] - var5[0]; // L: 63 + if (0.0D != (double)var7) { // L: 64 + float var8 = var5[1] - var5[0]; // L: 67 + float var9 = var5[2] - var5[0]; // L: 68 + Float var10 = var8 / var7; // L: 69 + Float var11 = var9 / var7; // L: 70 + var0.field1412 = var10 == 0.33333334F && var11 == 0.6666667F; // L: 71 + float var12 = var10; // L: 72 + float var13 = var11; // L: 73 + if ((double)var10 < 0.0D) { // L: 74 + var10 = 0.0F; + } + + if ((double)var11 > 1.0D) { // L: 75 + var11 = 1.0F; + } + + if ((double)var10 > 1.0D || var11 < -1.0F) { // L: 76 + class290.method5558(var10, var11); // L: 77 + } + + if (var10 != var12) { // L: 79 + var5[1] = var5[0] + var10 * var7; // L: 80 + if ((double)var12 != 0.0D) { // L: 81 + var6[1] = var6[0] + (var6[1] - var6[0]) * var10 / var12; // L: 82 + } + } + + if (var11 != var13) { // L: 85 + var5[2] = var5[0] + var11 * var7; // L: 86 + if (1.0D != (double)var13) { // L: 87 + var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var11) / (1.0D - (double)var13)); // L: 88 + } + } + + var0.field1422 = var5[0]; // L: 91 + var0.field1414 = var5[3]; // L: 92 + float var14 = var10; // L: 93 + float var15 = var11; // L: 94 + float[] var16 = var0.field1415; // L: 95 + float var17 = var14 - 0.0F; // L: 97 + float var18 = var15 - var14; // L: 98 + float var19 = 1.0F - var15; // L: 99 + float var20 = var18 - var17; // L: 100 + var16[3] = var19 - var18 - var20; // L: 101 + var16[2] = var20 + var20 + var20; // L: 102 + var16[1] = var17 + var17 + var17; // L: 103 + var16[0] = 0.0F; // L: 104 + var17 = var6[0]; // L: 106 + var18 = var6[1]; // L: 107 + var19 = var6[2]; // L: 108 + var20 = var6[3]; // L: 109 + float[] var21 = var0.field1416; // L: 110 + float var22 = var18 - var17; // L: 112 + float var23 = var19 - var18; // L: 113 + float var24 = var20 - var19; // L: 114 + float var25 = var23 - var22; // L: 115 + var21[3] = var24 - var23 - var25; // L: 116 + var21[2] = var25 + var25 + var25; // L: 117 + var21[1] = var22 + var22 + var22; // L: 118 + var21[0] = var17; // L: 119 + } + } + } else { + UserComparator8.method2574(var0, var5, var6); // L: 124 + } + + var0.field1407 = false; // L: 126 + } + } else { + var3 = true; // L: 130 + } + + if (var3) { // L: 132 + return var2.field1376; // L: 133 + } else if (var4) { // L: 135 + return (float)var2.field1373 != var1 && var2.field1375 != null ? var2.field1375.field1376 : var2.field1376; // L: 136 137 140 + } else if (var0.field1413) { // L: 143 + float var30; + if (var0 == null) { // L: 146 + var30 = 0.0F; // L: 147 + } else { + float var26; + if (var0.field1422 == var1) { // L: 151 + var26 = 0.0F; // L: 152 + } else if (var0.field1414 == var1) { // L: 154 + var26 = 1.0F; // L: 155 + } else { + var26 = (var1 - var0.field1422) / (var0.field1414 - var0.field1422); // L: 158 + } + + if (var0.field1412) { // L: 161 + var7 = var26; // L: 162 + } else { + float[] var27 = new float[]{var0.field1415[0] - var26, var0.field1415[1], var0.field1415[2], var0.field1415[3]}; // L: 165 166 167 168 169 + float[] var28 = new float[5]; // L: 170 + int var29 = class132.method2888(var27, 3, 0.0F, true, 1.0F, true, var28); // L: 171 + if (var29 == 1) { // L: 172 + var7 = var28[0]; // L: 173 + } else { + var7 = 0.0F; // L: 176 + } + } + + var30 = var0.field1416[0] + (var0.field1416[1] + var7 * (var7 * var0.field1416[3] + var0.field1416[2])) * var7; // L: 179 + } + + return var30; // L: 181 + } else { + return class147.method3106(var0, var1); // L: 184 + } + } } - } else { - Client.viewportTempX = -1; // L: 4981 - Client.viewportTempY = -1; // L: 4982 + return 0.0F; // L: 19 } - } // L: 4983 5007 + } - @ObfuscatedName("lu") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1276498116" + descriptor = "(ILbd;ZB)I", + garbageValue = "-3" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (class230.friendsChat != null) { // L: 11715 - PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2921, Client.packetWriter.isaacCipher); // L: 11716 - var1.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var0)); // L: 11717 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11718 - Client.packetWriter.addNode(var1); // L: 11719 + static int method87(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4535 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4536 + return 1; // L: 4537 + } else if (var0 == 6950) { // L: 4539 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4540 + return 1; // L: 4541 + } else { + return 2; // L: 4543 } - } // L: 11720 + } } diff --git a/runescape-client/src/main/java/class101.java b/runescape-client/src/main/java/class101.java index c9e1b90a42..9bc7df8ed1 100644 --- a/runescape-client/src/main/java/class101.java +++ b/runescape-client/src/main/java/class101.java @@ -3,100 +3,145 @@ import java.net.HttpURLConnection; import java.net.URLConnection; import javax.net.ssl.HttpsURLConnection; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cd") public class class101 extends UrlRequester { - @ObfuscatedName("ft") - @ObfuscatedGetter( - intValue = 1899904271 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lct;I)V", - garbageValue = "-1783154457" + descriptor = "(Lcw;I)V", + garbageValue = "1977687936" ) - void vmethod2538(UrlRequest var1) throws IOException { - URLConnection var2 = null; // L: 12 + void vmethod2546(UrlRequest var1) throws IOException { + URLConnection var2 = null; // L: 11 try { try { - String var3 = var1.url.getProtocol(); // L: 14 - if (var3.equals("http")) { // L: 15 - var2 = this.method2536(var1); // L: 16 + String var3 = var1.url.getProtocol(); // L: 13 + if (var3.equals("http")) { // L: 14 + var2 = this.method2539(var1); // L: 15 } else { - if (!var3.equals("https")) { // L: 18 - var1.isDone0 = true; // L: 22 - return; // L: 23 + if (!var3.equals("https")) { // L: 17 + var1.isDone0 = true; // L: 21 + return; } - var2 = this.method2537(var1); // L: 19 + var2 = this.method2541(var1); // L: 18 } - this.method2515(var2, var1); // L: 25 - } catch (IOException var7) { + this.method2518(var2, var1); // L: 24 + } catch (IOException var7) { // L: 26 } } finally { - var1.isDone0 = true; - if (var2 != null) { - if (var2 instanceof HttpURLConnection) { // L: 31 - ((HttpURLConnection)var2).disconnect(); - } else if (var2 instanceof HttpsURLConnection) { - ((HttpsURLConnection)var2).disconnect(); // L: 35 + var1.isDone0 = true; // L: 28 + if (var2 != null) { // L: 29 + if (var2 instanceof HttpURLConnection) { // L: 30 + ((HttpURLConnection)var2).disconnect(); // L: 31 + } else if (var2 instanceof HttpsURLConnection) { // L: 33 + ((HttpsURLConnection)var2).disconnect(); // L: 34 } } } - } // L: 39 + } // L: 38 - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lct;I)Ljava/net/URLConnection;", - garbageValue = "-2100261095" + descriptor = "(Lcw;I)Ljava/net/URLConnection;", + garbageValue = "443987385" ) - URLConnection method2536(UrlRequest var1) throws IOException { - URLConnection var2 = var1.url.openConnection(); // L: 42 - this.method2524(var2); // L: 43 - return var2; // L: 44 + URLConnection method2539(UrlRequest var1) throws IOException { + URLConnection var2 = var1.url.openConnection(); // L: 41 + this.method2517(var2); // L: 42 + return var2; // L: 43 } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lct;I)Ljava/net/URLConnection;", - garbageValue = "-1790312797" + descriptor = "(Lcw;B)Ljava/net/URLConnection;", + garbageValue = "48" ) - URLConnection method2537(UrlRequest var1) throws IOException { - HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 48 - var2.setSSLSocketFactory(new class15()); // L: 49 - this.method2524(var2); // L: 50 - return var2; // L: 51 + URLConnection method2541(UrlRequest var1) throws IOException { + HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 47 + var2.setSSLSocketFactory(new class15()); // L: 48 + this.method2517(var2); // L: 49 + return var2; // L: 50 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lbo;", - garbageValue = "1275479769" + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-264358279" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 - return var1; - } else { - byte[] var2 = class135.archive12.takeFile(var0, 0); // L: 28 - if (var2 == null) { // L: 29 - return null; // L: 30 + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 95 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 96 + char var7 = var0.charAt(var6 + var1); // L: 97 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 98 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 99 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 100 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 101 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 102 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 103 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 104 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 105 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 106 + } else if (var7 == 8240) { // L: 107 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 108 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 109 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 110 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 111 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 112 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 113 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 114 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 115 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 116 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 117 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; // L: 118 + } else if (var7 == 732) { // L: 119 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 120 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 121 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 122 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 123 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 124 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 125 + var3[var6 + var4] = -97; } else { - var1 = Message.newScript(var2); // L: 32 - Script.Script_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 + var3[var6 + var4] = 63; // L: 126 } } + + return var5; // L: 128 } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 02670b7351..d50b8d8545 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,9 +1,5 @@ -import java.awt.Desktop; -import java.awt.Image; -import java.awt.Desktop.Action; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.net.URI; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.util.LinkedList; @@ -11,317 +7,425 @@ 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; import org.bouncycastle.crypto.tls.Certificate; import org.bouncycastle.crypto.tls.CertificateRequest; import org.bouncycastle.crypto.tls.TlsAuthentication; import org.bouncycastle.crypto.tls.TlsCredentials; -@ObfuscatedName("x") +@ObfuscatedName("p") class class11 implements TlsAuthentication { - @ObfuscatedName("ab") - static Image field56; - @ObfuscatedName("my") - @ObfuscatedGetter( - intValue = -1629123777 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lln;" ) - @Export("menuWidth") - static int menuWidth; + @Export("VarbitDefinition_archive") + public static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("SequenceDefinition_archive") + static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("fx") + @ObfuscatedGetter( + intValue = -2100133853 + ) + static int field54; + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lk;" ) final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lj;)V" + descriptor = "(Lk;)V" ) class11(class13 var1) { - this.this$2 = var1; // L: 303 + this.this$2 = var1; // L: 246 } public void notifyServerCertificate(Certificate var1) throws IOException { try { - CertificateFactory var2 = CertificateFactory.getInstance("X.509"); - LinkedList var3 = new LinkedList(); - org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 249 + LinkedList var3 = new LinkedList(); // L: 250 + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 252 - for (int var5 = 0; var5 < var4.length; ++var5) { - org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 312 - var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 253 + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 254 + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 256 } - this.this$2.this$1.field65 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 318 - } catch (CertificateException var7) { // L: 320 - throw new IOException(var7); // L: 321 + this.this$2.this$1.field62 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 260 + } catch (CertificateException var7) { // L: 262 + throw new IOException(var7); // L: 263 } - } // L: 323 + } // L: 265 public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { - return null; // L: 327 + return null; // L: 268 } - @ObfuscatedName("v") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZS)V", - garbageValue = "18142" + descriptor = "(ILbd;ZI)I", + garbageValue = "-513388138" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { // L: 23 - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 - try { - Desktop.getDesktop().browse(new URI(var0)); // L: 26 - return; // L: 47 - } catch (Exception var4) { // L: 29 - } - } - - if (class29.field169.startsWith("win")) { // L: 31 - LoginScreenAnimation.method2247(var0, 0); // L: 33 - } else if (class29.field169.startsWith("mac")) { // L: 37 - class154.method3128(var0, 1, "openjs"); // L: 38 - } else { - LoginScreenAnimation.method2247(var0, 2); // L: 41 - } + static int method100(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 4118 + var3 = class18.Client_plane; // L: 4119 + int var15 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 4120 + int var8 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 4121 + class21.getWorldMap().method7327(var3, var15, var8, true); // L: 4122 + return 1; // L: 4123 } else { - LoginScreenAnimation.method2247(var0, 3); // L: 44 - } - - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", - garbageValue = "-710158938" - ) - static void method116(Float var0, Float var1) { - var1 = 1.0F - var1; // L: 305 - if (var0 < 0.0F) { // L: 306 - var0 = 0.0F; - } - - if (var1 < 0.0F) { // L: 307 - var1 = 0.0F; - } - - if (var0 > 1.0F || var1 > 1.0F) { // L: 308 - float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); // L: 309 - if (class114.field1396 + var2 > 0.0F) { // L: 310 - class144.method3022(var0, var1); // L: 311 - } - } - - var1 = 1.0F - var1; // L: 314 - } // L: 315 - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1930297149" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = FriendSystem.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5510 - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { // L: 5511 - var7 = FriendSystem.scene.getObjectFlags(var0, var1, var2, var5); // L: 5512 - var8 = var7 >> 6 & 3; // L: 5513 - var9 = var7 & 31; // L: 5514 - var10 = var3; // L: 5515 - if (class162.method3274(var5)) { // L: 5516 - var10 = var4; - } - - int[] var11 = MusicPatchNode2.sceneMinimapSprite.pixels; // L: 5517 - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5518 - var13 = class121.Entity_unpackID(var5); // L: 5519 - ObjectComposition var14 = class116.getObjectDefinition(var13); // L: 5520 - if (var14.mapSceneId != -1) { // L: 5521 - IndexedSprite var15 = Message.mapSceneSprites[var14.mapSceneId]; // L: 5522 - if (var15 != null) { // L: 5523 - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5524 - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5525 - var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); // L: 5526 + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4125 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4126 + String var16 = ""; // L: 4127 + var9 = class21.getWorldMap().getMapArea(var3); // L: 4128 + if (var9 != null) { // L: 4129 + var16 = var9.getExternalName(); // L: 4130 } + + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var16; // L: 4132 + return 1; // L: 4133 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4135 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4136 + class21.getWorldMap().setCurrentMapAreaId(var3); // L: 4137 + return 1; // L: 4138 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4140 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getZoomLevel(); // L: 4141 + return 1; // L: 4142 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4144 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4145 + class21.getWorldMap().setZoomPercentage(var3); // L: 4146 + return 1; // L: 4147 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4149 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4150 + return 1; // L: 4151 } else { - if (var9 == 0 || var9 == 2) { // L: 5530 - if (var8 == 0) { // L: 5531 - var11[var12] = var10; // L: 5532 - var11[var12 + 512] = var10; // L: 5533 - var11[var12 + 1024] = var10; // L: 5534 - var11[var12 + 1536] = var10; // L: 5535 - } else if (var8 == 1) { // L: 5537 - var11[var12] = var10; // L: 5538 - var11[var12 + 1] = var10; // L: 5539 - var11[var12 + 2] = var10; // L: 5540 - var11[var12 + 3] = var10; // L: 5541 - } else if (var8 == 2) { // L: 5543 - var11[var12 + 3] = var10; // L: 5544 - var11[var12 + 512 + 3] = var10; // L: 5545 - var11[var12 + 1024 + 3] = var10; // L: 5546 - var11[var12 + 1536 + 3] = var10; // L: 5547 - } else if (var8 == 3) { // L: 5549 - var11[var12 + 1536] = var10; // L: 5550 - var11[var12 + 1536 + 1] = var10; // L: 5551 - var11[var12 + 1536 + 2] = var10; // L: 5552 - var11[var12 + 1536 + 3] = var10; // L: 5553 - } - } - - if (var9 == 3) { // L: 5556 - if (var8 == 0) { // L: 5557 - var11[var12] = var10; - } else if (var8 == 1) { // L: 5558 - var11[var12 + 3] = var10; - } else if (var8 == 2) { // L: 5559 - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5560 - var11[var12 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5562 - if (var8 == 3) { // L: 5563 - var11[var12] = var10; // L: 5564 - var11[var12 + 512] = var10; // L: 5565 - var11[var12 + 1024] = var10; // L: 5566 - var11[var12 + 1536] = var10; // L: 5567 - } else if (var8 == 0) { // L: 5569 - var11[var12] = var10; // L: 5570 - var11[var12 + 1] = var10; // L: 5571 - var11[var12 + 2] = var10; // L: 5572 - var11[var12 + 3] = var10; // L: 5573 - } else if (var8 == 1) { // L: 5575 - var11[var12 + 3] = var10; // L: 5576 - var11[var12 + 512 + 3] = var10; // L: 5577 - var11[var12 + 1024 + 3] = var10; // L: 5578 - var11[var12 + 1536 + 3] = var10; // L: 5579 - } else if (var8 == 2) { // L: 5581 - var11[var12 + 1536] = var10; // L: 5582 - var11[var12 + 1536 + 1] = var10; // L: 5583 - var11[var12 + 1536 + 2] = var10; // L: 5584 - var11[var12 + 1536 + 3] = var10; // L: 5585 - } - } - } - } - - var5 = FriendSystem.scene.getGameObjectTag(var0, var1, var2); // L: 5590 - if (var5 != 0L) { // L: 5591 - var7 = FriendSystem.scene.getObjectFlags(var0, var1, var2, var5); // L: 5592 - var8 = var7 >> 6 & 3; // L: 5593 - var9 = var7 & 31; // L: 5594 - var10 = class121.Entity_unpackID(var5); // L: 5595 - ObjectComposition var24 = class116.getObjectDefinition(var10); // L: 5596 - int var19; - if (var24.mapSceneId != -1) { // L: 5597 - IndexedSprite var20 = Message.mapSceneSprites[var24.mapSceneId]; // L: 5598 - if (var20 != null) { // L: 5599 - var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5600 - var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5601 - var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5602 - } - } else if (var9 == 9) { // L: 5605 - var12 = 15658734; // L: 5606 - if (class162.method3274(var5)) { // L: 5607 - var12 = 15597568; - } - - int[] var18 = MusicPatchNode2.sceneMinimapSprite.pixels; // L: 5608 - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5609 - if (var8 != 0 && var8 != 2) { // L: 5610 - var18[var19] = var12; // L: 5617 - var18[var19 + 1 + 512] = var12; // L: 5618 - var18[var19 + 1024 + 2] = var12; // L: 5619 - var18[var19 + 1536 + 3] = var12; // L: 5620 + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4153 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4154 + class21.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4155 + return 1; // L: 4156 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4158 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4159 + class21.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4160 + return 1; // L: 4161 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4163 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4164 + class21.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4165 + return 1; // L: 4166 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4168 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4169 + class21.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4170 + return 1; // L: 4171 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4173 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayX(); // L: 4174 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayY(); // L: 4175 + return 1; // L: 4176 } else { - var18[var19 + 1536] = var12; // L: 5611 - var18[var19 + 1 + 1024] = var12; // L: 5612 - var18[var19 + 512 + 2] = var12; // L: 5613 - var18[var19 + 3] = var12; // L: 5614 - } - } - } + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4178 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4179 + var11 = class21.getWorldMap().getMapArea(var3); // L: 4180 + if (var11 == null) { // L: 4181 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4182 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4185 + } - var5 = FriendSystem.scene.getFloorDecorationTag(var0, var1, var2); // L: 5624 - if (0L != var5) { // L: 5625 - var7 = class121.Entity_unpackID(var5); // L: 5626 - ObjectComposition var21 = class116.getObjectDefinition(var7); // L: 5627 - if (var21.mapSceneId != -1) { // L: 5628 - IndexedSprite var22 = Message.mapSceneSprites[var21.mapSceneId]; // L: 5629 - if (var22 != null) { // L: 5630 - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5631 - int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5632 - var22.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 5633 - } - } - } + return 1; // L: 4187 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4189 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4190 + var11 = class21.getWorldMap().getMapArea(var3); // L: 4191 + if (var11 == null) { // L: 4192 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4193 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4194 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4197 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4198 + } - } // L: 5637 + return 1; // L: 4200 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4202 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4203 + var11 = class21.getWorldMap().getMapArea(var3); // L: 4204 + if (var11 == null) { // L: 4205 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4206 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4207 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4208 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4209 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4212 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4213 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4214 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4215 + } - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1139609562" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (MusicPatchNode2.loadInterface(var0)) { // L: 9590 - ClanSettings.field1622 = null; // L: 9597 - InterfaceParent.drawInterface(EnumComposition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9598 - if (ClanSettings.field1622 != null) { // L: 9599 - InterfaceParent.drawInterface(ClanSettings.field1622, -1412584499, var1, var2, var3, var4, NPC.field1253, Projectile.field944, var7); // L: 9600 - ClanSettings.field1622 = null; // L: 9601 - } + return 1; // L: 4217 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4219 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4220 + var11 = class21.getWorldMap().getMapArea(var3); // L: 4221 + if (var11 == null) { // L: 4222 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4223 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4226 + } - } else { - if (var7 != -1) { // L: 9591 - Client.field564[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 9593 - Client.field564[var8] = true; - } - } + return 1; // L: 4228 + } else if (var0 == 6615) { // L: 4230 + var14 = class21.getWorldMap().getDisplayCoord(); // L: 4231 + if (var14 == null) { // L: 4232 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4233 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4234 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; // L: 4237 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; // L: 4238 + } - } - } // L: 9595 9603 + return 1; // L: 4240 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4242 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().currentMapAreaId(); // L: 4243 + return 1; // L: 4244 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4246 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4247 + var11 = class21.getWorldMap().getCurrentMapArea(); // L: 4248 + if (var11 == null) { // L: 4249 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4250 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4251 + return 1; // L: 4252 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4254 + if (var12 == null) { // L: 4255 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4256 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4257 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; // L: 4260 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; // L: 4261 + } - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lkn;I)Ljava/lang/String;", - garbageValue = "1166958975" - ) - static String method114(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 10106 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 10107 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 10109 - if (var3 == -1) { // L: 10110 - break; + return 1; // L: 4263 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 4265 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4266 + var11 = class21.getWorldMap().getCurrentMapArea(); // L: 4267 + if (var11 == null) { // L: 4268 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4269 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4270 + return 1; // L: 4271 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 4273 + if (var5 == null) { // L: 4274 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4275 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 4278 + } + + return 1; // L: 4280 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 4282 + Interpreter.Interpreter_intStackSize -= 2; // L: 4283 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4284 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4285 + GameEngine.method570(var3, var10, false); // L: 4286 + return 1; // L: 4287 + } else if (var0 == 6620) { // L: 4289 + Interpreter.Interpreter_intStackSize -= 2; // L: 4290 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4291 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4292 + GameEngine.method570(var3, var10, true); // L: 4293 + return 1; // L: 4294 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4296 + Interpreter.Interpreter_intStackSize -= 2; // L: 4297 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4298 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4299 + var9 = class21.getWorldMap().getMapArea(var3); // L: 4300 + if (var9 == null) { // L: 4301 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4302 + return 1; // L: 4303 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4305 + return 1; // L: 4306 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4308 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayWith(); // L: 4309 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayHeight(); // L: 4310 + return 1; // L: 4311 + } else if (var0 == 6623) { // L: 4313 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4314 + var11 = class21.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4315 + if (var11 == null) { // L: 4316 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4317 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); // L: 4320 + } + + return 1; // L: 4322 + } else if (var0 == 6624) { // L: 4324 + class21.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4325 + return 1; // L: 4326 + } else if (var0 == 6625) { // L: 4328 + class21.getWorldMap().resetMaxFlashCount(); // L: 4329 + return 1; // L: 4330 + } else if (var0 == 6626) { // L: 4332 + class21.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4333 + return 1; // L: 4334 + } else if (var0 == 6627) { // L: 4336 + class21.getWorldMap().resetCyclesPerFlash(); // L: 4337 + return 1; // L: 4338 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4340 + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4341 + class21.getWorldMap().setPerpetualFlash(var13); // L: 4342 + return 1; // L: 4343 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4345 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4346 + class21.getWorldMap().flashElement(var3); // L: 4347 + return 1; // L: 4348 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4350 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4351 + class21.getWorldMap().flashCategory(var3); // L: 4352 + return 1; // L: 4353 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4355 + class21.getWorldMap().stopCurrentFlashes(); // L: 4356 + return 1; // L: 4357 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4359 + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4360 + class21.getWorldMap().setElementsDisabled(var13); // L: 4361 + return 1; // L: 4362 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4364 + Interpreter.Interpreter_intStackSize -= 2; // L: 4365 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4366 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 4367 + class21.getWorldMap().disableElement(var3, var7); // L: 4368 + return 1; // L: 4369 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4371 + Interpreter.Interpreter_intStackSize -= 2; // L: 4372 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4373 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 4374 + class21.getWorldMap().setCategoryDisabled(var3, var7); // L: 4375 + return 1; // L: 4376 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4378 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4379 + return 1; // L: 4380 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4382 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4383 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4384 + return 1; // L: 4385 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4387 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4388 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4389 + return 1; // L: 4390 + } else if (var0 == 6638) { // L: 4392 + Interpreter.Interpreter_intStackSize -= 2; // L: 4393 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4394 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4395 + var5 = class21.getWorldMap().method7269(var3, var10); // L: 4396 + if (var5 == null) { // L: 4397 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4398 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 4401 + } + + return 1; // L: 4403 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4405 + var6 = class21.getWorldMap().iconStart(); // L: 4406 + if (var6 == null) { // L: 4407 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4408 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4409 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4412 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4413 + } + + return 1; // L: 4415 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4417 + var6 = class21.getWorldMap().iconNext(); // L: 4418 + if (var6 == null) { // L: 4419 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4420 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4421 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4424 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4425 + } + + return 1; // L: 4427 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4429 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4430 + var4 = UserComparator7.WorldMapElement_get(var3); // L: 4431 + if (var4.name == null) { // L: 4432 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4433 + } else { + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.name; // L: 4436 + } + + return 1; // L: 4438 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4440 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4441 + var4 = UserComparator7.WorldMapElement_get(var3); // L: 4442 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; // L: 4443 + return 1; // L: 4444 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4446 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4447 + var4 = UserComparator7.WorldMapElement_get(var3); // L: 4448 + if (var4 == null) { // L: 4449 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4450 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; // L: 4453 + } + + return 1; // L: 4455 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4457 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4458 + var4 = UserComparator7.WorldMapElement_get(var3); // L: 4459 + if (var4 == null) { // L: 4460 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4461 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4464 + } + + return 1; // L: 4466 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4468 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.worldMapEvent.mapElement; // L: 4469 + return 1; // L: 4470 + } else if (var0 == 6698) { // L: 4472 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.worldMapEvent.coord1.packed(); // L: 4473 + return 1; // L: 4474 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4476 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.worldMapEvent.coord2.packed(); // L: 4477 + return 1; // L: 4478 + } else { + return 2; // L: 4480 + } + } + } + } + } + } } - - var0 = var0.substring(0, var3) + NPC.method2367(WorldMapAreaData.method5086(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10111 } } } - - return var0; // L: 10115 } - - @ObfuscatedName("lv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "831054462" - ) - static void method115() { - if (Client.oculusOrbState == 1) { // L: 11911 - Client.field602 = true; // L: 11912 - } - - } // L: 11914 } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index 8c28fdb726..ee422b0707 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -3,78 +3,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("dm") public class class113 { - @ObfuscatedName("u") - static int[] field1387; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + static Bounds field1378; + @ObfuscatedName("fv") + static String field1372; + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + @Export("fontPlain11") + static Font fontPlain11; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -57602381 + intValue = 1540502007 ) - int field1384; - @ObfuscatedName("o") - float field1385; - @ObfuscatedName("h") - float field1386; - @ObfuscatedName("g") - float field1390; - @ObfuscatedName("l") - float field1388; + int field1373; + @ObfuscatedName("c") + float field1376; + @ObfuscatedName("i") + float field1371; + @ObfuscatedName("f") + float field1377; + @ObfuscatedName("b") + float field1369; @ObfuscatedName("n") - float field1389; - @ObfuscatedName("d") + float field1374; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Ldm;" ) - class113 field1392; + class113 field1375; class113() { - this.field1386 = Float.MAX_VALUE; // L: 8 - this.field1390 = Float.MAX_VALUE; // L: 9 - this.field1388 = Float.MAX_VALUE; // L: 10 - this.field1389 = Float.MAX_VALUE; // L: 11 + this.field1371 = Float.MAX_VALUE; // L: 8 + this.field1377 = Float.MAX_VALUE; // L: 9 + this.field1369 = Float.MAX_VALUE; // L: 10 + this.field1374 = Float.MAX_VALUE; // L: 11 } // L: 14 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "938981955" + descriptor = "(Lpi;IB)V", + garbageValue = "51" ) - void method2632(Buffer var1, int var2) { - this.field1384 = var1.readShort(); // L: 17 - this.field1385 = var1.method7965(); // L: 18 - this.field1386 = var1.method7965(); // L: 19 - this.field1390 = var1.method7965(); // L: 20 - this.field1388 = var1.method7965(); // L: 21 - this.field1389 = var1.method7965(); // L: 22 + void method2647(Buffer var1, int var2) { + this.field1373 = var1.readShort(); // L: 17 + this.field1376 = var1.method7681(); // L: 18 + this.field1371 = var1.method7681(); // L: 19 + this.field1377 = var1.method7681(); // L: 20 + this.field1369 = var1.method7681(); // L: 21 + this.field1374 = var1.method7681(); // L: 22 } // L: 23 - @ObfuscatedName("h") + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "90" + descriptor = "(II)V", + garbageValue = "-2120622991" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 82 - int var4 = 0; // L: 83 + static final void method2650(int var0) { + var0 = Math.max(Math.min(var0, 100), 0); // L: 11987 + var0 = 100 - var0; // L: 11988 + float var1 = (float)var0 / 200.0F + 0.5F; // L: 11989 + KitDefinition.method3453((double)var1); // L: 11990 + } // L: 11991 - for (int var5 = 0; var5 < var2; ++var5) { // L: 84 - int var6 = var0[var5 + var1] & 255; // L: 85 - if (var6 != 0) { // L: 86 - if (var6 >= 128 && var6 < 160) { // L: 87 - char var7 = class345.cp1252AsciiExtension[var6 - 128]; // L: 88 - if (var7 == 0) { // L: 89 - var7 = '?'; - } - - var6 = var7; // L: 90 - } - - var3[var4++] = (char)var6; // L: 92 - } - } - - return new String(var3, 0, var4); // L: 94 + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1995001878" + ) + public static boolean method2651() { + return Client.staffModLevel >= 2; // L: 12599 } } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java index 8488550cca..18a65a650a 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -1,45 +1,24 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dv") public class class114 { - @ObfuscatedName("g") - public static final float field1396; - @ObfuscatedName("l") - public static final float field1394; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "[Lqx;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; + @ObfuscatedName("f") + public static final float field1382; + @ObfuscatedName("b") + public static final float field1380; static { - field1396 = Math.ulp(1.0F); // L: 10 - field1394 = 2.0F * field1396; // L: 11 + field1382 = Math.ulp(1.0F); // L: 10 + field1380 = 2.0F * field1382; // L: 11 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lgk;", - garbageValue = "725728757" + descriptor = "(I)[Ljp;", + garbageValue = "-1344733039" ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 - var1 = new StructComposition(); // L: 26 - if (var2 != null) { // L: 27 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 28 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 - return var1; // L: 30 - } + public static class263[] method2662() { + return new class263[]{class263.field3006, class263.field3005, class263.field3015, class263.field3007, class263.field3008, class263.field3009, class263.field3004, class263.field3011, class263.field3012, class263.field3013}; // L: 17 } } diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java index e1a9b1d176..43d6fdb992 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -2,293 +2,296 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dq") +@ObfuscatedName("da") public class class115 { - @ObfuscatedName("ja") - @ObfuscatedGetter( - intValue = -476763721 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 184863089 - ) - public final int field1410; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ldq;" - ) - public class115 field1404; - @ObfuscatedName("h") - float[][] field1406; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "[Lnu;" - ) - final class387[] field1403; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Lnu;" - ) - class387[] field1411; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Lnu;" - ) - class387[] field1408; @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "[Lpb;" ) - class387 field1409; - @ObfuscatedName("f") - boolean field1405; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lnu;" + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -671595341 ) - class387 field1407; - @ObfuscatedName("r") - boolean field1412; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - class387 field1413; - @ObfuscatedName("x") - float[][] field1414; + public final int field1395; @ObfuscatedName("c") - float[][] field1415; - @ObfuscatedName("j") - float[][] field1416; + @ObfuscatedSignature( + descriptor = "Lda;" + ) + public class115 field1388; + @ObfuscatedName("i") + float[][] field1385; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "[Lnt;" + ) + final class387[] field1386; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "[Lnt;" + ) + class387[] field1387; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "[Lnt;" + ) + class387[] field1383; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + class387 field1389; + @ObfuscatedName("l") + boolean field1392; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + class387 field1384; + @ObfuscatedName("o") + boolean field1391; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + class387 field1393; + @ObfuscatedName("p") + float[][] field1394; + @ObfuscatedName("w") + float[][] field1390; + @ObfuscatedName("k") + float[][] field1396; @ObfuscatedSignature( - descriptor = "(ILpd;Z)V" + descriptor = "(ILpi;Z)V" ) public class115(int var1, Buffer var2, boolean var3) { - this.field1409 = new class387(); // L: 13 - this.field1405 = true; // L: 14 - this.field1407 = new class387(); // L: 15 - this.field1412 = true; - this.field1413 = new class387(); // L: 17 - this.field1410 = var2.readShort(); // L: 23 - this.field1403 = new class387[var1]; // L: 24 - this.field1411 = new class387[this.field1403.length]; // L: 25 - this.field1408 = new class387[this.field1403.length]; // L: 26 - this.field1406 = new float[this.field1403.length][3]; // L: 27 + this.field1389 = new class387(); // L: 13 + this.field1392 = true; // L: 14 + this.field1384 = new class387(); // L: 15 + this.field1391 = true; // L: 16 + this.field1393 = new class387(); // L: 17 + this.field1395 = var2.readShort(); // L: 23 + this.field1386 = new class387[var1]; // L: 24 + this.field1387 = new class387[this.field1386.length]; // L: 25 + this.field1383 = new class387[this.field1386.length]; // L: 26 + this.field1385 = new float[this.field1386.length][3]; // L: 27 - for (int var4 = 0; var4 < this.field1403.length; ++var4) { // L: 28 - this.field1403[var4] = new class387(var2, var3); // L: 29 - this.field1406[var4][0] = var2.method7965(); // L: 30 - this.field1406[var4][1] = var2.method7965(); // L: 31 - this.field1406[var4][2] = var2.method7965(); // L: 32 + for (int var4 = 0; var4 < this.field1386.length; ++var4) { // L: 28 + this.field1386[var4] = new class387(var2, var3); // L: 29 + this.field1385[var4][0] = var2.method7681(); // L: 30 + this.field1385[var4][1] = var2.method7681(); // L: 31 + this.field1385[var4][2] = var2.method7681(); // L: 32 } - this.method2686(); // L: 34 + this.method2664(); // L: 34 } // L: 35 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "70" + garbageValue = "-23" ) - void method2686() { - this.field1414 = new float[this.field1403.length][3]; // L: 38 - this.field1415 = new float[this.field1403.length][3]; // L: 39 - this.field1416 = new float[this.field1403.length][3]; // L: 40 - class387 var1 = HealthBarDefinition.method3428(); // L: 41 - - for (int var2 = 0; var2 < this.field1403.length; ++var2) { // L: 42 - class387 var3 = this.method2651(var2); // L: 43 - var1.method7064(var3); // L: 44 - var1.method7111(); // L: 45 - this.field1414[var2] = var1.method7072(); // L: 46 - this.field1415[var2][0] = var3.field4347[12]; // L: 47 - this.field1415[var2][1] = var3.field4347[13]; // L: 48 - this.field1415[var2][2] = var3.field4347[14]; // L: 49 - this.field1416[var2] = var3.method7074(); // L: 50 - } - - var1.method7095(); // L: 52 - } // L: 53 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lnu;", - garbageValue = "735680223" - ) - class387 method2651(int var1) { - return this.field1403[var1]; // L: 56 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)Lnu;", - garbageValue = "1840626302" - ) - class387 method2662(int var1) { - if (this.field1411[var1] == null) { // L: 60 - this.field1411[var1] = new class387(this.method2651(var1)); // L: 61 - if (this.field1404 != null) { // L: 62 - this.field1411[var1].method7109(this.field1404.method2662(var1)); // L: 63 + void method2664() { + this.field1394 = new float[this.field1386.length][3]; // L: 38 + this.field1390 = new float[this.field1386.length][3]; // L: 39 + this.field1396 = new float[this.field1386.length][3]; // L: 40 + class387 var1; + synchronized(class387.field4346) { // L: 43 + if (class387.field4347 == 0) { // L: 44 + var1 = new class387(); } else { - this.field1411[var1].method7109(class387.field4348); // L: 66 + class387.field4346[--class387.field4347].method7011(); // L: 46 + var1 = class387.field4346[class387.field4347]; // L: 47 } } - return this.field1411[var1]; // L: 69 - } + class387 var2 = var1; // L: 51 - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)Lnu;", - garbageValue = "-123" - ) - class387 method2653(int var1) { - if (this.field1408[var1] == null) { // L: 73 - this.field1408[var1] = new class387(this.method2662(var1)); // L: 74 - this.field1408[var1].method7111(); // L: 75 + for (int var5 = 0; var5 < this.field1386.length; ++var5) { // L: 52 + class387 var4 = this.method2665(var5); // L: 53 + var2.method7032(var4); // L: 54 + var2.method7021(); // L: 55 + this.field1394[var5] = var2.method7010(); // L: 56 + this.field1390[var5][0] = var4.field4348[12]; // L: 57 + this.field1390[var5][1] = var4.field4348[13]; // L: 58 + this.field1390[var5][2] = var4.field4348[14]; // L: 59 + this.field1396[var5] = var4.method7023(); // L: 60 } - return this.field1408[var1]; // L: 77 + var2.method7029(); // L: 62 + } // L: 63 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lnt;", + garbageValue = "1022205323" + ) + class387 method2665(int var1) { + return this.field1386[var1]; // L: 66 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1752544536" + descriptor = "(IB)Lnt;", + garbageValue = "85" ) - void method2654(class387 var1) { - this.field1409.method7064(var1); // L: 81 - this.field1405 = true; // L: 82 - this.field1412 = true; // L: 83 - } // L: 84 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Lnu;", - garbageValue = "-1868742286" - ) - class387 method2650() { - return this.field1409; // L: 87 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Lnu;", - garbageValue = "-1180854029" - ) - class387 method2649() { - if (this.field1405) { // L: 91 - this.field1407.method7064(this.method2650()); // L: 92 - if (this.field1404 != null) { // L: 93 - this.field1407.method7109(this.field1404.method2649()); // L: 94 + class387 method2666(int var1) { + if (this.field1387[var1] == null) { // L: 70 + this.field1387[var1] = new class387(this.method2665(var1)); // L: 71 + if (this.field1388 != null) { // L: 72 + this.field1387[var1].method7017(this.field1388.method2666(var1)); // L: 73 + } else { + this.field1387[var1].method7017(class387.field4345); // L: 76 } - - this.field1405 = false; // L: 96 } - return this.field1407; // L: 98 + return this.field1387[var1]; // L: 79 } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lnu;", - garbageValue = "57001904" + descriptor = "(II)Lnt;", + garbageValue = "-1203957232" ) - public class387 method2657(int var1) { - if (this.field1412) { // L: 102 - this.field1413.method7064(this.method2653(var1)); // L: 103 - this.field1413.method7109(this.method2649()); // L: 104 - this.field1412 = false; // L: 105 + class387 method2667(int var1) { + if (this.field1383[var1] == null) { // L: 83 + this.field1383[var1] = new class387(this.method2666(var1)); // L: 84 + this.field1383[var1].method7021(); // L: 85 } - return this.field1413; // L: 107 + return this.field1383[var1]; // L: 87 } - @ObfuscatedName("u") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lnt;I)V", + garbageValue = "2046672010" + ) + void method2676(class387 var1) { + this.field1389.method7032(var1); // L: 91 + this.field1392 = true; // L: 92 + this.field1391 = true; // L: 93 + } // L: 94 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)Lnt;", + garbageValue = "54" + ) + class387 method2678() { + return this.field1389; // L: 97 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Lnt;", + garbageValue = "-12" + ) + class387 method2669() { + if (this.field1392) { // L: 101 + this.field1384.method7032(this.method2678()); // L: 102 + if (this.field1388 != null) { // L: 103 + this.field1384.method7017(this.field1388.method2669()); // L: 104 + } + + this.field1392 = false; // L: 106 + } + + return this.field1384; // L: 108 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)Lnt;", + garbageValue = "-47" + ) + public class387 method2671(int var1) { + if (this.field1391) { // L: 112 + this.field1393.method7032(this.method2667(var1)); // L: 113 + this.field1393.method7017(this.method2669()); // L: 114 + this.field1391 = false; // L: 115 + } + + return this.field1393; // L: 117 + } + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)[F", - garbageValue = "493348686" + garbageValue = "-101383971" ) - float[] method2658(int var1) { - return this.field1414[var1]; // L: 111 + float[] method2672(int var1) { + return this.field1394[var1]; // L: 121 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "-748184127" + ) + float[] method2673(int var1) { + return this.field1390[var1]; // L: 125 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-559472917" + descriptor = "(IB)[F", + garbageValue = "9" ) - float[] method2652(int var1) { - return this.field1415[var1]; // L: 115 + float[] method2674(int var1) { + return this.field1396[var1]; // L: 129 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IS)[F", - garbageValue = "128" + descriptor = "(II)Lim;", + garbageValue = "1491781541" ) - float[] method2687(int var1) { - return this.field1416[var1]; // L: 119 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;B)V", - garbageValue = "72" - ) - public static void method2685(AbstractArchive var0) { - } // L: 16 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1823955138" - ) - static int method2681(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1410 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1411 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemId; // L: 1412 - return 1; // L: 1413 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1415 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1416 - if (var3.itemId != -1) { // L: 1417 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1418 - } - - return 1; // L: 1419 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1421 - int var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1422 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1423 - if (var4 != null) { // L: 1424 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1425 - } - - return 1; // L: 1426 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1428 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1429 - return 1; // L: 1430 - } else if (var0 == 1707) { // L: 1432 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1433 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.method5642() ? 1 : 0; // L: 1434 - return 1; // L: 1435 - } else if (var0 == 1708) { // L: 1437 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1438 - return class302.method5773(var3); // L: 1439 - } else if (var0 == 1708) { // L: 1441 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1442 - return WorldMapSectionType.method4952(var3); // L: 1443 + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 322 + if (var1 != null) { // L: 323 + return var1; } else { - return 2; // L: 1445 + var1 = HealthBarUpdate.method2185(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 324 + if (var1 != null) { // L: 325 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; // L: 326 } } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "246529128" + ) + static final void method2680(int var0) { + if (class155.loadInterface(var0)) { // L: 11936 + class119.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11937 + } + } // L: 11938 + + @ObfuscatedName("mq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2141464292" + ) + static void method2684() { + if (VarcInt.field1841 != null) { // L: 12649 + Client.field779 = Client.cycle; // L: 12650 + VarcInt.field1841.method6057(); // L: 12651 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12652 + if (Client.players[var0] != null) { // L: 12653 + VarcInt.field1841.method6044((Client.players[var0].x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX, (Client.players[var0].y >> 7) + VarcInt.baseY); // L: 12654 + } + } + } + + } // L: 12658 } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index c5904eb63c..69498d0f9a 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -3,734 +3,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("di") public enum class116 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldi;" ) - field1420(0, 0), - @ObfuscatedName("o") + field1403(0, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldi;" ) - field1419(1, 1), - @ObfuscatedName("h") + field1399(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldi;" ) - field1425(2, 2), - @ObfuscatedName("g") + field1400(2, 2), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldi;" ) - field1421(3, 3), - @ObfuscatedName("l") + field1406(3, 3), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldi;" ) - field1423(4, 4); + field1401(4, 4); - @ObfuscatedName("fq") - @ObfuscatedGetter( - intValue = -1986748855 - ) - static int field1418; + @ObfuscatedName("r") + @Export("Tiles_saturation") + static int[] Tiles_saturation; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -810900463 + intValue = 322402379 ) - final int field1422; - @ObfuscatedName("d") + final int field1398; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1964880943 + intValue = -314756427 ) - final int field1424; + final int field1404; class116(int var3, int var4) { - this.field1422 = var3; // L: 121 - this.field1424 = var4; // L: 122 - } // L: 123 + this.field1398 = var3; // L: 134 + this.field1404 = var4; // L: 135 + } // L: 136 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1424; // L: 126 + return this.field1404; // L: 139 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Lgx;", - garbageValue = "-48" + descriptor = "(I)V", + garbageValue = "1031484167" ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79 - if (var1 != null) { // L: 80 - return var1; - } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 81 - var1 = new ObjectComposition(); // L: 82 - var1.id = var0; // L: 83 - if (var2 != null) { // L: 84 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 85 - if (var1.isSolid) { // L: 86 - var1.interactType = 0; // L: 87 - var1.boolean1 = false; // L: 88 - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 - return var1; // L: 91 + public static void method2705() { + if (MouseHandler.MouseHandler_instance != null) { // L: 37 + synchronized(MouseHandler.MouseHandler_instance) { // L: 38 + MouseHandler.MouseHandler_instance = null; // L: 39 + } // L: 40 } - } - @ObfuscatedName("hp") + } // L: 42 + + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(Lco;IIIIII)V", - garbageValue = "-151071027" + descriptor = "(I)V", + garbageValue = "-2133644638" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { // L: 4464 - if (var0 instanceof NPC) { // L: 4465 - NPCComposition var6 = ((NPC)var0).definition; // L: 4466 - if (var6.transforms != null) { // L: 4467 - var6 = var6.transform(); - } - - if (var6 == null) { // L: 4468 - return; - } - } - - int var75 = Players.Players_count; // L: 4470 - int[] var7 = Players.Players_indices; // L: 4471 - byte var8 = 0; // L: 4472 - if (var1 < var75 && var0.playerCycle == Client.cycle && ItemComposition.method3706((Player)var0)) { // L: 4473 - Player var9 = (Player)var0; // L: 4474 - if (var1 < var75) { // L: 4475 - WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4476 - AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4477 - byte var11 = 9; // L: 4478 - var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); // L: 4479 - var8 = 18; // L: 4480 - } - } - - int var76 = -2; // L: 4483 - int var15; - int var22; - int var23; - if (!var0.healthBars.method6269()) { // L: 4484 - WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4485 - - for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { // L: 4486 - HealthBarUpdate var79 = var87.get(Client.cycle); // L: 4487 - if (var79 == null) { // L: 4488 - if (var87.isEmpty()) { // L: 4546 - var87.remove(); - } - } else { - HealthBarDefinition var80 = var87.definition; // L: 4489 - SpritePixels var13 = var80.getBackSprite(); // L: 4490 - SpritePixels var81 = var80.getFrontSprite(); // L: 4491 - int var82 = 0; // L: 4493 - if (var13 != null && var81 != null) { // L: 4494 - if (var80.widthPadding * 2 < var81.subWidth) { // L: 4495 - var82 = var80.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; // L: 4496 - } else { - var15 = var80.width; // L: 4498 - } - - int var17 = 255; // L: 4499 - boolean var83 = true; // L: 4500 - int var84 = Client.cycle - var79.cycle; // L: 4501 - int var85 = var15 * var79.health2 / var80.width; // L: 4502 - int var86; - int var94; - if (var79.cycleOffset > var84) { // L: 4503 - var86 = var80.field1876 == 0 ? 0 : var80.field1876 * (var84 / var80.field1876); // L: 4504 - var22 = var15 * var79.health / var80.width; // L: 4505 - var94 = var86 * (var85 - var22) / var79.cycleOffset + var22; // L: 4506 - } else { - var94 = var85; // L: 4509 - var86 = var80.int5 + var79.cycleOffset - var84; // L: 4510 - if (var80.int3 >= 0) { // L: 4511 - var17 = (var86 << 8) / (var80.int5 - var80.int3); - } - } - - if (var79.health2 > 0 && var94 < 1) { // L: 4513 - var94 = 1; - } - - if (var13 != null && var81 != null) { // L: 4514 - if (var94 == var15) { // L: 4515 - var94 += var82 * 2; - } else { - var94 += var82; // L: 4516 - } - - var86 = var13.subHeight; // L: 4517 - var76 += var86; // L: 4518 - var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4519 - var23 = var3 + Client.viewportTempY - var76; // L: 4520 - var22 -= var82; // L: 4521 - if (var17 >= 0 && var17 < 255) { // L: 4522 - var13.drawTransAt(var22, var23, var17); // L: 4523 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var94 + var22, var23 + var86); // L: 4524 - var81.drawTransAt(var22, var23, var17); // L: 4525 - } else { - var13.drawTransBgAt(var22, var23); // L: 4528 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var94 + var22, var23 + var86); // L: 4529 - var81.drawTransBgAt(var22, var23); // L: 4530 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4532 - var76 += 2; // L: 4533 - } else { - var76 += 5; // L: 4536 - if (Client.viewportTempX > -1) { // L: 4537 - var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4538 - var22 = var3 + Client.viewportTempY - var76; // L: 4539 - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var94, 5, 65280); // L: 4540 - Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var86, var22, var15 - var94, 5, 16711680); // L: 4541 - } - - var76 += 2; // L: 4543 - } - } - } - } - - if (var76 == -2) { // L: 4549 - var76 += 7; - } - - var76 += var8; // L: 4550 - if (var1 < var75) { // L: 4551 - Player var88 = (Player)var0; // L: 4552 - if (var88.isHidden) { // L: 4553 - return; - } - - if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 4554 - WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4555 - if (Client.viewportTempX > -1) { // L: 4556 - if (var88.headIconPk != -1) { // L: 4557 - var76 += 25; // L: 4558 - Bounds.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4559 - } - - if (var88.headIconPrayer != -1) { // L: 4561 - var76 += 25; // L: 4562 - DynamicObject.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4563 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4567 - WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4568 - if (Client.viewportTempX > -1) { // L: 4569 - var76 += VarpDefinition.headIconHintSprites[1].subHeight; // L: 4570 - VarpDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4571 - } - } - } else { - NPCComposition var89 = ((NPC)var0).definition; // L: 4576 - if (var89.transforms != null) { // L: 4577 - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < DynamicObject.headIconPrayerSprites.length) { // L: 4578 - WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4579 - if (Client.viewportTempX > -1) { // L: 4580 - DynamicObject.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4581 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4584 - WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4585 - if (Client.viewportTempX > -1) { // L: 4586 - VarpDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field1152 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4589 4590 - WorldMapLabelSize.method4533(var0, var0.defaultHeight); // L: 4591 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4592 - Client.overheadTextXOffsets[Client.overheadTextCount] = FloorOverlayDefinition.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4593 - Client.overheadTextAscents[Client.overheadTextCount] = FloorOverlayDefinition.fontBold12.ascent; // L: 4594 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4595 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4596 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4597 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4598 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4599 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4600 - ++Client.overheadTextCount; // L: 4601 - } - } - - for (int var77 = 0; var77 < 4; ++var77) { // L: 4605 - int var90 = var0.hitSplatCycles[var77]; // L: 4606 - int var12 = var0.hitSplatTypes[var77]; // L: 4607 - HitSplatDefinition var91 = null; // L: 4608 - int var14 = 0; // L: 4609 - if (var12 >= 0) { // L: 4610 - if (var90 <= Client.cycle) { // L: 4611 - continue; - } - - var91 = GameEngine.method589(var0.hitSplatTypes[var77]); // L: 4612 - var14 = var91.field2025; // L: 4613 - if (var91 != null && var91.transforms != null) { // L: 4614 - var91 = var91.transform(); // L: 4615 - if (var91 == null) { // L: 4616 - var0.hitSplatCycles[var77] = -1; // L: 4617 - continue; // L: 4618 - } - } - } else if (var90 < 0) { // L: 4622 - continue; - } - - var15 = var0.hitSplatTypes2[var77]; // L: 4623 - HitSplatDefinition var16 = null; // L: 4624 - if (var15 >= 0) { // L: 4625 - var16 = GameEngine.method589(var15); // L: 4626 - if (var16 != null && var16.transforms != null) { // L: 4627 - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { // L: 4629 - if (var91 == null) { // L: 4630 - var0.hitSplatCycles[var77] = -1; // L: 4631 - } else { - WorldMapLabelSize.method4533(var0, var0.defaultHeight / 2); // L: 4634 - if (Client.viewportTempX > -1) { // L: 4635 - boolean var92 = true; // L: 4636 - if (var77 == 1) { // L: 4637 - Client.viewportTempY -= 20; // L: 4638 - } - - if (var77 == 2) { // L: 4640 - Client.viewportTempX -= 15; // L: 4641 - Client.viewportTempY -= 10; // L: 4642 - } - - if (var77 == 3) { // L: 4644 - Client.viewportTempX += 15; // L: 4645 - Client.viewportTempY -= 10; // L: 4646 - } - - SpritePixels var18 = null; // L: 4648 - SpritePixels var19 = null; // L: 4649 - SpritePixels var20 = null; // L: 4650 - SpritePixels var21 = null; // L: 4651 - var22 = 0; // L: 4652 - var23 = 0; // L: 4653 - int var24 = 0; // L: 4654 - int var25 = 0; // L: 4655 - int var26 = 0; // L: 4656 - int var27 = 0; // L: 4657 - int var28 = 0; // L: 4658 - int var29 = 0; // L: 4659 - SpritePixels var30 = null; // L: 4660 - SpritePixels var31 = null; // L: 4661 - SpritePixels var32 = null; // L: 4662 - SpritePixels var33 = null; // L: 4663 - int var34 = 0; // L: 4664 - int var35 = 0; // L: 4665 - int var36 = 0; // L: 4666 - int var37 = 0; // L: 4667 - int var38 = 0; // L: 4668 - int var39 = 0; // L: 4669 - int var40 = 0; // L: 4670 - int var41 = 0; // L: 4671 - int var42 = 0; // L: 4672 - var18 = var91.method3611(); // L: 4673 - int var43; - if (var18 != null) { // L: 4674 - var22 = var18.subWidth; // L: 4675 - var43 = var18.subHeight; // L: 4676 - if (var43 > var42) { // L: 4677 - var42 = var43; - } - - var26 = var18.xOffset; // L: 4678 - } - - var19 = var91.method3620(); // L: 4680 - if (var19 != null) { // L: 4681 - var23 = var19.subWidth; // L: 4682 - var43 = var19.subHeight; // L: 4683 - if (var43 > var42) { // L: 4684 - var42 = var43; - } - - var27 = var19.xOffset; // L: 4685 - } - - var20 = var91.method3613(); // L: 4687 - if (var20 != null) { // L: 4688 - var24 = var20.subWidth; // L: 4689 - var43 = var20.subHeight; // L: 4690 - if (var43 > var42) { // L: 4691 - var42 = var43; - } - - var28 = var20.xOffset; // L: 4692 - } - - var21 = var91.method3614(); // L: 4694 - if (var21 != null) { // L: 4695 - var25 = var21.subWidth; // L: 4696 - var43 = var21.subHeight; // L: 4697 - if (var43 > var42) { // L: 4698 - var42 = var43; - } - - var29 = var21.xOffset; // L: 4699 - } - - if (var16 != null) { // L: 4701 - var30 = var16.method3611(); // L: 4702 - if (var30 != null) { // L: 4703 - var34 = var30.subWidth; // L: 4704 - var43 = var30.subHeight; // L: 4705 - if (var43 > var42) { // L: 4706 - var42 = var43; - } - - var38 = var30.xOffset; // L: 4707 - } - - var31 = var16.method3620(); // L: 4709 - if (var31 != null) { // L: 4710 - var35 = var31.subWidth; // L: 4711 - var43 = var31.subHeight; // L: 4712 - if (var43 > var42) { // L: 4713 - var42 = var43; - } - - var39 = var31.xOffset; // L: 4714 - } - - var32 = var16.method3613(); // L: 4716 - if (var32 != null) { // L: 4717 - var36 = var32.subWidth; // L: 4718 - var43 = var32.subHeight; // L: 4719 - if (var43 > var42) { // L: 4720 - var42 = var43; - } - - var40 = var32.xOffset; // L: 4721 - } - - var33 = var16.method3614(); // L: 4723 - if (var33 != null) { // L: 4724 - var37 = var33.subWidth; // L: 4725 - var43 = var33.subHeight; // L: 4726 - if (var43 > var42) { // L: 4727 - var42 = var43; - } - - var41 = var33.xOffset; // L: 4728 - } - } - - Font var78 = var91.getFont(); // L: 4733 - if (var78 == null) { // L: 4734 - var78 = TextureProvider.fontPlain11; - } - - Font var44; - if (var16 != null) { // L: 4735 - var44 = var16.getFont(); // L: 4736 - if (var44 == null) { // L: 4737 - var44 = TextureProvider.fontPlain11; - } - } else { - var44 = TextureProvider.fontPlain11; // L: 4739 - } - - String var45 = null; // L: 4740 - String var46 = null; // L: 4741 - boolean var47 = false; // L: 4742 - int var48 = 0; // L: 4743 - var45 = var91.getString(var0.hitSplatValues[var77]); // L: 4744 - int var93 = var78.stringWidth(var45); // L: 4745 - if (var16 != null) { // L: 4746 - var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 4747 - var48 = var44.stringWidth(var46); // L: 4748 - } - - int var49 = 0; // L: 4750 - int var50 = 0; // L: 4751 - if (var23 > 0) { // L: 4752 - if (var20 == null && var21 == null) { // L: 4753 - var49 = 1; // L: 4754 - } else { - var49 = var93 / var23 + 1; - } - } - - if (var16 != null && var35 > 0) { // L: 4756 4757 - if (var32 == null && var33 == null) { // L: 4758 - var50 = 1; // L: 4759 - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; // L: 4762 - int var52 = var51; // L: 4763 - if (var22 > 0) { // L: 4764 - var51 += var22; - } - - var51 += 2; // L: 4765 - int var53 = var51; // L: 4766 - if (var24 > 0) { // L: 4767 - var51 += var24; - } - - int var54 = var51; // L: 4768 - int var55 = var51; // L: 4769 - int var56; - if (var23 > 0) { // L: 4770 - var56 = var49 * var23; // L: 4771 - var51 += var56; // L: 4772 - var55 += (var56 - var93) / 2; // L: 4773 - } else { - var51 += var93; // L: 4776 - } - - var56 = var51; // L: 4778 - if (var25 > 0) { // L: 4779 - var51 += var25; - } - - int var57 = 0; // L: 4780 - int var58 = 0; // L: 4781 - int var59 = 0; // L: 4782 - int var60 = 0; // L: 4783 - int var61 = 0; // L: 4784 - int var62; - if (var16 != null) { // L: 4785 - var51 += 2; // L: 4786 - var57 = var51; // L: 4787 - if (var34 > 0) { - var51 += var34; // L: 4788 - } - - var51 += 2; // L: 4789 - var58 = var51; // L: 4790 - if (var36 > 0) { // L: 4791 - var51 += var36; - } - - var59 = var51; // L: 4792 - var61 = var51; // L: 4793 - if (var35 > 0) { // L: 4794 - var62 = var50 * var35; // L: 4795 - var51 += var62; // L: 4796 - var61 += (var62 - var48) / 2; // L: 4797 - } else { - var51 += var48; // L: 4800 - } - - var60 = var51; // L: 4802 - if (var37 > 0) { // L: 4803 - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 4805 - int var63 = var91.field2016 - var62 * var91.field2016 / var91.field2025; // L: 4806 - int var64 = var62 * var91.field2017 / var91.field2025 + -var91.field2017; // L: 4807 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4808 - int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 4809 - int var67 = var66; // L: 4810 - int var68 = var66 + var42; // L: 4811 - int var69 = var66 + var91.field2021 + 15; // L: 4812 - int var70 = var69 - var78.maxAscent; // L: 4813 - int var71 = var69 + var78.maxDescent; // L: 4814 - if (var70 < var66) { // L: 4815 - var67 = var70; - } - - if (var71 > var68) { // L: 4816 - var68 = var71; - } - - int var72 = 0; // L: 4817 - int var73; - int var74; - if (var16 != null) { // L: 4818 - var72 = var66 + var16.field2021 + 15; // L: 4819 - var73 = var72 - var44.maxAscent; // L: 4820 - var74 = var72 + var44.maxDescent; // L: 4821 - if (var73 < var67) { // L: 4822 - ; - } - - if (var74 > var68) { // L: 4823 - ; - } - } - - var73 = 255; // L: 4825 - if (var91.field2005 >= 0) { // L: 4826 - var73 = (var62 << 8) / (var91.field2025 - var91.field2005); - } - - if (var73 >= 0 && var73 < 255) { // L: 4827 - if (var18 != null) { // L: 4828 - var18.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var20 != null) { // L: 4829 - var20.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var19 != null) { // L: 4830 - for (var74 = 0; var74 < var49; ++var74) { // L: 4831 - var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 4832 - } - } - - if (var21 != null) { // L: 4835 - var21.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var78.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); // L: 4836 - if (var16 != null) { // L: 4837 - if (var30 != null) { // L: 4838 - var30.drawTransAt(var57 + var65 - var38, var66, var73); - } - - if (var32 != null) { // L: 4839 - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { // L: 4840 - for (var74 = 0; var74 < var50; ++var74) { // L: 4841 - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); // L: 4842 - } - } - - if (var33 != null) { // L: 4845 - var33.drawTransAt(var60 + var65 - var41, var66, var73); - } - - var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 4846 - } - } else { - if (var18 != null) { // L: 4850 - var18.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var20 != null) { // L: 4851 - var20.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var19 != null) { // L: 4852 - for (var74 = 0; var74 < var49; ++var74) { // L: 4853 - var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 4854 - } - } - - if (var21 != null) { // L: 4857 - var21.drawTransBgAt(var65 + var56 - var29, var66); - } - - var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); // L: 4858 - if (var16 != null) { // L: 4859 - if (var30 != null) { // L: 4860 - var30.drawTransBgAt(var65 + var57 - var38, var66); - } - - if (var32 != null) { // L: 4861 - var32.drawTransBgAt(var65 + var58 - var40, var66); - } - - if (var31 != null) { // L: 4862 - for (var74 = 0; var74 < var50; ++var74) { // L: 4863 - var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); // L: 4864 - } - } - - if (var33 != null) { // L: 4867 - var33.drawTransBgAt(var65 + var60 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); // L: 4868 - } - } - } - } - } - } - - } - } // L: 4873 - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(Lkn;IIZB)V", - garbageValue = "24" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 10185 - int var5 = var0.height; // L: 10186 - if (var0.widthAlignment == 0) { // L: 10187 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 10188 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 10189 - var0.width = var0.rawWidth * var1 >> 14; + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (ViewportMouse.pcmPlayer1 != null) { // L: 3488 + ViewportMouse.pcmPlayer1.run(); } - if (var0.heightAlignment == 0) { // L: 10190 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 10191 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { // L: 10192 - var0.height = var2 * var0.rawHeight >> 14; + if (KeyHandler.pcmPlayer0 != null) { // L: 3489 + KeyHandler.pcmPlayer0.run(); } - if (var0.widthAlignment == 4) { // L: 10193 - var0.width = var0.height * var0.field3359 / var0.field3360; - } - - if (var0.heightAlignment == 4) { // L: 10194 - var0.height = var0.width * var0.field3360 / var0.field3359; - } - - if (var0.contentType == 1337) { // L: 10195 - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10196 - ScriptEvent var6 = new ScriptEvent(); // L: 10197 - var6.widget = var0; // L: 10198 - var6.args = var0.onResize; // L: 10199 - Client.scriptEvents.addFirst(var6); // L: 10200 - } - - } // L: 10202 + } // L: 3490 } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 58f434ba06..0ddb770cc6 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -2,484 +2,273 @@ 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("di") +@ObfuscatedName("dt") public class class117 { @ObfuscatedName("v") - boolean field1434; - @ObfuscatedName("o") - boolean field1427; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ldy;" - ) - class116 field1428; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ldy;" - ) - class116 field1429; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Ldh;" - ) - class113[] field1430; - @ObfuscatedName("n") - boolean field1438; - @ObfuscatedName("d") - float field1432; - @ObfuscatedName("f") - float field1433; - @ObfuscatedName("u") - float[] field1440; - @ObfuscatedName("r") - float[] field1435; - @ObfuscatedName("k") - boolean field1442; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 111409657 - ) - int field1436; + boolean field1413; @ObfuscatedName("c") - float[] field1439; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1432271977 + boolean field1408; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Ldi;" ) - int field1426; + class116 field1409; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + class116 field1410; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "[Ldm;" + ) + class113[] field1411; + @ObfuscatedName("n") + boolean field1412; + @ObfuscatedName("s") + float field1422; + @ObfuscatedName("l") + float field1414; + @ObfuscatedName("q") + float[] field1415; + @ObfuscatedName("o") + float[] field1416; + @ObfuscatedName("r") + boolean field1407; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1400069259 + intValue = 1038794237 ) - int field1431; - @ObfuscatedName("s") - float field1441; - @ObfuscatedName("b") - float field1437; + int field1418; + @ObfuscatedName("w") + float[] field1419; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -297304491 + ) + int field1417; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1891962511 + ) + int field1421; + @ObfuscatedName("m") + float field1425; + @ObfuscatedName("u") + float field1423; class117() { - this.field1440 = new float[4]; // L: 16 - this.field1435 = new float[4]; // L: 17 - this.field1442 = true; // L: 18 - this.field1436 = 0; // L: 19 + this.field1415 = new float[4]; + this.field1416 = new float[4]; + this.field1407 = true; + this.field1418 = 0; } // L: 26 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;IB)I", - garbageValue = "20" + descriptor = "(Lpi;IB)I", + garbageValue = "-14" ) - int method2722(Buffer var1, int var2) { - int var3 = var1.readUnsignedShort(); // L: 29 - int var4 = var1.readUnsignedByte(); // L: 30 - class123 var5 = (class123)ChatChannel.findEnumerated(DevicePcmPlayerProvider.method383(), var4); // L: 32 - if (var5 == null) { // L: 33 - var5 = class123.field1501; + int method2708(Buffer var1, int var2) { + int var3 = var1.readUnsignedShort(); + int var4 = var1.readUnsignedByte(); + class123 var5 = (class123)MusicPatchPcmStream.findEnumerated(class385.method6974(), var4); + if (var5 == null) { + var5 = class123.field1489; } - this.field1428 = class327.method6109(var1.readUnsignedByte()); // L: 35 - this.field1429 = class327.method6109(var1.readUnsignedByte()); // L: 36 - this.field1434 = var1.readUnsignedByte() != 0; // L: 37 - this.field1430 = new class113[var3]; // L: 38 - class113 var8 = null; // L: 39 + int var6 = var1.readUnsignedByte(); + class116 var7 = (class116)MusicPatchPcmStream.findEnumerated(class140.method3045(), var6); // L: 38 + if (var7 == null) { // L: 39 + var7 = class116.field1403; + } - int var6; - for (var6 = 0; var6 < var3; ++var6) { // L: 40 - class113 var7 = new class113(); // L: 41 - var7.method2632(var1, var2); // L: 42 - this.field1430[var6] = var7; // L: 43 - if (var8 != null) { // L: 44 - var8.field1392 = var7; // L: 45 + this.field1409 = var7; // L: 42 + int var8 = var1.readUnsignedByte(); // L: 44 + class116 var9 = (class116)MusicPatchPcmStream.findEnumerated(class140.method3045(), var8); // L: 46 + if (var9 == null) { // L: 47 + var9 = class116.field1403; + } + + this.field1410 = var9; // L: 50 + this.field1413 = var1.readUnsignedByte() != 0; // L: 51 + this.field1411 = new class113[var3]; // L: 52 + class113 var12 = null; // L: 53 + + int var10; + for (var10 = 0; var10 < var3; ++var10) { // L: 54 + class113 var11 = new class113(); // L: 55 + var11.method2647(var1, var2); // L: 56 + this.field1411[var10] = var11; // L: 57 + if (var12 != null) { // L: 58 + var12.field1375 = var11; // L: 59 } - var8 = var7; // L: 47 + var12 = var11; // L: 61 } - this.field1426 = this.field1430[0].field1384; // L: 49 - this.field1431 = this.field1430[this.method2706() - 1].field1384; // L: 50 - this.field1439 = new float[this.method2703() + 1]; // L: 52 + this.field1417 = this.field1411[0].field1373; // L: 63 + this.field1421 = this.field1411[this.method2715() - 1].field1373; // L: 64 + this.field1419 = new float[this.method2712() + 1]; // L: 66 - for (var6 = this.method2699(); var6 <= this.method2702(); ++var6) { // L: 53 - this.field1439[var6 - this.method2699()] = AttackOption.method2392(this, (float)var6); // L: 54 + for (var10 = this.method2714(); var10 <= this.method2711(); ++var10) { // L: 67 + this.field1419[var10 - this.method2714()] = class10.method92(this, (float)var10); // L: 68 } - this.field1430 = null; // L: 56 - this.field1441 = AttackOption.method2392(this, (float)(this.method2699() - 1)); // L: 58 - this.field1437 = AttackOption.method2392(this, (float)(this.method2702() + 1)); // L: 59 - return var3; // L: 60 + this.field1411 = null; // L: 70 + this.field1425 = class10.method92(this, (float)(this.method2714() - 1)); // L: 72 + this.field1423 = class10.method92(this, (float)(this.method2711() + 1)); // L: 73 + return var3; // L: 74 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)F", - garbageValue = "296880524" + garbageValue = "937027636" ) - public float method2700(int var1) { - if (var1 < this.method2699()) { // L: 65 - return this.field1441; // L: 66 + public float method2709(int var1) { + if (var1 < this.method2714()) { // L: 79 + return this.field1425; // L: 80 } else { - return var1 > this.method2702() ? this.field1437 : this.field1439[var1 - this.method2699()]; // L: 68 69 71 + return var1 > this.method2711() ? this.field1423 : this.field1419[var1 - this.method2714()]; // L: 82 83 85 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1807012578" + descriptor = "(B)I", + garbageValue = "-43" ) - int method2699() { - return this.field1426; // L: 76 + int method2714() { + return this.field1417; // L: 90 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1753260984" + garbageValue = "-589047321" ) - int method2702() { - return this.field1431; // L: 80 + int method2711() { + return this.field1421; // L: 94 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "760390929" + descriptor = "(B)I", + garbageValue = "32" ) - int method2703() { - return this.method2702() - this.method2699(); // L: 84 + int method2712() { + return this.method2711() - this.method2714(); // L: 98 } @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(FI)I", - garbageValue = "201296115" + garbageValue = "-1858768246" ) - int method2704(float var1) { - if (this.field1436 < 0 || (float)this.field1430[this.field1436].field1384 > var1 || this.field1430[this.field1436].field1392 != null && (float)this.field1430[this.field1436].field1392.field1384 <= var1) { // L: 88 - if (var1 >= (float)this.method2699() && var1 <= (float)this.method2702()) { // L: 91 - int var2 = this.method2706(); // L: 94 - int var3 = this.field1436; // L: 95 - if (var2 > 0) { // L: 96 - int var4 = 0; // L: 97 - int var5 = var2 - 1; // L: 98 + int method2713(float var1) { + if (this.field1418 < 0 || (float)this.field1411[this.field1418].field1373 > var1 || this.field1411[this.field1418].field1375 != null && (float)this.field1411[this.field1418].field1375.field1373 <= var1) { // L: 102 + if (var1 >= (float)this.method2714() && var1 <= (float)this.method2711()) { // L: 105 + int var2 = this.method2715(); // L: 108 + int var3 = this.field1418; // L: 109 + if (var2 > 0) { // L: 110 + int var4 = 0; // L: 111 + int var5 = var2 - 1; // L: 112 do { - int var6 = var4 + var5 >> 1; // L: 100 - if (var1 < (float)this.field1430[var6].field1384) { // L: 101 - if (var1 > (float)this.field1430[var6 - 1].field1384) { // L: 102 - var3 = var6 - 1; // L: 103 + int var6 = var4 + var5 >> 1; // L: 114 + if (var1 < (float)this.field1411[var6].field1373) { // L: 115 + if (var1 > (float)this.field1411[var6 - 1].field1373) { // L: 116 + var3 = var6 - 1; // L: 117 break; } - var5 = var6 - 1; // L: 107 + var5 = var6 - 1; // L: 121 } else { - if (var1 <= (float)this.field1430[var6].field1384) { // L: 110 - var3 = var6; // L: 120 - break; // L: 121 + if (var1 <= (float)this.field1411[var6].field1373) { // L: 124 + var3 = var6; // L: 134 + break; // L: 135 } - if (var1 < (float)this.field1430[var6 + 1].field1384) { // L: 111 - var3 = var6; // L: 112 - break; // L: 113 + if (var1 < (float)this.field1411[var6 + 1].field1373) { // L: 125 + var3 = var6; // L: 126 + break; // L: 127 } - var4 = var6 + 1; // L: 116 + var4 = var6 + 1; // L: 130 } - } while(var4 <= var5); // L: 123 + } while(var4 <= var5); // L: 137 } - if (var3 != this.field1436) { // L: 125 - this.field1436 = var3; // L: 126 - this.field1442 = true; // L: 127 + if (var3 != this.field1418) { // L: 139 + this.field1418 = var3; // L: 140 + this.field1407 = true; // L: 141 } - return this.field1436; // L: 129 + return this.field1418; // L: 143 } else { - return -1; // L: 92 + return -1; // L: 106 } } else { - return this.field1436; // L: 89 + return this.field1418; // L: 103 } } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(FI)Ldh;", - garbageValue = "1784485987" + descriptor = "(FB)Ldm;", + garbageValue = "-11" ) - class113 method2705(float var1) { - int var2 = this.method2704(var1); // L: 133 - return var2 >= 0 && var2 < this.field1430.length ? this.field1430[var2] : null; // L: 134 135 138 + class113 method2736(float var1) { + int var2 = this.method2713(var1); // L: 147 + return var2 >= 0 && var2 < this.field1411.length ? this.field1411[var2] : null; // L: 148 149 152 } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "79780462" + garbageValue = "2021346356" ) - int method2706() { - return this.field1430 == null ? 0 : this.field1430.length; // L: 143 144 + int method2715() { + return this.field1411 == null ? 0 : this.field1411.length; // L: 157 158 } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1667390542" + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "-1434751049" ) - static int method2709(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 612 - Widget var3; - if (var0 >= 2000) { // L: 613 - var0 -= 1000; // L: 614 - var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 615 - var3 = HorizontalAlignment.getWidget(var4); // L: 616 - } else { - var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 618 + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { // L: 9 + int var4 = (var3 + var2) / 2; // L: 10 + int var5 = var2; // L: 11 + String var6 = var0[var4]; // L: 12 + var0[var4] = var0[var3]; // L: 13 + var0[var3] = var6; // L: 14 + short var7 = var1[var4]; // L: 15 + var1[var4] = var1[var3]; // L: 16 + var1[var3] = var7; // L: 17 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 18 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 + String var9 = var0[var8]; // L: 20 + var0[var8] = var0[var5]; // L: 21 + var0[var5] = var9; // L: 22 + short var10 = var1[var8]; // L: 23 + var1[var8] = var1[var5]; // L: 24 + var1[var5++] = var10; // L: 25 + } + } + + var0[var3] = var0[var5]; // L: 29 + var0[var5] = var6; // L: 30 + var1[var3] = var1[var5]; // L: 31 + var1[var5] = var7; // L: 32 + sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 + sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 } - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 619 - class295.Interpreter_intStackSize -= 2; // L: 620 - var3.scrollX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 621 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 622 - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { // L: 623 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 624 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 625 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 626 - var3.scrollY = 0; - } - - class290.invalidateWidget(var3); // L: 627 - return 1; // L: 628 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 630 - var3.color = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 631 - class290.invalidateWidget(var3); // L: 632 - return 1; // L: 633 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 635 - var3.fill = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 636 - class290.invalidateWidget(var3); // L: 637 - return 1; // L: 638 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 640 - var3.transparencyTop = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 641 - class290.invalidateWidget(var3); // L: 642 - return 1; // L: 643 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 645 - var3.lineWid = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 646 - class290.invalidateWidget(var3); // L: 647 - return 1; // L: 648 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 650 - var3.spriteId2 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 651 - class290.invalidateWidget(var3); // L: 652 - return 1; // L: 653 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 655 - var3.spriteAngle = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 656 - class290.invalidateWidget(var3); // L: 657 - return 1; // L: 658 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 660 - var3.spriteTiling = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 661 - class290.invalidateWidget(var3); // L: 662 - return 1; // L: 663 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 665 - var3.modelType = 1; // L: 666 - var3.modelId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 667 - class290.invalidateWidget(var3); // L: 668 - return 1; // L: 669 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 671 - class295.Interpreter_intStackSize -= 6; // L: 672 - var3.modelOffsetX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 673 - var3.modelOffsetY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 674 - var3.modelAngleX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 675 - var3.modelAngleY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 676 - var3.modelAngleZ = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 4]; // L: 677 - var3.modelZoom = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 5]; // L: 678 - class290.invalidateWidget(var3); // L: 679 - return 1; // L: 680 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 682 - var8 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 683 - if (var8 != var3.sequenceId) { // L: 684 - var3.sequenceId = var8; // L: 685 - var3.modelFrame = 0; // L: 686 - var3.modelFrameCycle = 0; // L: 687 - class290.invalidateWidget(var3); // L: 688 - } - - return 1; // L: 690 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 692 - var3.modelOrthog = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 693 - class290.invalidateWidget(var3); // L: 694 - return 1; // L: 695 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 697 - String var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 698 - if (!var7.equals(var3.text)) { // L: 699 - var3.text = var7; // L: 700 - class290.invalidateWidget(var3); // L: 701 - } - - return 1; // L: 703 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 705 - var3.fontId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 706 - class290.invalidateWidget(var3); // L: 707 - return 1; // L: 708 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 710 - class295.Interpreter_intStackSize -= 3; // L: 711 - var3.textXAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 712 - var3.textYAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 713 - var3.textLineHeight = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 714 - class290.invalidateWidget(var3); // L: 715 - return 1; // L: 716 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 718 - var3.textShadowed = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 719 - class290.invalidateWidget(var3); // L: 720 - return 1; // L: 721 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 723 - var3.outline = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 724 - class290.invalidateWidget(var3); // L: 725 - return 1; // L: 726 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 728 - var3.spriteShadow = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 729 - class290.invalidateWidget(var3); // L: 730 - return 1; // L: 731 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 733 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 734 - class290.invalidateWidget(var3); // L: 735 - return 1; // L: 736 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 738 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 739 - class290.invalidateWidget(var3); // L: 740 - return 1; // L: 741 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 743 - class295.Interpreter_intStackSize -= 2; // L: 744 - var3.scrollWidth = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 745 - var3.scrollHeight = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 746 - class290.invalidateWidget(var3); // L: 747 - if (var4 != -1 && var3.type == 0) { // L: 748 - GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 749 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 751 - Messages.resumePauseWidget(var3.id, var3.childIndex); // L: 752 - Client.meslayerContinueWidget = var3; // L: 753 - class290.invalidateWidget(var3); // L: 754 - return 1; // L: 755 - } else if (var0 == 1122) { // L: 757 - var3.spriteId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 758 - class290.invalidateWidget(var3); // L: 759 - return 1; // L: 760 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 762 - var3.color2 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 763 - class290.invalidateWidget(var3); // L: 764 - return 1; // L: 765 - } else if (var0 == 1124) { // L: 767 - var3.transparencyBot = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 768 - class290.invalidateWidget(var3); // L: 769 - return 1; // L: 770 - } else if (var0 == 1125) { // L: 772 - var8 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 773 - FillMode var6 = (FillMode)ChatChannel.findEnumerated(PlayerType.FillMode_values(), var8); // L: 774 - if (var6 != null) { // L: 775 - var3.fillMode = var6; // L: 776 - class290.invalidateWidget(var3); // L: 777 - } - - return 1; // L: 779 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 781 - var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 782 - var3.field3491 = var5; // L: 783 - return 1; // L: 784 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 786 - var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 787 - var3.modelTransparency = var5; // L: 788 - return 1; // L: 789 - } else if (var0 == 1128) { // L: 791 - class295.Interpreter_intStackSize -= 2; // L: 792 - return 1; // L: 793 - } else if (var0 == 1129) { // L: 795 - var3.field3386 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 796 - class290.invalidateWidget(var3); // L: 797 - return 1; // L: 798 - } else if (var0 == 1130) { // L: 800 - var3.method5720(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize], UserComparator9.urlRequester, class4.method16()); // L: 801 - return 1; // L: 802 - } else if (var0 == 1131) { // L: 804 - class295.Interpreter_intStackSize -= 2; // L: 805 - var3.method5639(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 806 - return 1; // L: 807 - } else if (var0 == 1132) { // L: 809 - var3.method5682(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 810 - return 1; // L: 811 - } else { - return 2; // L: 813 - } - } - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1589949227" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 139 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)Ldu;", - garbageValue = "-1883042828" - ) - static class122 method2724(int var0) { - class122 var1 = (class122)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 333 - if (var1 != null) { // L: 334 - return var1; - } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 336 - AbstractArchive var4 = DevicePcmPlayerProvider.SequenceDefinition_skeletonsArchive; // L: 337 - boolean var5 = true; // L: 339 - byte[] var6 = var3.takeFile(var0 >> 16 & 65535, var0 & 65535); // L: 340 - class122 var2; - if (var6 == null) { // L: 341 - var5 = false; // L: 342 - var2 = null; // L: 343 - } else { - int var7 = (var6[1] & 255) << 8 | var6[2] & 255; // L: 346 - byte[] var8 = var4.getFile(var7, 0); // L: 349 - if (var8 == null) { // L: 350 - var5 = false; - } - - if (!var5) { // L: 351 - var2 = null; // L: 352 - } else { - try { - var2 = new class122(var3, var4, var0, false); // L: 356 - } catch (Exception var10) { // L: 358 - var2 = null; // L: 359 - } - } - } - - if (var2 != null) { // L: 363 - SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); - } - - return var2; // L: 364 - } - } + } // L: 36 } diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java index 0e7a5b0661..6d26d6c020 100644 --- a/runescape-client/src/main/java/class118.java +++ b/runescape-client/src/main/java/class118.java @@ -3,201 +3,138 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("df") public class class118 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldf;" ) - static final class118 field1452; - @ObfuscatedName("o") + static final class118 field1433; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldf;" ) - static final class118 field1444; - @ObfuscatedName("h") + static final class118 field1430; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldf;" ) - static final class118 field1443; - @ObfuscatedName("g") + static final class118 field1431; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldf;" ) - static final class118 field1446; - @ObfuscatedName("l") + static final class118 field1432; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldf;" ) - static final class118 field1445; + static final class118 field1434; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Ldf;" ) - static final class118 field1448; - @ObfuscatedName("d") + static final class118 field1429; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1928429829 + intValue = 1756960623 ) - final int field1449; - @ObfuscatedName("f") + final int field1437; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1028613151 + intValue = 1872311517 ) - final int field1450; - @ObfuscatedName("u") + final int field1436; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -529565057 + intValue = -2109677301 ) - final int field1447; + final int field1435; static { - field1452 = new class118(0, 0, (String)null, 0); - field1444 = new class118(1, 1, (String)null, 9); - field1443 = new class118(2, 2, (String)null, 3); - field1446 = new class118(3, 3, (String)null, 6); // L: 17 - field1445 = new class118(4, 4, (String)null, 1); - field1448 = new class118(5, 5, (String)null, 3); + field1433 = new class118(0, 0, (String)null, 0); // L: 14 + field1430 = new class118(1, 1, (String)null, 9); // L: 15 + field1431 = new class118(2, 2, (String)null, 3); // L: 16 + field1432 = new class118(3, 3, (String)null, 6); // L: 17 + field1434 = new class118(4, 4, (String)null, 1); // L: 18 + field1429 = new class118(5, 5, (String)null, 3); // L: 19 } class118(int var1, int var2, String var3, int var4) { - this.field1449 = var1; - this.field1450 = var2; // L: 26 - this.field1447 = var4; - } + this.field1437 = var1; // L: 29 + this.field1436 = var2; // L: 30 + this.field1435 = var4; // L: 31 + } // L: 32 @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "69492922" - ) - int method2727() { - return this.field1447; // L: 31 - } - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1450; + return this.field1436; // L: 45 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llp;I)I", - garbageValue = "-1161089510" + descriptor = "(I)I", + garbageValue = "-1895809881" ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); // L: 11 - int var4 = var1.length(); // L: 12 - int var5 = 0; // L: 13 - int var6 = 0; // L: 14 - char var7 = 0; // L: 15 - byte var8 = 0; // L: 16 - - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 - return -1; - } - - if (var6 - var8 >= var4) { // L: 20 - return 1; - } - - char var9; - if (var7 != 0) { // L: 23 - var9 = var7; // L: 24 - boolean var14 = false; // L: 25 - } else { - var9 = var0.charAt(var5++); // L: 27 - } - - char var10; - if (var8 != 0) { // L: 28 - var10 = (char)var8; // L: 29 - boolean var15 = false; // L: 30 - } else { - var10 = var1.charAt(var6++); // L: 32 - } - - var7 = MenuAction.method1877(var9); // L: 33 - byte var11; - if (var10 == 198) { // L: 36 - var11 = 69; // L: 37 - } else if (var10 == 230) { // L: 40 - var11 = 101; // L: 41 - } else if (var10 == 223) { // L: 44 - var11 = 115; // L: 45 - } else if (var10 == 338) { // L: 48 - var11 = 69; // L: 49 - } else if (var10 == 339) { // L: 52 - var11 = 101; // L: 53 - } else { - var11 = 0; // L: 56 - } - - var8 = var11; // L: 58 - var9 = GameEngine.standardizeChar(var9, var2); // L: 59 - var10 = GameEngine.standardizeChar(var10, var2); // L: 60 - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 61 - var9 = Character.toLowerCase(var9); // L: 62 - var10 = Character.toLowerCase(var10); // L: 63 - if (var10 != var9) { - return WorldMapData_0.lowercaseChar(var9, var2) - WorldMapData_0.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 67 - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { // L: 68 - if (var2 == Language.Language_FR) { // L: 69 - var5 = var3 - 1 - var17; // L: 70 - var6 = var4 - 1 - var17; // L: 71 - } else { - var6 = var17; // L: 73 - var5 = var17; - } - - char var18 = var0.charAt(var5); // L: 74 - var12 = var1.charAt(var6); // L: 75 - if (var18 != var12 && Character.toUpperCase(var18) != Character.toUpperCase(var12)) { // L: 76 - var18 = Character.toLowerCase(var18); // L: 77 - var12 = Character.toLowerCase(var12); // L: 78 - if (var12 != var18) { - return WorldMapData_0.lowercaseChar(var18, var2) - WorldMapData_0.lowercaseChar(var12, var2); // L: 79 - } - } - } - - var17 = var3 - var4; // L: 82 - if (var17 != 0) { // L: 83 - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { // L: 84 - var12 = var0.charAt(var19); // L: 85 - char var13 = var1.charAt(var19); // L: 86 - if (var12 != var13) { // L: 87 - return WorldMapData_0.lowercaseChar(var12, var2) - WorldMapData_0.lowercaseChar(var13, var2); - } - } - - return 0; // L: 89 - } + int method2739() { + return this.field1435; // L: 41 } - @ObfuscatedName("h") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpd;B)Ljava/lang/String;", - garbageValue = "54" + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "1410693926" ) - public static String method2737(Buffer var0) { - return DynamicObject.method1988(var0, 32767); // L: 64 + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 132 + int var4 = 0; // L: 133 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 134 + int var6 = var0[var5 + var1] & 255; // L: 135 + if (var6 != 0) { // L: 136 + if (var6 >= 128 && var6 < 160) { // L: 137 + char var7 = class345.cp1252AsciiExtension[var6 - 128]; // L: 138 + if (var7 == 0) { // L: 139 + var7 = '?'; + } + + var6 = var7; // L: 140 + } + + var3[var4++] = (char)var6; // L: 142 + } + } + + return new String(var3, 0, var4); // L: 144 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1500949037" + ) + static final int method2747() { + return ViewportMouse.ViewportMouse_y; // L: 84 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "1898368305" + ) + public static int[] method2748() { + int[] var0 = new int[KeyHandler.field132]; // L: 259 + + for (int var1 = 0; var1 < KeyHandler.field132; ++var1) { // L: 260 + var0[var1] = KeyHandler.field139[var1]; // L: 261 + } + + return var0; // L: 263 } } diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java index b2e9784a37..bf9362f476 100644 --- a/runescape-client/src/main/java/class119.java +++ b/runescape-client/src/main/java/class119.java @@ -1,130 +1,131 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; +import netscape.javascript.JSObject; -@ObfuscatedName("do") +@ObfuscatedName("dk") public class class119 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldk;" ) - static final class119 field1457; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1454; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1455; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1456; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1471; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1458; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1459; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1453; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1465; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1468; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1463; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1464; + static final class119 field1449; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldk;" ) - static final class119 field1462; - @ObfuscatedName("j") + static final class119 field1439; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldk;" ) - static final class119 field1466; - @ObfuscatedName("p") + static final class119 field1440; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldk;" ) - static final class119 field1467; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class119 field1460; + static final class119 field1441; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldk;" ) - static final class119 field1469; + static final class119 field1442; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1446; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1444; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1443; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1455; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1447; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1448; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1451; @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1186456071 + @ObfuscatedSignature( + descriptor = "Ldk;" ) - final int field1470; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 978299269 + static final class119 field1450; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ldk;" ) - final int field1461; + static final class119 field1445; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1457; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1956996321 + @ObfuscatedSignature( + descriptor = "Ldk;" ) - final int field1472; + static final class119 field1452; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ldk;" + ) + static final class119 field1454; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1189647423 + ) + final int field1438; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 590424235 + ) + final int field1456; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1848047837 + ) + final int field1453; static { - field1457 = new class119(0, 0, (String)null, -1, -1); // L: 42 - field1454 = new class119(1, 1, (String)null, 0, 2); // L: 43 - field1455 = new class119(2, 2, (String)null, 1, 2); // L: 44 - field1456 = new class119(3, 3, (String)null, 2, 2); // L: 45 - field1471 = new class119(4, 4, (String)null, 3, 1); // L: 46 - field1458 = new class119(5, 5, (String)null, 4, 1); // L: 47 - field1459 = new class119(6, 6, (String)null, 5, 1); // L: 48 - field1453 = new class119(7, 7, (String)null, 6, 3); // L: 49 - field1465 = new class119(8, 8, (String)null, 7, 3); // L: 50 - field1468 = new class119(9, 9, (String)null, 8, 3); // L: 51 - field1463 = new class119(10, 10, (String)null, 0, 7); // L: 52 - field1464 = new class119(11, 11, (String)null, 1, 7); // L: 53 - field1462 = new class119(12, 12, (String)null, 2, 7); // L: 54 - field1466 = new class119(13, 13, (String)null, 3, 7); // L: 55 - field1467 = new class119(14, 14, (String)null, 4, 7); // L: 56 - field1460 = new class119(15, 15, (String)null, 5, 7); // L: 57 - field1469 = new class119(16, 16, (String)null, 0, 5); // L: 58 + field1449 = new class119(0, 0, (String)null, -1, -1); // L: 51 + field1439 = new class119(1, 1, (String)null, 0, 2); // L: 52 + field1440 = new class119(2, 2, (String)null, 1, 2); // L: 53 + field1441 = new class119(3, 3, (String)null, 2, 2); // L: 54 + field1442 = new class119(4, 4, (String)null, 3, 1); // L: 55 + field1446 = new class119(5, 5, (String)null, 4, 1); // L: 56 + field1444 = new class119(6, 6, (String)null, 5, 1); // L: 57 + field1443 = new class119(7, 7, (String)null, 6, 3); // L: 58 + field1455 = new class119(8, 8, (String)null, 7, 3); // L: 59 + field1447 = new class119(9, 9, (String)null, 8, 3); // L: 60 + field1448 = new class119(10, 10, (String)null, 0, 7); // L: 61 + field1451 = new class119(11, 11, (String)null, 1, 7); // L: 62 + field1450 = new class119(12, 12, (String)null, 2, 7); // L: 63 + field1445 = new class119(13, 13, (String)null, 3, 7); // L: 64 + field1457 = new class119(14, 14, (String)null, 4, 7); // L: 65 + field1452 = new class119(15, 15, (String)null, 5, 7); // L: 66 + field1454 = new class119(16, 16, (String)null, 0, 5); // L: 67 } @ObfuscatedSignature( @@ -132,205 +133,132 @@ public class class119 implements MouseWheel { garbageValue = "-1" ) class119(int var1, int var2, String var3, int var4, int var5) { - this.field1470 = var1; // L: 68 - this.field1461 = var2; // L: 69 - this.field1472 = var4; // L: 70 - } // L: 71 + this.field1438 = var1; // L: 77 + this.field1456 = var2; // L: 78 + this.field1453 = var4; // L: 79 + } // L: 80 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1461; // L: 74 + return this.field1456; // L: 83 } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "923796459" + garbageValue = "1943929497" ) int method2751() { - return this.field1472; // L: 78 + return this.field1453; // L: 87 } - @ObfuscatedName("i") + @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-317596811" + descriptor = "([Lky;II)V", + garbageValue = "-908944822" ) - static int method2741(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2124 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.cycle; // L: 2125 - return 1; // L: 2126 - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2128 - class295.Interpreter_intStackSize -= 2; // L: 2129 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2130 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2131 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = SceneTilePaint.method4500(var3, var4); // L: 2132 - return 1; // L: 2133 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2135 - class295.Interpreter_intStackSize -= 2; // L: 2136 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2137 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2138 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = HealthBarUpdate.ItemContainer_getCount(var3, var4); // L: 2139 - return 1; // L: 2140 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2142 - class295.Interpreter_intStackSize -= 2; // L: 2143 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2144 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2145 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Login.method1883(var3, var4); // L: 2146 - return 1; // L: 2147 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2149 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2150 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class12.getInvDefinition(var3).size; // L: 2151 - return 1; // L: 2152 - } else if (var0 == ScriptOpcodes.STAT) { // L: 2154 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2155 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2156 - return 1; // L: 2157 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2159 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2160 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2161 - return 1; // L: 2162 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2164 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2165 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2166 - return 1; // L: 2167 - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 2169 - var3 = class160.Client_plane; // L: 2170 - var4 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 2171 - var5 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 2172 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2173 - return 1; // L: 2174 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 2176 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2177 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2178 - return 1; // L: 2179 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2181 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2182 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2183 - return 1; // L: 2184 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 2186 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2187 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2188 - return 1; // L: 2189 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2191 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2192 - return 1; // L: 2193 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2195 - class295.Interpreter_intStackSize -= 2; // L: 2196 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] + 32768; // L: 2197 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2198 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = SceneTilePaint.method4500(var3, var4); // L: 2199 - return 1; // L: 2200 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2202 - class295.Interpreter_intStackSize -= 2; // L: 2203 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] + 32768; // L: 2204 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2205 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = HealthBarUpdate.ItemContainer_getCount(var3, var4); // L: 2206 - return 1; // L: 2207 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2209 - class295.Interpreter_intStackSize -= 2; // L: 2210 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] + 32768; // L: 2211 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2212 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Login.method1883(var3, var4); // L: 2213 - return 1; // L: 2214 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2216 - if (Client.staffModLevel >= 2) { // L: 2217 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2218 + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11941 + Widget var3 = var0[var2]; // L: 11942 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class1.isComponentHidden(var3))) { // L: 11943 11944 11945 + if (var3.type == 0) { // L: 11946 + if (!var3.isIf3 && class1.isComponentHidden(var3) && var3 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 11947 + continue; } - return 1; // L: 2219 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2221 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2222 - return 1; // L: 2223 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2225 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.worldId; // L: 2226 - return 1; // L: 2227 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2229 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2230 - return 1; // L: 2231 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2233 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.weight; // L: 2234 - return 1; // L: 2235 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2237 - if (Client.playerMod) { // L: 2238 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2239 + drawModelComponents(var0, var3.id); // L: 11948 + if (var3.children != null) { // L: 11949 + drawModelComponents(var3.children, var3.id); } - return 1; // L: 2240 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2242 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2243 - return 1; // L: 2244 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2246 - class295.Interpreter_intStackSize -= 4; // L: 2247 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2248 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2249 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2250 - int var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 2251 - var3 += var4 << 14; // L: 2252 - var3 += var5 << 28; // L: 2253 - var3 += var6; // L: 2254 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 2255 - return 1; // L: 2256 - } else if (var0 == 3326) { // L: 2258 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.field493; // L: 2259 - return 1; // L: 2260 - } else if (var0 == 3327) { // L: 2262 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.field494; // L: 2263 - return 1; // L: 2264 - } else { - return 2; // L: 2266 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11950 + if (var4 != null) { // L: 11951 + class115.method2680(var4.group); + } + } + + if (var3.type == 6) { // L: 11953 + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11954 + boolean var7 = Skills.runCs1(var3); // L: 11955 + if (var7) { // L: 11957 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11958 + } + + if (var5 != -1) { // L: 11959 + SequenceDefinition var6 = class163.SequenceDefinition_get(var5); // L: 11960 + + for (var3.modelFrameCycle += Client.field556; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class346.invalidateWidget(var3)) { // L: 11961 11962 11969 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11963 + ++var3.modelFrame; // L: 11964 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11965 + var3.modelFrame -= var6.frameCount; // L: 11966 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11967 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3392 != 0 && !var3.isIf3) { // L: 11973 + int var8 = var3.field3392 >> 16; // L: 11974 + var5 = var3.field3392 << 16 >> 16; // L: 11975 + var8 *= Client.field556; // L: 11976 + var5 *= Client.field556; // L: 11977 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11978 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11979 + class346.invalidateWidget(var3); // L: 11980 + } } } } - } - @ObfuscatedName("gb") + } // L: 11984 + + @ObfuscatedName("lm") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-53681616" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1036888479" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 4047 - byte var2 = 4; // L: 4048 - int var3 = var2 + 6; // L: 4049 - int var4 = var2 + 6; // L: 4050 - int var5 = ViewportMouse.fontPlain12.lineWidth(var0, 250); // L: 4051 - int var6 = ViewportMouse.fontPlain12.lineCount(var0, 250) * 13; // L: 4052 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 0); // L: 4053 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); // L: 4054 - ViewportMouse.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4055 - int var7 = var3 - var2; // L: 4056 - int var8 = var4 - var2; // L: 4057 - int var9 = var2 + var5 + var2; // L: 4058 - int var10 = var6 + var2 + var2; // L: 4059 + static void method2760(String var0) { + class65.field868 = var0; // L: 12501 - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4061 - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 4062 - Client.field564[var11] = true; - } - } - - if (var1) { // L: 4065 - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 4066 + try { + String var1 = class127.client.getParameter(Integer.toString(18)); // L: 12503 + String var2 = class127.client.getParameter(Integer.toString(13)); // L: 12504 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12505 + String var5; + if (var0.length() == 0) { // L: 12506 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - LoginScreenAnimation.method2240(var3, var4, var5, var6); // L: 4069 + String var4 = var3 + "; Expires="; // L: 12508 + long var6 = class136.method2931() + 94608000000L; // L: 12510 + Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 12512 + int var8 = Calendar.Calendar_calendar.get(7); // L: 12513 + int var9 = Calendar.Calendar_calendar.get(5); // L: 12514 + int var10 = Calendar.Calendar_calendar.get(2); // L: 12515 + int var11 = Calendar.Calendar_calendar.get(1); // L: 12516 + int var12 = Calendar.Calendar_calendar.get(11); // L: 12517 + int var13 = Calendar.Calendar_calendar.get(12); // L: 12518 + int var14 = Calendar.Calendar_calendar.get(13); // L: 12519 + var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 12520 + var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 12522 } + Client var16 = class127.client; // L: 12524 + var5 = "document.cookie=\"" + var3 + "\""; // L: 12525 + JSObject.getWindow(var16).eval(var5); // L: 12528 + } catch (Throwable var15) { // L: 12531 } - } // L: 4071 + + } // L: 12532 } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 02be8f70ac..3ab3bdbd63 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -6,28 +6,17 @@ import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; -@ObfuscatedName("c") +@ObfuscatedName("w") class class12 extends SSLSocket { - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = 596645521 - ) - static int field62; - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - static Widget field64; @ObfuscatedName("v") - Certificate[] field65; + Certificate[] field62; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ls;" + descriptor = "Lm;" ) final class15 this$0; // $FF: synthetic field @@ -36,109 +25,312 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Ls;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Lm;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { - this.this$0 = var1; // L: 88 + this.this$0 = var1; // L: 81 this.val$tlsClientProtocol = var2; this.val$host = var3; } - public OutputStream getOutputStream() throws IOException { - return this.val$tlsClientProtocol.getOutputStream(); // L: 98 + public InputStream getInputStream() throws IOException { + return this.val$tlsClientProtocol.getInputStream(); // L: 85 } - public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 107 + public OutputStream getOutputStream() throws IOException { + return this.val$tlsClientProtocol.getOutputStream(); // L: 89 + } + + public synchronized void close() throws IOException { + this.val$tlsClientProtocol.close(); // L: 93 + } // L: 94 + + public void startHandshake() throws IOException { + this.val$tlsClientProtocol.connect(new class13(this)); // L: 227 + } // L: 273 public String[] getEnabledCipherSuites() { - return null; // L: 116 + return null; // L: 103 } public String[] getEnabledProtocols() { - return null; // L: 121 + return null; // L: 107 } - public SSLSession getSession() { - return new class17(this); // L: 131 - } - - public String[] getSupportedProtocols() { - return null; // L: 241 - } - - public String[] getSupportedCipherSuites() { - return null; // L: 246 - } - - public boolean getUseClientMode() { - return false; // L: 251 - } - - public boolean getWantClientAuth() { - return false; // L: 256 - } - - public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 260 - - public void setEnableSessionCreation(boolean var1) { - } // L: 263 - - public void setWantClientAuth(boolean var1) { - } // L: 278 - - public boolean getEnableSessionCreation() { + public boolean getNeedClientAuth() { return false; // L: 111 } - public void setUseClientMode(boolean var1) { - } // L: 275 + public String[] getSupportedProtocols() { + return null; // L: 203 + } - public void setEnabledProtocols(String[] var1) { - } // L: 269 + public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 218 - public void startHandshake() throws IOException { - this.val$tlsClientProtocol.connect(new class13(this)); // L: 282 - } // L: 332 - - public synchronized void close() throws IOException { - this.val$tlsClientProtocol.close(); // L: 103 - } // L: 104 - - public void setNeedClientAuth(boolean var1) { - } // L: 272 + public void setEnableSessionCreation(boolean var1) { + } // L: 219 public void setEnabledCipherSuites(String[] var1) { - } // L: 266 + } // L: 220 - public boolean getNeedClientAuth() { - return false; // L: 126 + public void setEnabledProtocols(String[] var1) { + } // L: 221 + + public void setNeedClientAuth(boolean var1) { + } // L: 222 + + public void setWantClientAuth(boolean var1) { + } // L: 224 + + public SSLSession getSession() { + return new class17(this); // L: 115 } - public InputStream getInputStream() throws IOException { - return this.val$tlsClientProtocol.getInputStream(); // L: 93 + public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 96 + + public void setUseClientMode(boolean var1) { + } // L: 223 + + public boolean getUseClientMode() { + return false; // L: 211 } - @ObfuscatedName("o") + public boolean getWantClientAuth() { + return false; // L: 215 + } + + public String[] getSupportedCipherSuites() { + return null; // L: 207 + } + + public boolean getEnableSessionCreation() { + return false; // L: 99 + } + + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Lfd;", - garbageValue = "50" + descriptor = "(I)V", + garbageValue = "1760016998" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; + static void method157() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 300 + Login.currentLoginField = 1; // L: 301 } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 - var1 = new InvDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2)); + Login.currentLoginField = 0; // L: 304 + } + + } // L: 306 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "380597881" + ) + static final int method117(int var0, int var1) { + int var2 = var0 + var1 * 57; // L: 927 + var2 ^= var2 << 13; // L: 928 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 929 + return var3 >> 19 & 255; // L: 930 + } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1823604285" + ) + static final void method158(int var0, int var1) { + if (Client.hintArrowType == 2) { // L: 4843 + VarbitComposition.worldToScreen((Client.hintArrowX - GrandExchangeOfferOwnWorldComparator.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - VarcInt.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4844 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4845 + InvDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 } - } + } // L: 4846 + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(Lcy;IIII)V", + garbageValue = "402229020" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; // L: 10015 + if (Client.menuOptionsCount < 400) { // L: 10016 + if (var4.transforms != null) { // L: 10017 + var4 = var4.transform(); + } + + if (var4 != null) { // L: 10018 + if (var4.isInteractable) { // L: 10019 + if (!var4.isFollower || Client.followerIndex == var1) { // L: 10020 + String var5 = var4.name; // L: 10021 + int var6; + int var9; + if (var4.combatLevel != 0 && var0.field1182 != 0) { // L: 10022 + var6 = var0.field1182 != -1 ? var0.field1182 * -979480491 * -1781781251 : var4.combatLevel * -867920465 * 2112479567; // L: 10023 + var9 = GrandExchangeEvents.localPlayer.combatLevel; // L: 10026 + int var10 = var9 - var6; // L: 10028 + String var8; + if (var10 < -9) { // L: 10029 + var8 = UserComparator9.colorStartTag(16711680); // L: 10030 + } else if (var10 < -6) { // L: 10033 + var8 = UserComparator9.colorStartTag(16723968); // L: 10034 + } else if (var10 < -3) { // L: 10037 + var8 = UserComparator9.colorStartTag(16740352); // L: 10038 + } else if (var10 < 0) { // L: 10041 + var8 = UserComparator9.colorStartTag(16756736); // L: 10042 + } else if (var10 > 9) { // L: 10045 + var8 = UserComparator9.colorStartTag(65280); // L: 10046 + } else if (var10 > 6) { // L: 10049 + var8 = UserComparator9.colorStartTag(4259584); // L: 10050 + } else if (var10 > 3) { // L: 10053 + var8 = UserComparator9.colorStartTag(8453888); // L: 10054 + } else if (var10 > 0) { // L: 10057 + var8 = UserComparator9.colorStartTag(12648192); // L: 10058 + } else { + var8 = UserComparator9.colorStartTag(16776960); // L: 10061 + } + + var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 10063 + } + + if (var4.isFollower && Client.followerOpsLowPriority) { // L: 10065 + class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10066 + } + + if (Client.isItemSelected == 1) { // L: 10069 + class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 10070 + } else if (Client.isSpellSelected) { // L: 10073 + if ((class17.selectedSpellFlags & 2) == 2) { // L: 10074 + class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 10075 + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 10080 + String[] var7 = var4.actions; // L: 10081 + int var11; + if (var7 != null) { // L: 10082 + for (var11 = 4; var11 >= 0; --var11) { // L: 10083 + if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 10084 + var9 = 0; // L: 10085 + if (var11 == 0) { // L: 10086 + var9 = var6 + 9; + } + + if (var11 == 1) { // L: 10087 + var9 = var6 + 10; + } + + if (var11 == 2) { // L: 10088 + var9 = var6 + 11; + } + + if (var11 == 3) { // L: 10089 + var9 = var6 + 12; + } + + if (var11 == 4) { // L: 10090 + var9 = var6 + 13; + } + + class21.insertMenuItemNoShift(var7[var11], UserComparator9.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10091 + } + } + } + + if (var7 != null) { // L: 10096 + for (var11 = 4; var11 >= 0; --var11) { // L: 10097 + if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 10098 + short var12 = 0; // L: 10099 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 10100 + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > GrandExchangeEvents.localPlayer.combatLevel) { // L: 10101 + var12 = 2000; // L: 10102 + } + + var9 = 0; // L: 10104 + if (var11 == 0) { // L: 10105 + var9 = var12 + 9; + } + + if (var11 == 1) { // L: 10106 + var9 = var12 + 10; + } + + if (var11 == 2) { // L: 10107 + var9 = var12 + 11; + } + + if (var11 == 3) { // L: 10108 + var9 = var12 + 12; + } + + if (var11 == 4) { // L: 10109 + var9 = var12 + 13; + } + + class21.insertMenuItemNoShift(var7[var11], UserComparator9.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10110 + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 10115 + class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10116 + } + } + + } + } + } + } + } // L: 10120 + + @ObfuscatedName("lo") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "121" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 12535 + short[] var2 = new short[16]; // L: 12536 + int var3 = 0; // L: 12537 + + for (int var4 = 0; var4 < class293.ItemDefinition_fileCount; ++var4) { // L: 12538 + ItemComposition var9 = class19.ItemDefinition_get(var4); // L: 12539 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12540 12541 12542 + if (var3 >= 250) { // L: 12543 + Script.foundItemIdCount = -1; // L: 12544 + PendingSpawn.foundItemIds = null; // L: 12545 + return; // L: 12546 + } + + if (var3 >= var2.length) { // L: 12548 + short[] var6 = new short[var2.length * 2]; // L: 12549 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 12550 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 12551 + } + + var2[var3++] = (short)var4; // L: 12553 + } + } + + PendingSpawn.foundItemIds = var2; // L: 12555 + GameEngine.foundItemIndex = 0; // L: 12556 + Script.foundItemIdCount = var3; // L: 12557 + String[] var8 = new String[Script.foundItemIdCount]; // L: 12558 + + for (int var5 = 0; var5 < Script.foundItemIdCount; ++var5) { // L: 12559 + var8[var5] = class19.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = PendingSpawn.foundItemIds; // L: 12560 + class117.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 12562 + } // L: 12564 } diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java index ff76e3b6ef..2a5801f36a 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -1,72 +1,33 @@ +import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("du") public class class120 implements class112 { - @ObfuscatedName("ie") + @ObfuscatedName("c") + @Export("FileSystem_cacheDir") + static File FileSystem_cacheDir; + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "524916497" + descriptor = "Lcf;" ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 9060 - Widget var0 = class143.getWidgetChild(class92.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9061 - if (var0 != null && var0.onTargetLeave != null) { // L: 9062 - ScriptEvent var1 = new ScriptEvent(); // L: 9063 - var1.widget = var0; // L: 9064 - var1.args = var0.onTargetLeave; // L: 9065 - class1.runScriptEvent(var1); // L: 9066 - } + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; - Client.selectedSpellItemId = -1; // L: 9068 - Client.isSpellSelected = false; // L: 9069 - class290.invalidateWidget(var0); // L: 9070 - } - } // L: 9071 - - @ObfuscatedName("kr") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "2110046023" + descriptor = "(B)Lnq;", + garbageValue = "4" ) - static final void method2755(Widget var0) { - int var1 = var0.contentType; // L: 11449 - if (var1 == 324) { // L: 11450 - if (Client.field759 == -1) { // L: 11451 - Client.field759 = var0.spriteId2; // L: 11452 - Client.field738 = var0.spriteId; // L: 11453 - } - - if (Client.playerAppearance.isFemale) { // L: 11455 - var0.spriteId2 = Client.field759; + public static class386 method2761() { + synchronized(class386.field4344) { // L: 26 + if (class386.field4339 == 0) { // L: 27 + return new class386(); } else { - var0.spriteId2 = Client.field738; // L: 11456 + class386.field4344[--class386.field4339].method6985(); // L: 29 + return class386.field4344[class386.field4339]; // L: 30 } - - } else if (var1 == 325) { // L: 11459 - if (Client.field759 == -1) { // L: 11460 - Client.field759 = var0.spriteId2; // L: 11461 - Client.field738 = var0.spriteId; // L: 11462 - } - - if (Client.playerAppearance.isFemale) { // L: 11464 - var0.spriteId2 = Client.field738; - } else { - var0.spriteId2 = Client.field759; // L: 11465 - } - - } else if (var1 == 327) { // L: 11468 - var0.modelAngleX = 150; // L: 11469 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11470 - var0.modelType = 5; // L: 11471 - var0.modelId = 0; // L: 11472 - } else if (var1 == 328) { // L: 11475 - var0.modelAngleX = 150; // L: 11476 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11477 - var0.modelType = 5; // L: 11478 - var0.modelId = 1; // L: 11479 } - } // L: 11457 11466 11473 11480 11482 + } } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java deleted file mode 100644 index 73f4a46bba..0000000000 --- a/runescape-client/src/main/java/class121.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dx") -public class class121 { - @ObfuscatedName("er") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("gm") - @ObfuscatedGetter( - longValue = -2735509699185230757L - ) - static long field1479; - - @ObfuscatedName("u") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 81 - } -} diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index 6f43114862..1209b43bf6 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -3,294 +3,315 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("do") public class class122 extends DualNode { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lpd;" + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 756927065 ) - @Export("NetCache_reference") - static Buffer NetCache_reference; - @ObfuscatedName("y") + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lpe;" ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; + @Export("loginType") + static LoginType loginType; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 514562923 + intValue = -1723408099 ) - int field1486; - @ObfuscatedName("o") + int field1470; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[[Ldi;" + descriptor = "[[Ldt;" ) - public class117[][] field1480; - @ObfuscatedName("h") + public class117[][] field1474; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[[Ldi;" + descriptor = "[[Ldt;" ) - class117[][] field1490; - @ObfuscatedName("g") + class117[][] field1471; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1741171979 + intValue = 2014722717 ) - int field1483; - @ObfuscatedName("l") + int field1469; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -123796151 + intValue = -332212275 ) - int field1484; + int field1473; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lha;" ) - public Skeleton field1485; - @ObfuscatedName("d") + public Skeleton field1472; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1830571413 + intValue = 1571742799 ) - int field1482; - @ObfuscatedName("f") - boolean field1487; + int field1475; + @ObfuscatedName("l") + boolean field1476; @ObfuscatedSignature( - descriptor = "(Llq;Llq;IZ)V", + descriptor = "(Lln;Lln;IZ)V", garbageValue = "0" ) public class122(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1480 = null; // L: 14 - this.field1490 = null; // L: 15 - this.field1482 = 0; // L: 19 - this.field1486 = var3; // L: 23 - byte[] var5 = var1.takeFile(this.field1486 >> 16 & 65535, this.field1486 & 65535); // L: 24 + this.field1474 = null; // L: 14 + this.field1471 = null; // L: 15 + this.field1475 = 0; // L: 19 + this.field1470 = var3; // L: 23 + byte[] var5 = var1.takeFile(this.field1470 >> 16 & 65535, this.field1470 & 65535); // L: 24 Buffer var6 = new Buffer(var5); // L: 25 int var7 = var6.readUnsignedByte(); // L: 26 int var8 = var6.readUnsignedShort(); // L: 27 byte[] var9 = var2.getFile(var8, 0); // L: 30 - this.field1485 = new Skeleton(var8, var9); // L: 31 - this.method2758(var6, var7); // L: 32 + this.field1472 = new Skeleton(var8, var9); // L: 31 + this.method2780(var6, var7); // L: 32 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "-1270112984" + descriptor = "(Lpi;II)V", + garbageValue = "-1615717546" ) - void method2758(Buffer var1, int var2) { - this.field1483 = var1.readUnsignedShort(); // L: 36 - this.field1484 = var1.readUnsignedShort(); // L: 37 - this.field1482 = var1.readUnsignedByte(); // L: 38 + void method2780(Buffer var1, int var2) { + this.field1469 = var1.readUnsignedShort(); // L: 36 + this.field1473 = var1.readUnsignedShort(); // L: 37 + this.field1475 = var1.readUnsignedByte(); // L: 38 int var3 = var1.readUnsignedShort(); // L: 39 - this.field1490 = new class117[this.field1485.method4120().method4098()][]; // L: 40 - this.field1480 = new class117[this.field1485.method4119()][]; // L: 41 + this.field1471 = new class117[this.field1472.method4721().method4698()][]; // L: 40 + this.field1474 = new class117[this.field1472.method4720()][]; // L: 41 for (int var4 = 0; var4 < var3; ++var4) { // L: 42 - int var6 = var1.readUnsignedByte(); // L: 44 - class118[] var7 = new class118[]{class118.field1452, class118.field1444, class118.field1443, class118.field1446, class118.field1445, class118.field1448}; // L: 48 - class118 var8 = (class118)ChatChannel.findEnumerated(var7, var6); // L: 50 - if (var8 == null) { // L: 51 - var8 = class118.field1452; + class118 var5 = TriBool.method6838(var1.readUnsignedByte()); // L: 43 + int var6 = var1.readShortSmart(); // L: 44 + int var8 = var1.readUnsignedByte(); // L: 46 + class119 var9 = (class119)MusicPatchPcmStream.findEnumerated(GrandExchangeOfferTotalQuantityComparator.method5977(), var8); // L: 48 + if (var9 == null) { // L: 49 + var9 = class119.field1449; } - int var15 = var1.readShortSmart(); // L: 55 - int var10 = var1.readUnsignedByte(); // L: 57 - class119 var11 = (class119)ChatChannel.findEnumerated(AbstractWorldMapIcon.method5059(), var10); // L: 59 - if (var11 == null) { // L: 60 - var11 = class119.field1457; - } - - class117 var12 = new class117(); // L: 64 - var12.method2722(var1, var2); // L: 65 - int var13 = var8.method2727(); // L: 66 - class117[][] var14; - if (var8 == class118.field1444) { // L: 68 - var14 = this.field1490; // L: 69 + class117 var10 = new class117(); // L: 53 + var10.method2708(var1, var2); // L: 54 + int var11 = var5.method2739(); // L: 55 + class117[][] var12; + if (var5 == class118.field1430) { // L: 57 + var12 = this.field1471; // L: 58 } else { - var14 = this.field1480; // L: 72 + var12 = this.field1474; // L: 61 } - if (var14[var15] == null) { // L: 74 - var14[var15] = new class117[var13]; // L: 75 + if (var12[var6] == null) { // L: 63 + var12[var6] = new class117[var11]; // L: 64 } - var14[var15][var11.method2751()] = var12; // L: 77 - if (var8 == class118.field1445) { // L: 78 - this.field1487 = true; // L: 79 + var12[var6][var9.method2751()] = var10; // L: 66 + if (var5 == class118.field1434) { // L: 67 + this.field1476 = true; // L: 68 } } - } // L: 82 + } // L: 71 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1494944281" + descriptor = "(B)I", + garbageValue = "35" ) - int method2759() { - return this.field1483; // L: 85 + int method2764() { + return this.field1469; // L: 74 } - @ObfuscatedName("h") + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1732677053" + ) + int method2781() { + return this.field1473; // L: 78 + } + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(S)I", - garbageValue = "-18228" + garbageValue = "30516" ) - int method2767() { - return this.field1484; // L: 89 + public int method2766() { + return this.field1475; // L: 82 } - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1883189895" + descriptor = "(B)I", + garbageValue = "5" ) - public int method2783() { - return this.field1482; // L: 93 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1616413534" - ) - public int method2771() { - return this.method2767() - this.method2759(); // L: 97 + public int method2762() { + return this.method2781() - this.method2764(); // L: 86 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-2" + descriptor = "(I)Z", + garbageValue = "-1927278316" ) - public boolean method2784() { - return this.field1487; // L: 101 + public boolean method2768() { + return this.field1476; // L: 90 } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILdq;IIB)V", - garbageValue = "5" + descriptor = "(ILda;III)V", + garbageValue = "-1716818444" ) - public void method2763(int var1, class115 var2, int var3, int var4) { - class387 var5 = HealthBarDefinition.method3428(); // L: 105 - this.method2764(var5, var3, var2, var1); // L: 106 - this.method2766(var5, var3, var2, var1); // L: 107 - this.method2765(var5, var3, var2, var1); // L: 108 - var2.method2654(var5); // L: 109 - var5.method7095(); // L: 110 - } // L: 111 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnu;ILdq;II)V", - garbageValue = "-966244253" - ) - void method2764(class387 var1, int var2, class115 var3, int var4) { - float[] var5 = var3.method2658(this.field1482); // L: 114 - float var6 = var5[0]; // L: 115 - float var7 = var5[1]; // L: 116 - float var8 = var5[2]; // L: 117 - if (this.field1490[var2] != null) { // L: 118 - class117 var9 = this.field1490[var2][0]; // L: 119 - class117 var10 = this.field1490[var2][1]; // L: 120 - class117 var11 = this.field1490[var2][2]; // L: 121 - if (var9 != null) { // L: 122 - var6 = var9.method2700(var4); - } - - if (var10 != null) { // L: 123 - var7 = var10.method2700(var4); - } - - if (var11 != null) { // L: 124 - var8 = var11.method2700(var4); + public void method2796(int var1, class115 var2, int var3, int var4) { + class387 var5; + synchronized(class387.field4346) { // L: 96 + if (class387.field4347 == 0) { // L: 97 + var5 = new class387(); + } else { + class387.field4346[--class387.field4347].method7011(); // L: 99 + var5 = class387.field4346[class387.field4347]; // L: 100 } } - class386 var16 = KeyHandler.method378(); // L: 126 - var16.method7032(1.0F, 0.0F, 0.0F, var6); // L: 127 - class386 var14 = KeyHandler.method378(); // L: 128 - var14.method7032(0.0F, 1.0F, 0.0F, var7); // L: 129 - class386 var15 = KeyHandler.method378(); // L: 130 - var15.method7032(0.0F, 0.0F, 1.0F, var8); // L: 131 - class386 var12 = KeyHandler.method378(); // L: 132 - var12.method7036(var15); // L: 133 - var12.method7036(var16); // L: 134 - var12.method7036(var14); // L: 135 - class387 var13 = HealthBarDefinition.method3428(); // L: 136 - var13.method7069(var12); // L: 137 - var1.method7109(var13); // L: 138 - var16.method7043(); // L: 139 - var14.method7043(); // L: 140 - var15.method7043(); // L: 141 - var12.method7043(); // L: 142 - var13.method7095(); // L: 143 - } // L: 144 + this.method2763(var5, var3, var2, var1); // L: 105 + this.method2793(var5, var3, var2, var1); // L: 106 + this.method2771(var5, var3, var2, var1); // L: 107 + var2.method2676(var5); // L: 108 + var5.method7029(); // L: 109 + } // L: 110 - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnu;ILdq;II)V", - garbageValue = "-43276704" + descriptor = "(Lnt;ILda;II)V", + garbageValue = "-1176349802" ) - void method2765(class387 var1, int var2, class115 var3, int var4) { - float[] var5 = var3.method2652(this.field1482); // L: 147 - float var6 = var5[0]; // L: 148 - float var7 = var5[1]; // L: 149 - float var8 = var5[2]; // L: 150 - if (this.field1490[var2] != null) { // L: 151 - class117 var9 = this.field1490[var2][3]; // L: 152 - class117 var10 = this.field1490[var2][4]; // L: 153 - class117 var11 = this.field1490[var2][5]; // L: 154 - if (var9 != null) { // L: 155 - var6 = var9.method2700(var4); + void method2763(class387 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2672(this.field1475); // L: 113 + float var6 = var5[0]; // L: 114 + float var7 = var5[1]; // L: 115 + float var8 = var5[2]; // L: 116 + if (this.field1471[var2] != null) { // L: 117 + class117 var9 = this.field1471[var2][0]; // L: 118 + class117 var10 = this.field1471[var2][1]; // L: 119 + class117 var11 = this.field1471[var2][2]; // L: 120 + if (var9 != null) { // L: 121 + var6 = var9.method2709(var4); } - if (var10 != null) { // L: 156 - var7 = var10.method2700(var4); + if (var10 != null) { // L: 122 + var7 = var10.method2709(var4); } - if (var11 != null) { // L: 157 - var8 = var11.method2700(var4); + if (var11 != null) { // L: 123 + var8 = var11.method2709(var4); } } - var1.field4347[12] = var6; // L: 159 - var1.field4347[13] = var7; // L: 160 - var1.field4347[14] = var8; // L: 161 - } // L: 162 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lnu;ILdq;IB)V", - garbageValue = "-10" - ) - void method2766(class387 var1, int var2, class115 var3, int var4) { - float[] var5 = var3.method2687(this.field1482); // L: 165 - float var6 = var5[0]; // L: 166 - float var7 = var5[1]; // L: 167 - float var8 = var5[2]; // L: 168 - if (this.field1490[var2] != null) { // L: 169 - class117 var9 = this.field1490[var2][6]; // L: 170 - class117 var10 = this.field1490[var2][7]; // L: 171 - class117 var11 = this.field1490[var2][8]; // L: 172 - if (var9 != null) { // L: 173 - var6 = var9.method2700(var4); - } - - if (var10 != null) { // L: 174 - var7 = var10.method2700(var4); - } - - if (var11 != null) { // L: 175 - var8 = var11.method2700(var4); + class386 var17 = class120.method2761(); // L: 125 + var17.method6984(1.0F, 0.0F, 0.0F, var6); // L: 126 + class386 var18 = class120.method2761(); // L: 127 + var18.method6984(0.0F, 1.0F, 0.0F, var7); // L: 128 + class386 var19 = class120.method2761(); // L: 129 + var19.method6984(0.0F, 0.0F, 1.0F, var8); // L: 130 + class386 var12 = class120.method2761(); // L: 131 + var12.method6986(var19); // L: 132 + var12.method6986(var17); // L: 133 + var12.method6986(var18); // L: 134 + class387 var13; + synchronized(class387.field4346) { // L: 137 + if (class387.field4347 == 0) { // L: 138 + var13 = new class387(); + } else { + class387.field4346[--class387.field4347].method7011(); // L: 140 + var13 = class387.field4346[class387.field4347]; // L: 141 } } - class387 var12 = HealthBarDefinition.method3428(); // L: 177 - var12.method7066(var6, var7, var8); // L: 178 - var1.method7109(var12); // L: 179 - var12.method7095(); // L: 180 - } // L: 181 + var13.method7006(var12); // L: 146 + var1.method7017(var13); // L: 147 + var17.method6988(); // L: 148 + var18.method6988(); // L: 149 + var19.method6988(); // L: 150 + var12.method6988(); // L: 151 + var13.method7029(); // L: 152 + } // L: 153 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lnt;ILda;IB)V", + garbageValue = "-70" + ) + void method2771(class387 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2673(this.field1475); // L: 156 + float var6 = var5[0]; // L: 157 + float var7 = var5[1]; // L: 158 + float var8 = var5[2]; // L: 159 + if (this.field1471[var2] != null) { // L: 160 + class117 var9 = this.field1471[var2][3]; // L: 161 + class117 var10 = this.field1471[var2][4]; // L: 162 + class117 var11 = this.field1471[var2][5]; // L: 163 + if (var9 != null) { // L: 164 + var6 = var9.method2709(var4); + } + + if (var10 != null) { // L: 165 + var7 = var10.method2709(var4); + } + + if (var11 != null) { // L: 166 + var8 = var11.method2709(var4); + } + } + + var1.field4348[12] = var6; // L: 168 + var1.field4348[13] = var7; // L: 169 + var1.field4348[14] = var8; // L: 170 + } // L: 171 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnt;ILda;II)V", + garbageValue = "16711935" + ) + void method2793(class387 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2674(this.field1475); // L: 174 + float var6 = var5[0]; // L: 175 + float var7 = var5[1]; // L: 176 + float var8 = var5[2]; // L: 177 + if (this.field1471[var2] != null) { // L: 178 + class117 var9 = this.field1471[var2][6]; // L: 179 + class117 var10 = this.field1471[var2][7]; // L: 180 + class117 var11 = this.field1471[var2][8]; // L: 181 + if (var9 != null) { // L: 182 + var6 = var9.method2709(var4); + } + + if (var10 != null) { // L: 183 + var7 = var10.method2709(var4); + } + + if (var11 != null) { // L: 184 + var8 = var11.method2709(var4); + } + } + + class387 var14; + synchronized(class387.field4346) { // L: 188 + if (class387.field4347 == 0) { // L: 189 + var14 = new class387(); + } else { + class387.field4346[--class387.field4347].method7011(); // L: 191 + var14 = class387.field4346[class387.field4347]; // L: 192 + } + } + + var14.method7049(var6, var7, var8); // L: 197 + var1.method7017(var14); // L: 198 + var14.method7029(); // L: 199 + } // L: 200 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index 560e243317..71bf15e082 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -3,151 +3,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("dw") public enum class123 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldw;" ) - field1505(0, 0), - @ObfuscatedName("o") + field1483(0, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldw;" ) - field1494(1, 1), - @ObfuscatedName("h") + field1492(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldw;" ) - field1495(2, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - field1496(3, 3), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - field1497(4, 4), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - field1498(5, 5), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - field1493(6, 6), + field1486(2, 2), @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldw;" ) - field1500(7, 7), - @ObfuscatedName("u") + field1482(3, 3), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldw;" ) - field1501(8, 8); - - @ObfuscatedName("hi") - @Export("regions") - static int[] regions; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1756049989 + field1481(4, 4), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ldw;" ) - final int field1503; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1875451971 + field1484(5, 5), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ldw;" ) - final int field1499; - - class123(int var3, int var4) { - this.field1503 = var3; // L: 101 - this.field1499 = var4; // L: 102 - } // L: 103 + field1487(6, 6), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldw;" + ) + field1488(7, 7), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ldw;" + ) + field1489(8, 8); @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1942889575 + ) + final int field1490; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -315171815 + ) + final int field1491; + + class123(int var3, int var4) { + this.field1490 = var3; // L: 110 + this.field1491 = var4; // L: 111 + } // L: 112 + + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1499; // L: 106 + return this.field1491; // L: 115 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "-1526513264" + descriptor = "(II)Lfk;", + garbageValue = "2122696884" ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 - var1 = (byte)var0; - } else if (var0 == 8364) { // L: 13 - var1 = -128; - } else if (var0 == 8218) { // L: 14 - var1 = -126; - } else if (var0 == 402) { // L: 15 - var1 = -125; - } else if (var0 == 8222) { // L: 16 - var1 = -124; - } else if (var0 == 8230) { // L: 17 - var1 = -123; - } else if (var0 == 8224) { // L: 18 - var1 = -122; - } else if (var0 == 8225) { // L: 19 - var1 = -121; - } else if (var0 == 710) { // L: 20 - var1 = -120; - } else if (var0 == 8240) { // L: 21 - var1 = -119; - } else if (var0 == 352) { // L: 22 - var1 = -118; - } else if (var0 == 8249) { // L: 23 - var1 = -117; - } else if (var0 == 338) { // L: 24 - var1 = -116; - } else if (var0 == 381) { // L: 25 - var1 = -114; - } else if (var0 == 8216) { // L: 26 - var1 = -111; - } else if (var0 == 8217) { // L: 27 - var1 = -110; - } else if (var0 == 8220) { // L: 28 - var1 = -109; - } else if (var0 == 8221) { // L: 29 - var1 = -108; - } else if (var0 == 8226) { // L: 30 - var1 = -107; - } else if (var0 == 8211) { // L: 31 - var1 = -106; - } else if (var0 == 8212) { // L: 32 - var1 = -105; - } else if (var0 == 732) { // L: 33 - var1 = -104; - } else if (var0 == 8482) { // L: 34 - var1 = -103; - } else if (var0 == 353) { // L: 35 - var1 = -102; - } else if (var0 == 8250) { // L: 36 - var1 = -101; - } else if (var0 == 339) { // L: 37 - var1 = -100; - } else if (var0 == 382) { // L: 38 - var1 = -98; - } else if (var0 == 376) { // L: 39 - var1 = -97; + public static FloorUnderlayDefinition method2806(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; } else { - var1 = 63; // L: 40 - } + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 23 + var1 = new FloorUnderlayDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2), var0); + } - return var1; // L: 41 + var1.postDecode(); // L: 26 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 + } } } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index a1fbc9f6a7..f87432161a 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -3,85 +3,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dl") public enum class124 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Ldl;" ) - field1516(1, 0), - @ObfuscatedName("o") + field1501(4, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Ldl;" ) - field1509(0, 1), - @ObfuscatedName("h") + field1498(3, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Ldl;" ) - field1510(2, 2), - @ObfuscatedName("g") + field1495(1, 2), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Ldl;" ) - field1511(3, 3), - @ObfuscatedName("l") + field1496(2, 3), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Ldl;" ) - field1512(4, 4); + field1497(0, 4); - @ObfuscatedName("r") + @ObfuscatedName("od") @ObfuscatedGetter( - intValue = -2033789897 + intValue = -721615265 ) - static int field1520; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("fk") - @ObfuscatedGetter( - intValue = 619577713 - ) - static int field1514; - @ObfuscatedName("fy") - static String field1518; + @Export("widgetDragDuration") + static int widgetDragDuration; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1875124149 + intValue = -1424208167 ) - public final int field1513; - @ObfuscatedName("d") + public final int field1493; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 8908341 + intValue = 669074999 ) @Export("id") final int id; class124(int var3, int var4) { - this.field1513 = var3; // L: 17 + this.field1493 = var3; // L: 17 this.id = var4; // L: 18 } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Lgv;", - garbageValue = "2062143502" - ) - public static class193[] method2801() { - return new class193[]{class193.field2195, class193.field2193, class193.field2192, class193.field2191}; // L: 14 + return this.id; // L: 22 } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index 5f105bc4af..edd2def680 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -2,84 +2,71 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("dn") public class class125 extends class128 { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1820756907 + intValue = 1563450385 ) - int field1524; - @ObfuscatedName("o") + int field1505; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -797454973 + intValue = 166042901 ) - int field1521; - @ObfuscatedName("h") + int field1506; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1722236613 + intValue = 436886769 ) - int field1522; - @ObfuscatedName("g") + int field1504; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -377441011 + intValue = -647039723 ) - int field1523; + int field1503; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class125(class131 var1) { this.this$0 = var1; - this.field1524 = -1; // L: 158 + this.field1505 = -1; // L: 158 } // L: 163 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1524 = var1.readUnsignedShort(); // L: 166 - this.field1521 = var1.readInt(); // L: 167 - this.field1522 = var1.readUnsignedByte(); // L: 168 - this.field1523 = var1.readUnsignedByte(); // L: 169 + void vmethod3168(Buffer var1) { + this.field1505 = var1.readUnsignedShort(); // L: 166 + this.field1506 = var1.readInt(); // L: 167 + this.field1504 = var1.readUnsignedByte(); // L: 168 + this.field1503 = var1.readUnsignedByte(); // L: 169 } // L: 170 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2926(this.field1524, this.field1521, this.field1522, this.field1523); // L: 173 + void vmethod3162(ClanSettings var1) { + var1.method2967(this.field1505, this.field1506, this.field1504, this.field1503); // L: 173 } // L: 174 - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Laz;B)V", - garbageValue = "13" + descriptor = "(Lln;Lln;Lln;I)V", + garbageValue = "2079991679" ) - public static final void method2804(class47 var0) { - BuddyRankComparator.pcmPlayerProvider = var0; // L: 45 - } // L: 46 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1096360732" - ) - public static void method2803(boolean var0) { - if (var0 != HealthBar.ItemDefinition_inMembersWorld) { // L: 560 - ItemComposition.ItemDefinition_cached.clear(); // L: 562 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 563 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 564 - HealthBar.ItemDefinition_inMembersWorld = var0; // L: 566 - } - - } // L: 568 + public static void method2811(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + class11.SequenceDefinition_archive = var0; // L: 46 + SequenceDefinition.SequenceDefinition_animationsArchive = var1; // L: 47 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; // L: 48 + } // L: 49 } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index 90d8bb52d7..6dcbd5e14a 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -1,166 +1,68 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("db") public class class126 extends class128 { + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "[Lqq;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -3842845710666604635L + longValue = 5363365603419108439L ) - long field1526; - @ObfuscatedName("o") - String field1527; + long field1511; + @ObfuscatedName("c") + String field1508; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class126(class131 var1) { this.this$0 = var1; - this.field1526 = -1L; // L: 74 - this.field1527 = null; // L: 75 + this.field1511 = -1L; // L: 74 + this.field1508 = null; // L: 75 } // L: 77 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { + void vmethod3168(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 80 --var1.offset; // L: 81 - this.field1526 = var1.readLong(); // L: 82 + this.field1511 = var1.readLong(); // L: 82 } - this.field1527 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + this.field1508 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 } // L: 85 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2918(this.field1526, this.field1527, 0); // L: 88 + void vmethod3162(ClanSettings var1) { + var1.method2959(this.field1511, this.field1508, 0); // L: 88 } // L: 89 - @ObfuscatedName("v") + @ObfuscatedName("ku") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "82" + descriptor = "(II)V", + garbageValue = "1206801353" ) - public static String method2817(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 13 - char var4 = var0.charAt(var3); // L: 14 - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 - if (var4 == ' ') { // L: 16 - var2.append('+'); - } else { - byte var5 = class123.charToByteCp1252(var4); // L: 18 - var2.append('%'); // L: 19 - int var6 = var5 >> 4 & 15; // L: 20 - if (var6 >= 10) { // L: 21 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); // L: 22 - } - - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); // L: 25 - } - } - - return var2.toString(); // L: 28 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1862606861" - ) - public static void method2819() { - try { - if (class273.musicPlayerStatus == 1) { // L: 42 - int var0 = WorldMapEvent.midiPcmStream.method5369(); // L: 43 - if (var0 > 0 && WorldMapEvent.midiPcmStream.isReady()) { // L: 44 - var0 -= class273.pcmSampleLength; // L: 45 - if (var0 < 0) { // L: 46 - var0 = 0; - } - - WorldMapEvent.midiPcmStream.setPcmStreamVolume(var0); // L: 47 - return; // L: 48 - } - - WorldMapEvent.midiPcmStream.clear(); // L: 50 - WorldMapEvent.midiPcmStream.removeAll(); // L: 51 - if (class147.musicTrackArchive != null) { // L: 52 - class273.musicPlayerStatus = 2; - } else { - class273.musicPlayerStatus = 0; // L: 53 - } - - class273.musicTrack = null; // L: 54 - class273.soundCache = null; // L: 55 - } - } catch (Exception var2) { // L: 58 - var2.printStackTrace(); // L: 59 - WorldMapEvent.midiPcmStream.clear(); // L: 60 - class273.musicPlayerStatus = 0; // L: 61 - class273.musicTrack = null; // L: 62 - class273.soundCache = null; // L: 63 - class147.musicTrackArchive = null; // L: 64 - } - - } // L: 66 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "33" - ) - static final void method2820(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { // L: 177 - for (int var4 = 0; var4 < 8; ++var4) { // L: 178 - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { // L: 180 - for (var3 = 1; var3 < 8; ++var3) { // L: 181 - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { // L: 183 - for (var3 = 1; var3 < 8; ++var3) { // L: 184 - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } - - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 186 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 187 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 188 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } // L: 189 + static final void method2824(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 12031 + class131.clientPreferences.updateSoundEffectVolume(var0); // L: 12032 + } // L: 12033 } diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java index 871a0c4836..18422d6228 100644 --- a/runescape-client/src/main/java/class127.java +++ b/runescape-client/src/main/java/class127.java @@ -2,227 +2,235 @@ 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("db") +@ObfuscatedName("dh") public class class127 extends class128 { + @ObfuscatedName("as") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + static Client client; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1168568969 + intValue = 1073843279 ) - int field1531; + int field1518; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class127(class131 var1) { this.this$0 = var1; - this.field1531 = -1; // L: 114 - } // L: 116 + this.field1518 = -1; + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1531 = var1.readUnsignedShort(); // L: 119 + void vmethod3168(Buffer var1) { + this.field1518 = var1.readUnsignedShort(); } // L: 120 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2919(this.field1531); // L: 123 - } // L: 124 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-81" - ) - public static int method2831(int var0) { - return class400.field4389[var0 & 16383]; // L: 37 + void vmethod3162(ClanSettings var1) { + var1.method2960(this.field1518); // L: 123 } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;IIIIIII)V", - garbageValue = "1671310726" + descriptor = "(B)[Ljv;", + garbageValue = "-78" ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 192 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 193 + static LoginPacket[] method2836() { + return new LoginPacket[]{LoginPacket.field3137, LoginPacket.field3132, LoginPacket.field3134, LoginPacket.field3131, LoginPacket.field3133, LoginPacket.field3130}; // L: 22 + } - while (true) { - var7 = var0.readUnsignedByte(); // L: 195 - if (var7 == 0) { // L: 196 - if (var1 == 0) { // L: 197 - int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 198 - int var11 = var2 + var4 + 932731; // L: 201 - int var12 = var3 + var5 + 556238; // L: 202 - int var13 = UserComparator6.method2631(45365 + var11, 91923 + var12, 4) - 128 + (UserComparator6.method2631(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (UserComparator6.method2631(var11, var12, 1) - 128 >> 2); // L: 204 - var13 = (int)((double)var13 * 0.3D) + 35; // L: 205 - if (var13 < 10) { // L: 206 - var13 = 10; - } else if (var13 > 60) { // L: 207 - var13 = 60; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lky;", + garbageValue = "-1735575897" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 229 + int var2 = var0 & 65535; // L: 230 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 231 + boolean var3 = class155.loadInterface(var1); // L: 232 + if (!var3) { // L: 233 + return null; + } + } + + return Widget.Widget_interfaceComponents[var1][var2]; // L: 235 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([Lbb;II[I[IB)V", + garbageValue = "-21" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { // L: 81 + int var5 = var1 - 1; // L: 82 + int var6 = var2 + 1; // L: 83 + int var7 = (var2 + var1) / 2; // L: 84 + World var8 = var0[var7]; // L: 85 + var0[var7] = var0[var1]; // L: 86 + var0[var1] = var8; // L: 87 + + while (var5 < var6) { // L: 88 + boolean var9 = true; // L: 89 + + int var10; + int var11; + int var12; + do { + --var6; // L: 91 + + for (var10 = 0; var10 < 4; ++var10) { // L: 92 + if (var3[var10] == 2) { // L: 95 + var11 = var0[var6].index; // L: 96 + var12 = var8.index; // L: 97 + } else if (var3[var10] == 1) { // L: 99 + var11 = var0[var6].population; // L: 100 + var12 = var8.population; // L: 101 + if (var11 == -1 && var4[var10] == 1) { // L: 102 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 103 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 105 + var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 + } else { + var11 = var0[var6].id; // L: 110 + var12 = var8.id; // L: 111 } - var14[var3] = -var13 * 8; // L: 210 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 212 + if (var12 != var11) { // L: 113 + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 + var9 = false; // L: 119 + } + break; + } + + if (var10 == 3) { // L: 114 + var9 = false; + } } - break; + } while(var9); + + var9 = true; // L: 124 + + do { + ++var5; // L: 126 + + for (var10 = 0; var10 < 4; ++var10) { // L: 127 + if (var3[var10] == 2) { // L: 130 + var11 = var0[var5].index; // L: 131 + var12 = var8.index; // L: 132 + } else if (var3[var10] == 1) { // L: 134 + var11 = var0[var5].population; // L: 135 + var12 = var8.population; // L: 136 + if (var11 == -1 && var4[var10] == 1) { // L: 137 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 138 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 140 + var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 + } else { + var11 = var0[var5].id; // L: 145 + var12 = var8.id; // L: 146 + } + + if (var11 != var12) { // L: 148 + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 + var9 = false; // L: 154 + } + break; + } + + if (var10 == 3) { // L: 149 + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { // L: 159 + World var13 = var0[var5]; // L: 160 + var0[var5] = var0[var6]; // L: 161 + var0[var6] = var13; // L: 162 } + } - if (var7 == 1) { // L: 215 - int var8 = var0.readUnsignedByte(); // L: 216 - if (var8 == 1) { // L: 217 - var8 = 0; - } + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + } - if (var1 == 0) { // L: 218 - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 219 - } - break; - } + } // L: 168 - if (var7 <= 49) { // L: 222 - Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 223 - Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 224 - RunException.field4754[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 225 - } else if (var7 <= 81) { // L: 228 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 229 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "451726103" + ) + static int method2840(int var0, Script var1, boolean var2) { + Widget var3 = getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1449 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1450 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var3)); // L: 1451 + return 1; // L: 1452 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1454 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1461 + if (var3.dataText == null) { // L: 1462 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; } else { - Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 232 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1463 } + + return 1; // L: 1464 + } else { + return 2; // L: 1466 } } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 237 - if (var7 == 0) { // L: 238 - break; - } - - if (var7 == 1) { // L: 239 - var0.readUnsignedByte(); // L: 240 - break; - } - - if (var7 <= 49) { // L: 243 - var0.readUnsignedByte(); - } - } - } - - } // L: 246 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "0" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 1264 - Login.Login_response2 = "Enter your username/email & password."; // L: 1265 - Login.Login_response3 = ""; // L: 1266 - class150.method3089(2); // L: 1267 - if (var0) { // L: 1268 - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1270 - if (Interpreter.clientPreferences.method2273() != null) { // L: 1271 - Login.Login_username = Interpreter.clientPreferences.method2273(); // L: 1272 - Client.Login_isUsernameRemembered = true; // L: 1273 + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1455 + --var4; // L: 1456 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1457 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1458 } else { - Client.Login_isUsernameRemembered = false; // L: 1275 - } - } - - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1278 - Login.currentLoginField = 1; // L: 1279 - } else { - Login.currentLoginField = 0; // L: 1282 - } - - } // L: 1285 - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1828922441" - ) - static final void method2827(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 10074 - int var7 = var3 - var1; // L: 10075 - int var8 = var6 >= 0 ? var6 : -var6; // L: 10076 - int var9 = var7 >= 0 ? var7 : -var7; // L: 10077 - int var10 = var8; // L: 10078 - if (var8 < var9) { // L: 10079 - var10 = var9; - } - - if (var10 != 0) { // L: 10080 - int var11 = (var6 << 16) / var10; // L: 10081 - int var12 = (var7 << 16) / var10; // L: 10082 - if (var12 <= var11) { // L: 10083 - var11 = -var11; - } else { - var12 = -var12; // L: 10084 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; } - int var13 = var5 * var12 >> 17; // L: 10085 - int var14 = var5 * var12 + 1 >> 17; // L: 10086 - int var15 = var5 * var11 >> 17; // L: 10087 - int var16 = var5 * var11 + 1 >> 17; // L: 10088 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10089 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10090 - int var17 = var0 + var13; // L: 10091 - int var18 = var0 - var14; // L: 10092 - int var19 = var0 + var6 - var14; // L: 10093 - int var20 = var0 + var6 + var13; // L: 10094 - int var21 = var15 + var1; // L: 10095 - int var22 = var1 - var16; // L: 10096 - int var23 = var7 + var1 - var16; // L: 10097 - int var24 = var15 + var7 + var1; // L: 10098 - Rasterizer3D.method4024(var17, var18, var19); // L: 10099 - Rasterizer3D.method4007(var21, var22, var23, var17, var18, var19, var4); // L: 10100 - Rasterizer3D.method4024(var17, var19, var20); // L: 10101 - Rasterizer3D.method4007(var21, var23, var24, var17, var19, var20, var4); // L: 10102 + return 1; // L: 1459 } - } // L: 10103 + } - @ObfuscatedName("kt") + @ObfuscatedName("kx") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1923735470" + garbageValue = "799305208" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (MusicPatchNode2.loadInterface(var0)) { // L: 11277 - Widget[] var1 = EnumComposition.Widget_interfaceComponents[var0]; // L: 11278 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11279 - Widget var3 = var1[var2]; // L: 11280 - if (var3 != null) { // L: 11281 - var3.modelFrame = 0; // L: 11282 - var3.modelFrameCycle = 0; // L: 11283 - } - } - - } - } // L: 11285 + static final void method2830(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 12036 + class131.clientPreferences.method2244(var0); // L: 12037 + } // L: 12038 } diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java index ce787d8331..d8f1138f49 100644 --- a/runescape-client/src/main/java/class128.java +++ b/runescape-client/src/main/java/class128.java @@ -1,70 +1,824 @@ +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dq") public abstract class class128 extends Node { - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "[Lql;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("t") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("a") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; class128() { - } // L: 68 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - abstract void vmethod3107(Buffer var1); + abstract void vmethod3168(Buffer var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - abstract void vmethod3104(ClanSettings var1); + abstract void vmethod3162(ClanSettings var1); - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIZIZS)V", - garbageValue = "4005" + descriptor = "(Ljava/io/File;B)V", + garbageValue = "63" ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { // L: 177 - int var6 = (var0 + var1) / 2; // L: 178 - int var7 = var0; // L: 179 - World var8 = World.World_worlds[var6]; // L: 180 - World.World_worlds[var6] = World.World_worlds[var1]; // L: 181 - World.World_worlds[var1] = var8; // L: 182 + static void method2856(File var0) { + class120.FileSystem_cacheDir = var0; // L: 16 + if (!class120.FileSystem_cacheDir.exists()) { // L: 17 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 18 + } + } // L: 19 - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - if (class445.method8053(World.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 - World var10 = World.World_worlds[var9]; // L: 185 - World.World_worlds[var9] = World.World_worlds[var7]; // L: 186 - World.World_worlds[var7++] = var10; // L: 187 + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "-1938819519" + ) + static String method2853(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { // L: 67 + RunException var2 = (RunException)var0; // L: 68 + var1 = var2.message + " | "; // L: 69 + var0 = var2.throwable; // L: 70 + } else { + var1 = ""; // L: 72 + } + + StringWriter var12 = new StringWriter(); // L: 73 + PrintWriter var3 = new PrintWriter(var12); // L: 74 + var0.printStackTrace(var3); // L: 75 + var3.close(); // L: 76 + String var4 = var12.toString(); // L: 77 + BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78 + String var6 = var5.readLine(); // L: 79 + + while (true) { + while (true) { + String var7 = var5.readLine(); // L: 81 + if (var7 == null) { // L: 82 + var1 = var1 + "| " + var6; // L: 100 + return var1; // L: 101 + } + + int var8 = var7.indexOf(40); // L: 83 + int var9 = var7.indexOf(41, var8 + 1); // L: 84 + if (var8 >= 0 && var9 >= 0) { // L: 85 + String var10 = var7.substring(var8 + 1, var9); // L: 86 + int var11 = var10.indexOf(".java:"); // L: 87 + if (var11 >= 0) { // L: 88 + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89 + var1 = var1 + var10 + ' '; // L: 90 + continue; // L: 91 + } + + var7 = var7.substring(0, var8); // L: 93 + } + + var7 = var7.trim(); // L: 95 + var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96 + var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 + var1 = var1 + var7 + ' '; // L: 98 + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lmd;Lmd;Lmd;I)V", + garbageValue = "-461855642" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (InvDefinition.canvasWidth - 765) / 2; // L: 1185 + Login.loginBoxX = Login.xPadding + 202; // L: 1186 + HealthBarDefinition.loginBoxCenter = Login.loginBoxX + 180; // L: 1187 + byte var3; + int var4; + int var11; + int var12; + int var25; + int var26; + int var28; + int var29; + int var34; + int var40; + if (Login.worldSelectOpen) { // L: 1188 + int var46; + if (class393.worldSelectBackSprites == null) { // L: 1190 + Archive var41 = class145.archive8; // L: 1192 + var40 = var41.getGroupId("sl_back"); // L: 1194 + var46 = var41.getFileId(var40, ""); // L: 1195 + SpritePixels[] var47 = class429.method7568(var41, var40, var46); // L: 1196 + class393.worldSelectBackSprites = var47; // L: 1198 + } + + if (class400.worldSelectFlagSprites == null) { // L: 1200 + class400.worldSelectFlagSprites = class93.method2386(class145.archive8, "sl_flags", ""); + } + + if (class126.worldSelectArrows == null) { // L: 1201 + class126.worldSelectArrows = class93.method2386(class145.archive8, "sl_arrows", ""); + } + + if (TileItem.worldSelectStars == null) { // L: 1202 + TileItem.worldSelectStars = class93.method2386(class145.archive8, "sl_stars", ""); + } + + if (class54.worldSelectLeftSprite == null) { // L: 1203 + class54.worldSelectLeftSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(class145.archive8, "leftarrow", ""); + } + + if (AttackOption.worldSelectRightSprite == null) { // L: 1204 + AttackOption.worldSelectRightSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(class145.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1205 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1206 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1207 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1208 + if (TileItem.worldSelectStars != null) { // L: 1209 + TileItem.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1210 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1211 + TileItem.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1212 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1213 + } + + if (class126.worldSelectArrows != null) { // L: 1215 + var34 = Login.xPadding + 280; // L: 1216 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1217 + class126.worldSelectArrows[2].drawAt(var34, 4); + } else { + class126.worldSelectArrows[0].drawAt(var34, 4); // L: 1218 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1219 + class126.worldSelectArrows[3].drawAt(var34 + 15, 4); + } else { + class126.worldSelectArrows[1].drawAt(var34 + 15, 4); // L: 1220 + } + + var0.draw("World", var34 + 32, 17, 16777215, -1); // L: 1221 + var4 = Login.xPadding + 390; // L: 1222 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1223 + class126.worldSelectArrows[2].drawAt(var4, 4); + } else { + class126.worldSelectArrows[0].drawAt(var4, 4); // L: 1224 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1225 + class126.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + class126.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1226 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1227 + var40 = Login.xPadding + 500; // L: 1228 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1229 + class126.worldSelectArrows[2].drawAt(var40, 4); + } else { + class126.worldSelectArrows[0].drawAt(var40, 4); // L: 1230 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1231 + class126.worldSelectArrows[3].drawAt(var40 + 15, 4); + } else { + class126.worldSelectArrows[1].drawAt(var40 + 15, 4); // L: 1232 + } + + var0.draw("Location", var40 + 32, 17, 16777215, -1); // L: 1233 + var46 = Login.xPadding + 610; // L: 1234 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1235 + class126.worldSelectArrows[2].drawAt(var46, 4); + } else { + class126.worldSelectArrows[0].drawAt(var46, 4); // L: 1236 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1237 + class126.worldSelectArrows[3].drawAt(var46 + 15, 4); + } else { + class126.worldSelectArrows[1].drawAt(var46 + 15, 4); // L: 1238 + } + + var0.draw("Type", var46 + 32, 17, 16777215, -1); // L: 1239 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1241 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1242 + Login.hoveredWorldIndex = -1; // L: 1243 + if (class393.worldSelectBackSprites != null) { // L: 1244 + var3 = 88; // L: 1245 + byte var38 = 19; // L: 1246 + var40 = 765 / (var3 + 1) - 1; // L: 1247 + var46 = 480 / (var38 + 1); // L: 1248 + + do { + var25 = var46; // L: 1250 + var26 = var40; // L: 1251 + if (var46 * (var40 - 1) >= World.World_count) { // L: 1252 + --var40; + } + + if (var40 * (var46 - 1) >= World.World_count) { // L: 1253 + --var46; + } + + if (var40 * (var46 - 1) >= World.World_count) { // L: 1254 + --var46; + } + } while(var25 != var46 || var26 != var40); // L: 1255 + + var25 = (765 - var3 * var40) / (var40 + 1); // L: 1257 + if (var25 > 5) { // L: 1258 + var25 = 5; + } + + var26 = (480 - var46 * var38) / (var46 + 1); // L: 1259 + if (var26 > 5) { // L: 1260 + var26 = 5; + } + + var28 = (765 - var3 * var40 - var25 * (var40 - 1)) / 2; // L: 1261 + var29 = (480 - var46 * var38 - var26 * (var46 - 1)) / 2; // L: 1262 + var11 = (var46 + World.World_count - 1) / var46; // L: 1263 + Login.worldSelectPagesCount = var11 - var40; // L: 1264 + if (class54.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1265 + class54.worldSelectLeftSprite.drawAt(8, class321.canvasHeight / 2 - class54.worldSelectLeftSprite.subHeight / 2); // L: 1266 + } + + if (AttackOption.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1268 + AttackOption.worldSelectRightSprite.drawAt(InvDefinition.canvasWidth - AttackOption.worldSelectRightSprite.subWidth - 8, class321.canvasHeight / 2 - AttackOption.worldSelectRightSprite.subHeight / 2); // L: 1269 + } + + var12 = var29 + 23; // L: 1271 + int var37 = var28 + Login.xPadding; // L: 1272 + int var14 = 0; // L: 1273 + boolean var15 = false; // L: 1274 + int var16 = Login.worldSelectPage; // L: 1275 + + int var17; + for (var17 = var46 * var16; var17 < World.World_count && var16 - Login.worldSelectPage < var40; ++var17) { // L: 1276 1277 + World var18 = DevicePcmPlayerProvider.World_worlds[var17]; // L: 1280 + boolean var19 = true; // L: 1281 + String var20 = Integer.toString(var18.population); // L: 1282 + if (var18.population == -1) { // L: 1283 + var20 = "OFF"; // L: 1284 + var19 = false; // L: 1285 + } else if (var18.population > 1980) { // L: 1287 + var20 = "FULL"; // L: 1288 + var19 = false; // L: 1289 + } + + int var22 = 0; // L: 1292 + byte var21; + if (var18.isBeta()) { // L: 1293 + if (var18.isMembersOnly()) { // L: 1294 + var21 = 7; + } else { + var21 = 6; // L: 1295 + } + } else if (var18.isDeadman()) { // L: 1297 + var22 = 16711680; // L: 1298 + if (var18.isMembersOnly()) { // L: 1299 + var21 = 5; + } else { + var21 = 4; // L: 1300 + } + } else if (var18.method1642()) { // L: 1302 + if (var18.isMembersOnly()) { // L: 1303 + var21 = 9; + } else { + var21 = 8; // L: 1304 + } + } else if (var18.isPvp()) { // L: 1306 + if (var18.isMembersOnly()) { // L: 1307 + var21 = 3; + } else { + var21 = 2; // L: 1308 + } + } else if (var18.isMembersOnly()) { // L: 1311 + var21 = 1; + } else { + var21 = 0; // L: 1312 + } + + if (MouseHandler.MouseHandler_x >= var37 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var37 + var3 && MouseHandler.MouseHandler_y < var12 + var38 && var19) { // L: 1314 + Login.hoveredWorldIndex = var17; // L: 1315 + class393.worldSelectBackSprites[var21].drawTransOverlayAt(var37, var12, 128, 16777215); // L: 1316 + var15 = true; // L: 1317 + } else { + class393.worldSelectBackSprites[var21].drawAt(var37, var12); // L: 1319 + } + + if (class400.worldSelectFlagSprites != null) { // L: 1320 + class400.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var37 + 29, var12); + } + + var0.drawCentered(Integer.toString(var18.id), var37 + 15, var38 / 2 + var12 + 5, var22, -1); // L: 1321 + var1.drawCentered(var20, var37 + 60, var38 / 2 + var12 + 5, 268435455, -1); // L: 1322 + var12 = var12 + var38 + var26; // L: 1323 + ++var14; // L: 1324 + if (var14 >= var46) { + var12 = var29 + 23; // L: 1325 + var37 = var37 + var3 + var25; // L: 1326 + var14 = 0; // L: 1327 + ++var16; // L: 1328 + } + } + + if (var15) { // L: 1331 + var17 = var1.stringWidth(DevicePcmPlayerProvider.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1332 + int var32 = var1.ascent + 8; // L: 1333 + int var39 = MouseHandler.MouseHandler_y + 25; // L: 1334 + if (var39 + var32 > 480) { // L: 1335 + var39 = MouseHandler.MouseHandler_y - 25 - var32; // L: 1336 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var32, 16777120); // L: 1338 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var32, 0); // L: 1339 + var1.drawCentered(DevicePcmPlayerProvider.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var39 + var1.ascent + 4, 0, -1); // L: 1340 } } - World.World_worlds[var1] = World.World_worlds[var7]; // L: 191 - World.World_worlds[var7] = var8; // L: 192 - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 + FontName.rasterProvider.drawFull(0, 0); // L: 1343 + } else { + class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1347 + ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1348 + Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 1349 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1350 + var3 = 20; // L: 1351 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1352 + var4 = 253 - var3; // L: 1353 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1354 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1355 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1356 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1357 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1358 + } + + String var6; + String var7; + String var8; + String var9; + short var33; + short var35; + if (Client.gameState == 20) { // L: 1360 + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1361 + var33 = 201; // L: 1362 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1363 + var34 = var33 + 15; // L: 1364 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1365 + var34 += 15; // L: 1366 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1367 + var34 += 15; // L: 1368 + var34 += 7; // L: 1369 + if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1370 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var34, 16777215, 0); // L: 1371 + var35 = 200; // L: 1372 + if (class131.clientPreferences.method2317()) { // L: 1376 + var8 = Login.Login_username; // L: 1378 + var7 = class140.method3040('*', var8.length()); // L: 1380 + var6 = var7; // L: 1382 + } else { + var6 = Login.Login_username; // L: 1384 + } + + for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(0, var6.length() - 1)) { // L: 1387 1388 1389 + } + + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var34, 16777215, 0); // L: 1391 + var34 += 15; // L: 1392 + var8 = Login.Login_password; // L: 1394 + var7 = class140.method3040('*', var8.length()); // L: 1396 + + for (var9 = var7; var0.stringWidth(var9) > var35; var9 = var9.substring(1)) { // L: 1398 1399 1400 + } + + var0.draw("Password: " + var9, Login.loginBoxX + 180 - 108, var34, 16777215, 0); // L: 1402 + var34 += 15; // L: 1403 + } + } + + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1406 + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1407 + short var23; + if (Login.loginIndex == 0) { // L: 1408 + var33 = 251; // L: 1409 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1410 + var34 = var33 + 30; // L: 1411 + var4 = Login.loginBoxX + 180 - 80; // L: 1412 + var23 = 291; // L: 1413 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1414 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1415 + var4 = Login.loginBoxX + 180 + 80; // L: 1416 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1417 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1418 + } else if (Login.loginIndex == 1) { // L: 1420 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1421 + var33 = 236; // L: 1422 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1423 + var34 = var33 + 15; // L: 1424 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1425 + var34 += 15; // L: 1426 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1427 + var34 += 15; // L: 1428 + var4 = Login.loginBoxX + 180 - 80; // L: 1429 + var23 = 321; // L: 1430 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1431 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1432 + var4 = Login.loginBoxX + 180 + 80; // L: 1433 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1434 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1435 + } else if (Login.loginIndex == 2) { // L: 1437 + var33 = 201; // L: 1438 + var0.drawCentered(Login.Login_response1, HealthBarDefinition.loginBoxCenter, var33, 16776960, 0); // L: 1439 + var34 = var33 + 15; // L: 1440 + var0.drawCentered(Login.Login_response2, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1441 + var34 += 15; // L: 1442 + var0.drawCentered(Login.Login_response3, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1443 + var34 += 15; // L: 1444 + var34 += 7; // L: 1445 + var0.draw("Login: ", HealthBarDefinition.loginBoxCenter - 110, var34, 16777215, 0); // L: 1446 + var35 = 200; // L: 1447 + if (class131.clientPreferences.method2317()) { // L: 1451 + var8 = Login.Login_username; // L: 1453 + var7 = class140.method3040('*', var8.length()); // L: 1455 + var6 = var7; // L: 1457 + } else { + var6 = Login.Login_username; // L: 1459 + } + + for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(1)) { // L: 1462 1463 1464 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), HealthBarDefinition.loginBoxCenter - 70, var34, 16777215, 0); // L: 1466 + var34 += 15; // L: 1467 + var8 = Login.Login_password; // L: 1469 + var7 = class140.method3040('*', var8.length()); // L: 1471 + + for (var9 = var7; var0.stringWidth(var9) > var35; var9 = var9.substring(1)) { // L: 1473 1474 1475 + } + + var0.draw("Password: " + var9 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), HealthBarDefinition.loginBoxCenter - 108, var34, 16777215, 0); // L: 1477 + var34 += 15; // L: 1478 + var33 = 277; // L: 1479 + var29 = HealthBarDefinition.loginBoxCenter + -117; // L: 1480 + IndexedSprite var30 = class9.method73(Client.Login_isUsernameRemembered, Login.field909); // L: 1481 + var30.drawAt(var29, var33); // L: 1482 + var29 = var29 + var30.subWidth + 5; // L: 1483 + var1.draw("Remember username", var29, var33 + 13, 16776960, 0); // L: 1484 + var29 = HealthBarDefinition.loginBoxCenter + 24; // L: 1485 + var30 = class9.method73(class131.clientPreferences.method2317(), Login.field906); // L: 1486 + var30.drawAt(var29, var33); // L: 1487 + var29 = var29 + var30.subWidth + 5; // L: 1488 + var1.draw("Hide username", var29, var33 + 13, 16776960, 0); // L: 1489 + var34 = var33 + 15; // L: 1490 + var12 = HealthBarDefinition.loginBoxCenter - 80; // L: 1491 + short var13 = 321; // L: 1492 + Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1493 + var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); // L: 1494 + var12 = HealthBarDefinition.loginBoxCenter + 80; // L: 1495 + Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1496 + var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); // L: 1497 + var33 = 357; // L: 1498 + switch(Login.field895) { // L: 1499 + case 2: + class137.field1573 = "Having trouble logging in?"; // L: 1501 + break; + default: + class137.field1573 = "Can't login? Click here."; // L: 1504 + } + + class113.field1378 = new Bounds(HealthBarDefinition.loginBoxCenter, var33, var1.stringWidth(class137.field1573), 11); // L: 1507 + class260.field2892 = new Bounds(HealthBarDefinition.loginBoxCenter, var33, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1508 + var1.drawCentered(class137.field1573, HealthBarDefinition.loginBoxCenter, var33, 16777215, 0); // L: 1509 + } else if (Login.loginIndex == 3) { // L: 1511 + var33 = 201; // L: 1512 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1513 + var34 = var33 + 20; // L: 1514 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1515 + var34 += 15; // L: 1516 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1517 + var34 += 15; // L: 1518 + var4 = Login.loginBoxX + 180; // L: 1519 + var23 = 276; // L: 1520 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1521 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1522 + var4 = Login.loginBoxX + 180; // L: 1523 + var23 = 326; // L: 1524 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1525 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1526 + } else { + String var5; + if (Login.loginIndex == 4) { // L: 1528 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1529 + var33 = 236; // L: 1530 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1531 + var34 = var33 + 15; // L: 1532 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1533 + var34 += 15; // L: 1534 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1535 + var34 += 15; // L: 1536 + var5 = "PIN: "; // L: 1538 + var7 = HealthBar.otp; // L: 1540 + var6 = class140.method3040('*', var7.length()); // L: 1542 + var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var34, 16777215, 0); // L: 1544 + var34 -= 8; // L: 1545 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var34, 16776960, 0); // L: 1546 + var34 += 15; // L: 1547 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var34, 16776960, 0); // L: 1548 + var26 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1549 + var28 = var34 - var0.ascent; // L: 1550 + IndexedSprite var10; + if (Login.field907) { // L: 1552 + var10 = class54.options_buttons_2Sprite; // L: 1553 + } else { + var10 = WorldMapSection2.options_buttons_0Sprite; // L: 1556 + } + + var10.drawAt(var26, var28); // L: 1558 + var34 += 15; // L: 1559 + var11 = Login.loginBoxX + 180 - 80; // L: 1560 + short var36 = 321; // L: 1561 + Login.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); // L: 1562 + var0.drawCentered("Continue", var11, var36 + 5, 16777215, 0); // L: 1563 + var11 = Login.loginBoxX + 180 + 80; // L: 1564 + Login.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); // L: 1565 + var0.drawCentered("Cancel", var11, var36 + 5, 16777215, 0); // L: 1566 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var36 + 36, 255, 0); // L: 1567 + } else { + short var42; + if (Login.loginIndex == 5) { // L: 1569 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1570 + var33 = 221; // L: 1571 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1572 + var34 = var33 + 15; // L: 1573 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1574 + var34 += 15; // L: 1575 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1576 + var34 += 15; // L: 1577 + var34 += 14; // L: 1578 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var34, 16777215, 0); // L: 1579 + var35 = 174; // L: 1580 + if (class131.clientPreferences.method2317()) { // L: 1584 + var8 = Login.Login_username; // L: 1586 + var7 = class140.method3040('*', var8.length()); // L: 1588 + var6 = var7; // L: 1590 + } else { + var6 = Login.Login_username; // L: 1592 + } + + for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(1)) { // L: 1595 1596 1597 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var34, 16777215, 0); // L: 1599 + var34 += 15; // L: 1600 + var25 = Login.loginBoxX + 180 - 80; // L: 1601 + var42 = 321; // L: 1602 + Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1603 + var0.drawCentered("Recover", var25, var42 + 5, 16777215, 0); // L: 1604 + var25 = Login.loginBoxX + 180 + 80; // L: 1605 + Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1606 + var0.drawCentered("Back", var25, var42 + 5, 16777215, 0); // L: 1607 + var42 = 356; // L: 1608 + var1.drawCentered("Still having trouble logging in?", HealthBarDefinition.loginBoxCenter, var42, 268435455, 0); // L: 1609 + } else if (Login.loginIndex == 6) { // L: 1611 + var33 = 201; // L: 1612 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1613 + var34 = var33 + 15; // L: 1614 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1615 + var34 += 15; // L: 1616 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1617 + var34 += 15; // L: 1618 + var4 = Login.loginBoxX + 180; // L: 1619 + var23 = 321; // L: 1620 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1621 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1622 + } else if (Login.loginIndex == 7) { // L: 1624 + if (Client.field504 && !Client.onMobile) { // L: 1625 + var33 = 201; // L: 1626 + var0.drawCentered(Login.Login_response1, HealthBarDefinition.loginBoxCenter, var33, 16776960, 0); // L: 1627 + var34 = var33 + 15; // L: 1628 + var0.drawCentered(Login.Login_response2, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1629 + var34 += 15; // L: 1630 + var0.drawCentered(Login.Login_response3, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1631 + var4 = HealthBarDefinition.loginBoxCenter - 150; // L: 1632 + var34 += 10; // L: 1633 + + for (var40 = 0; var40 < 8; ++var40) { // L: 1634 + Login.titlebuttonSprite.method8054(var4, var34, 30, 40); // L: 1635 + boolean var27 = var40 == Login.field903 & Client.cycle % 40 < 20; // L: 1636 + var0.draw((Login.field904[var40] == null ? "" : Login.field904[var40]) + (var27 ? UserComparator9.colorStartTag(16776960) + "|" : ""), var4 + 10, var34 + 27, 16777215, 0); // L: 1637 + if (var40 != 1 && var40 != 3) { // L: 1638 + var4 += 35; // L: 1643 + } else { + var4 += 50; // L: 1639 + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var34 + 27, 16777215, 0); // L: 1640 + } + } + + var40 = HealthBarDefinition.loginBoxCenter - 80; // L: 1646 + short var44 = 321; // L: 1647 + Login.titlebuttonSprite.drawAt(var40 - 73, var44 - 20); // L: 1648 + var0.drawCentered("Submit", var40, var44 + 5, 16777215, 0); // L: 1649 + var40 = HealthBarDefinition.loginBoxCenter + 80; // L: 1650 + Login.titlebuttonSprite.drawAt(var40 - 73, var44 - 20); // L: 1651 + var0.drawCentered("Cancel", var40, var44 + 5, 16777215, 0); // L: 1652 + } else { + var33 = 216; // L: 1655 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1656 + var34 = var33 + 15; // L: 1657 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1658 + var34 += 15; // L: 1659 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1660 + var34 += 15; // L: 1661 + var4 = Login.loginBoxX + 180 - 80; // L: 1662 + var23 = 321; // L: 1663 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1664 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1665 + var4 = Login.loginBoxX + 180 + 80; // L: 1666 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1667 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1668 + } + } else if (Login.loginIndex == 8) { // L: 1671 + var33 = 216; // L: 1672 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1673 + var34 = var33 + 15; // L: 1674 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1675 + var34 += 15; // L: 1676 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1677 + var34 += 15; // L: 1678 + var4 = Login.loginBoxX + 180 - 80; // L: 1679 + var23 = 321; // L: 1680 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1681 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1682 + var4 = Login.loginBoxX + 180 + 80; // L: 1683 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1684 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1685 + } else if (Login.loginIndex == 9) { // L: 1687 + var33 = 221; // L: 1688 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1689 + var34 = var33 + 25; // L: 1690 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1691 + var34 += 25; // L: 1692 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1693 + var4 = Login.loginBoxX + 180; // L: 1694 + var23 = 311; // L: 1695 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1696 + var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1697 + } else if (Login.loginIndex == 10) { // L: 1699 + var34 = Login.loginBoxX + 180; // L: 1700 + var35 = 209; // L: 1701 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var35, 16776960, 0); // L: 1702 + var4 = var35 + 20; // L: 1703 + class296.field3496.drawAt(var34 - 109, var4); // L: 1704 + class259.field2887.drawAt(var34 - 48, var4 + 18); // L: 1705 + } else if (Login.loginIndex == 12) { // L: 1707 + var34 = HealthBarDefinition.loginBoxCenter; // L: 1708 + var35 = 216; // L: 1709 + var2.drawCentered("Before using this app, please read and accept our", var34, var35, 16777215, 0); // L: 1710 + var4 = var35 + 17; // L: 1711 + var2.drawCentered("terms of use, privacy policy, and end user licence", var34, var4, 16777215, 0); // L: 1712 + var4 += 17; // L: 1713 + var2.drawCentered("agreement (EULA).", var34, var4, 16777215, 0); // L: 1714 + var4 += 17; // L: 1715 + var2.drawCentered("By accepting, you agree to these documents.", var34, var4, 16777215, 0); // L: 1716 + var34 = HealthBarDefinition.loginBoxCenter - 80; // L: 1717 + var35 = 311; // L: 1718 + Login.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); // L: 1719 + var0.drawCentered("Accept", var34, var35 + 5, 16777215, 0); // L: 1720 + var34 = HealthBarDefinition.loginBoxCenter + 80; // L: 1721 + Login.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); // L: 1722 + var0.drawCentered("Decline", var34, var35 + 5, 16777215, 0); // L: 1723 + } else if (Login.loginIndex == 13) { // L: 1725 + var33 = 231; // L: 1726 + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var33, 16777215, 0); // L: 1727 + var34 = var33 + 20; // L: 1728 + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var34, 16777215, 0); // L: 1729 + var4 = Login.loginBoxX + 180; // L: 1730 + var33 = 311; // L: 1731 + Login.titlebuttonSprite.drawAt(var4 - 73, var33 - 20); // L: 1732 + var0.drawCentered("Back", var4, var33 + 5, 16777215, 0); // L: 1733 + } else if (Login.loginIndex == 14) { // L: 1735 + var33 = 201; // L: 1736 + String var24 = ""; // L: 1737 + var5 = ""; // L: 1738 + var6 = ""; // L: 1739 + switch(Login.field901) { // L: 1740 + case 0: + var24 = "Your account has been disabled."; // L: 1755 + var5 = Strings.field3645; // L: 1756 + var6 = ""; // L: 1757 + break; + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1748 + var5 = Strings.field3684; // L: 1749 + var6 = ""; // L: 1750 + break; // L: 1751 + default: + Messages.Login_promptCredentials(false); // L: 1743 + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1761 + var34 = var33 + 15; // L: 1762 + var2.drawCentered(var5, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1763 + var34 += 15; // L: 1764 + var2.drawCentered(var6, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1765 + var34 += 15; // L: 1766 + var25 = Login.loginBoxX + 180; // L: 1767 + var42 = 276; // L: 1768 + Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1769 + var0.drawCentered("Support Page", var25, var42 + 5, 16777215, 0); // L: 1770 + var25 = Login.loginBoxX + 180; // L: 1771 + var42 = 326; // L: 1772 + Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1773 + var0.drawCentered("Back", var25, var42 + 5, 16777215, 0); // L: 1774 + } else if (Login.loginIndex == 24) { // L: 1776 + var33 = 221; // L: 1777 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1778 + var34 = var33 + 15; // L: 1779 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1780 + var34 += 15; // L: 1781 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1782 + var34 += 15; // L: 1783 + var4 = Login.loginBoxX + 180; // L: 1784 + var23 = 301; // L: 1785 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1786 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1787 + } + } + } + } + + if (Client.gameState >= 10) { // L: 1790 + int[] var31 = new int[4]; // L: 1791 + Rasterizer2D.Rasterizer2D_getClipArray(var31); // L: 1792 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class321.canvasHeight); // L: 1793 + class341.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1794 + class341.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1795 + Rasterizer2D.Rasterizer2D_setClipArray(var31); // L: 1796 + } + + class92.title_muteSprite[class131.clientPreferences.method2279() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1798 + if (Client.gameState > 5 && Language.Language_EN == Skills.clientLanguage) { // L: 1799 + if (class135.field1569 != null) { // L: 1800 + var34 = Login.xPadding + 5; // L: 1801 + var35 = 463; // L: 1802 + byte var43 = 100; // L: 1803 + byte var45 = 35; // L: 1804 + class135.field1569.drawAt(var34, var35); // L: 1805 + var0.drawCentered("World" + " " + Client.worldId, var43 / 2 + var34, var45 / 2 + var35 - 2, 16777215, 0); // L: 1806 + if (class293.World_request != null) { // L: 1807 + var1.drawCentered("Loading...", var43 / 2 + var34, var45 / 2 + var35 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var43 / 2 + var34, var45 / 2 + var35 + 12, 16777215, 0); // L: 1808 + } + } else { + class135.field1569 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(class145.archive8, "sl_button", ""); // L: 1811 + } + } + + } + } // L: 1345 1814 + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1863745488" + ) + static final void method2854() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4830 4831 4838 + if (var0.plane == class18.Client_plane && !var0.isFinished) { // L: 4832 + if (Client.cycle >= var0.cycleStart) { // L: 4833 + var0.advance(Client.field556); // L: 4834 + if (var0.isFinished) { // L: 4835 + var0.remove(); + } else { + ArchiveLoader.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4836 + } + } + } else { + var0.remove(); + } } - } // L: 196 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1787354339" - ) - static void method2841(int var0) { - class150.method3089(14); // L: 2073 - Login.field892 = var0; // L: 2074 - } // L: 2075 + } // L: 4840 } diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java index 616bbeb6cd..2dda0a604d 100644 --- a/runescape-client/src/main/java/class129.java +++ b/runescape-client/src/main/java/class129.java @@ -2,78 +2,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("dy") public class class129 extends class128 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Leh;" - ) - static ClanSettings field1535; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -312799529 + intValue = 1742059043 ) - int field1536; - @ObfuscatedName("o") - boolean field1534; + int field1526; + @ObfuscatedName("c") + boolean field1522; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class129(class131 var1) { this.this$0 = var1; - this.field1536 = -1; // L: 178 + this.field1526 = -1; // L: 178 } // L: 181 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1536 = var1.readUnsignedShort(); // L: 184 - this.field1534 = var1.readUnsignedByte() == 1; // L: 185 + void vmethod3168(Buffer var1) { + this.field1526 = var1.readUnsignedShort(); // L: 184 + this.field1522 = var1.readUnsignedByte() == 1; // L: 185 } // L: 186 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2925(this.field1536, this.field1534); // L: 189 + void vmethod3162(ClanSettings var1) { + var1.method3027(this.field1526, this.field1522); // L: 189 } // L: 190 - @ObfuscatedName("ly") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "76298290" + descriptor = "(CI)C", + garbageValue = "-1943199368" ) - static String method2849(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 11815 - if (Client.gameBuild == 1) { // L: 11816 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 11817 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 11818 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 11819 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 11820 - var0 = "local"; - } - - String var3 = ""; // L: 11821 - if (class429.field4593 != null) { // L: 11822 - var3 = "/p=" + class429.field4593; - } - - String var4 = "runescape.com"; // L: 11823 - return var2 + var0 + "." + var4 + "/l=" + FriendSystem.clientLanguage + "/a=" + class7.field27 + var3 + "/"; // L: 11824 + static char method2863(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 79 80 } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(Lky;IIIIIIB)V", + garbageValue = "-9" + ) + static final void method2861(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field570) { // L: 10855 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 10856 + } + + Client.field570 = false; // L: 10857 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10858 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10859 + var0.scrollY -= 4; // L: 10860 + class346.invalidateWidget(var0); // L: 10861 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10863 + var0.scrollY += 4; // L: 10864 + class346.invalidateWidget(var0); // L: 10865 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10867 + var7 = var3 * (var3 - 32) / var4; // L: 10868 + if (var7 < 8) { // L: 10869 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10870 + int var9 = var3 - 32 - var7; // L: 10871 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10872 + class346.invalidateWidget(var0); // L: 10873 + Client.field570 = true; // L: 10874 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 10877 + var7 = var0.width; // L: 10878 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10879 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10880 + class346.invalidateWidget(var0); // L: 10881 + } + } + + } // L: 10884 } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index d466fff59c..f12f81f52f 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -8,86 +8,113 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.DefaultTlsClient; import org.bouncycastle.crypto.tls.TlsAuthentication; -@ObfuscatedName("j") +@ObfuscatedName("k") class class13 extends DefaultTlsClient { + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + @Export("fontPlain12") + static Font fontPlain12; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lc;" + descriptor = "Lw;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lc;)V" + descriptor = "(Lw;)V" ) class13(class12 var1) { - this.this$1 = var1; // L: 282 + this.this$1 = var1; // L: 227 } public Hashtable getClientExtensions() throws IOException { - Hashtable var1 = super.getClientExtensions(); // L: 285 - if (var1 == null) { // L: 286 - var1 = new Hashtable(); // L: 287 + Hashtable var1 = super.getClientExtensions(); // L: 229 + if (var1 == null) { // L: 230 + var1 = new Hashtable(); // L: 231 } - byte[] var2 = this.this$1.val$host.getBytes(); // L: 289 - ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 290 - DataOutputStream var4 = new DataOutputStream(var3); // L: 291 - var4.writeShort(var2.length + 3); // L: 292 - var4.writeByte(0); // L: 293 - var4.writeShort(var2.length); // L: 294 - var4.write(var2); // L: 295 - var4.close(); // L: 296 - var1.put(0, var3.toByteArray()); // L: 297 - return var1; // L: 298 + byte[] var2 = this.this$1.val$host.getBytes(); // L: 233 + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 234 + DataOutputStream var4 = new DataOutputStream(var3); // L: 235 + var4.writeShort(var2.length + 3); // L: 236 + var4.writeByte(0); // L: 237 + var4.writeShort(var2.length); // L: 238 + var4.write(var2); // L: 239 + var4.close(); // L: 240 + var1.put(0, var3.toByteArray()); // L: 241 + return var1; // L: 242 } public TlsAuthentication getAuthentication() throws IOException { - return new class11(this); // L: 303 + return new class11(this); // L: 246 } - @ObfuscatedName("la") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "1" + descriptor = "(IIII)V", + garbageValue = "-547008186" ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 11841 - short[] var2 = new short[16]; // L: 11842 - int var3 = 0; // L: 11843 - - for (int var4 = 0; var4 < ArchiveLoader.ItemDefinition_fileCount; ++var4) { // L: 11844 - ItemComposition var9 = class67.ItemDefinition_get(var4); // L: 11845 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11846 11847 11848 - if (var3 >= 250) { // L: 11849 - PendingSpawn.foundItemIdCount = -1; // L: 11850 - class14.foundItemIds = null; // L: 11851 - return; // L: 11852 - } - - if (var3 >= var2.length) { // L: 11854 - short[] var6 = new short[var2.length * 2]; // L: 11855 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 11856 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 11857 - } - - var2[var3++] = (short)var4; // L: 11859 + static final void method163(int var0, int var1, int var2) { + if (WorldMapLabelSize.cameraX < var0) { // L: 3729 + WorldMapLabelSize.cameraX = (var0 - WorldMapLabelSize.cameraX) * ArchiveDisk.field4309 / 1000 + WorldMapLabelSize.cameraX + Script.field955; // L: 3730 + if (WorldMapLabelSize.cameraX > var0) { // L: 3731 + WorldMapLabelSize.cameraX = var0; } } - class14.foundItemIds = var2; // L: 11861 - MouseRecorder.foundItemIndex = 0; // L: 11862 - PendingSpawn.foundItemIdCount = var3; // L: 11863 - String[] var8 = new String[PendingSpawn.foundItemIdCount]; // L: 11864 - - for (int var5 = 0; var5 < PendingSpawn.foundItemIdCount; ++var5) { // L: 11865 - var8[var5] = class67.ItemDefinition_get(var2[var5]).name; + if (WorldMapLabelSize.cameraX > var0) { // L: 3733 + WorldMapLabelSize.cameraX -= (WorldMapLabelSize.cameraX - var0) * ArchiveDisk.field4309 / 1000 + Script.field955; // L: 3734 + if (WorldMapLabelSize.cameraX < var0) { // L: 3735 + WorldMapLabelSize.cameraX = var0; + } } - class193.method3880(var8, class14.foundItemIds); // L: 11866 - } // L: 11867 + if (ItemContainer.cameraY < var1) { // L: 3737 + ItemContainer.cameraY = (var1 - ItemContainer.cameraY) * ArchiveDisk.field4309 / 1000 + ItemContainer.cameraY + Script.field955; // L: 3738 + if (ItemContainer.cameraY > var1) { // L: 3739 + ItemContainer.cameraY = var1; + } + } + + if (ItemContainer.cameraY > var1) { // L: 3741 + ItemContainer.cameraY -= (ItemContainer.cameraY - var1) * ArchiveDisk.field4309 / 1000 + Script.field955; // L: 3742 + if (ItemContainer.cameraY < var1) { // L: 3743 + ItemContainer.cameraY = var1; + } + } + + if (class154.cameraZ < var2) { // L: 3745 + class154.cameraZ = (var2 - class154.cameraZ) * ArchiveDisk.field4309 / 1000 + class154.cameraZ + Script.field955; // L: 3746 + if (class154.cameraZ > var2) { // L: 3747 + class154.cameraZ = var2; + } + } + + if (class154.cameraZ > var2) { // L: 3749 + class154.cameraZ -= (class154.cameraZ - var2) * ArchiveDisk.field4309 / 1000 + Script.field955; // L: 3750 + if (class154.cameraZ < var2) { // L: 3751 + class154.cameraZ = var2; + } + } + + } // L: 3753 + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "109" + ) + static int method164(int var0, int var1) { + int var2 = var1 - 334; // L: 5445 + if (var2 < 0) { // L: 5446 + var2 = 0; + } else if (var2 > 100) { // L: 5447 + var2 = 100; + } + + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5448 + return var0 * var3 / 256; // L: 5449 + } } diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java index 5962f5a4ce..0c4da5a8a9 100644 --- a/runescape-client/src/main/java/class131.java +++ b/runescape-client/src/main/java/class131.java @@ -1,42 +1,49 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("es") public class class131 { + @ObfuscatedName("uh") + @ObfuscatedSignature( + descriptor = "Lca;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 6041252942062073189L + longValue = -5200207434161239507L ) - long field1543; - @ObfuscatedName("o") + long field1539; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -13457487 + intValue = 1578407985 ) - int field1542; - @ObfuscatedName("h") + int field1535; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llk;" ) - IterableNodeDeque field1548; + IterableNodeDeque field1536; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) public class131(Buffer var1) { - this.field1542 = -1; // L: 9 - this.field1548 = new IterableNodeDeque(); // L: 10 - this.method2854(var1); // L: 28 + this.field1535 = -1; // L: 9 + this.field1536 = new IterableNodeDeque(); // L: 10 + this.method2872(var1); // L: 28 } // L: 29 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "71" + descriptor = "(Lpi;I)V", + garbageValue = "-2070939911" ) - void method2854(Buffer var1) { - this.field1543 = var1.readLong(); // L: 32 - this.field1542 = var1.readInt(); // L: 33 + void method2872(Buffer var1) { + this.field1539 = var1.readLong(); // L: 32 + this.field1535 = var1.readInt(); // L: 33 for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 Object var3; @@ -48,8 +55,8 @@ public class class131 { var3 = new class143(this); } else if (var2 == 4) { // L: 40 var3 = new class135(this); - } else if (var2 == 6) { // L: 41 - var3 = new class142(this); + } else if (var2 == 6) { + var3 = new class142(this); // L: 41 } else if (var2 == 5) { // L: 42 var3 = new class127(this); } else if (var2 == 2) { // L: 43 @@ -62,8 +69,8 @@ public class class131 { var3 = new class146(this); } else if (var2 == 9) { // L: 47 var3 = new class152(this); - } else if (var2 == 10) { - var3 = new class138(this); // L: 48 + } else if (var2 == 10) { // L: 48 + var3 = new class138(this); } else if (var2 == 11) { // L: 49 var3 = new class133(this); } else if (var2 == 12) { // L: 50 @@ -76,26 +83,89 @@ public class class131 { var3 = new class147(this); } - ((class128)var3).vmethod3107(var1); // L: 53 - this.field1548.addFirst((Node)var3); // L: 54 + ((class128)var3).vmethod3168(var1); // L: 53 + this.field1536.addFirst((Node)var3); // L: 54 } } // L: 57 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "290065842" + descriptor = "(Lex;I)V", + garbageValue = "-1644962091" ) - public void method2851(ClanSettings var1) { - if (this.field1543 == var1.field1607 && this.field1542 == var1.field1598) { // L: 60 - for (class128 var2 = (class128)this.field1548.last(); var2 != null; var2 = (class128)this.field1548.previous()) { // L: 61 - var2.vmethod3104(var1); // L: 62 + public void method2873(ClanSettings var1) { + if (this.field1539 == var1.field1586 && this.field1535 == var1.field1583) { // L: 60 + for (class128 var2 = (class128)this.field1536.last(); var2 != null; var2 = (class128)this.field1536.previous()) { // L: 61 + var2.vmethod3162(var1); // L: 62 } - ++var1.field1598; // L: 64 + ++var1.field1583; // L: 64 } else { throw new RuntimeException(""); } } // L: 65 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-583434867" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 146 + } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1041289778" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field601 = 0L; // L: 4263 + if (var0 >= 2) { // L: 4264 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 4265 + } + + if (Client.getWindowedMode() == 1) { // L: 4266 + class127.client.setMaxCanvasSize(765, 503); // L: 4267 + } else { + class127.client.setMaxCanvasSize(7680, 2160); // L: 4270 + } + + if (Client.gameState >= 25) { // L: 4272 + class4.method17(); + } + + } // L: 4273 + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "1296688270" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (class155.loadInterface(var0)) { // L: 10214 + class307.field3585 = null; // L: 10221 + class268.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10222 + if (class307.field3585 != null) { // L: 10223 + class268.drawInterface(class307.field3585, -1412584499, var1, var2, var3, var4, class93.field1252, ItemContainer.field1013, var7); // L: 10224 + class307.field3585 = null; // L: 10225 + } + + } else { + if (var7 != -1) { // L: 10215 + Client.field715[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 10217 + Client.field715[var8] = true; + } + } + + } + } // L: 10219 10227 } diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java index 763c4876e4..de38f89532 100644 --- a/runescape-client/src/main/java/class132.java +++ b/runescape-client/src/main/java/class132.java @@ -1,814 +1,155 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("el") public class class132 extends class128 { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1243159201 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("ex") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive9") - static Archive archive9; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 822748601 + intValue = -516096679 ) - int field1552; - @ObfuscatedName("o") - byte field1553; + int field1543; + @ObfuscatedName("c") + byte field1544; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class132(class131 var1) { this.this$0 = var1; - this.field1552 = -1; // L: 128 + this.field1543 = -1; // L: 128 } // L: 131 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1552 = var1.readUnsignedShort(); // L: 134 - this.field1553 = var1.readByte(); // L: 135 + void vmethod3168(Buffer var1) { + this.field1543 = var1.readUnsignedShort(); // L: 134 + this.field1544 = var1.readByte(); // L: 135 } // L: 136 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" - ) - void vmethod3104(ClanSettings var1) { - var1.method2940(this.field1552, this.field1553); // L: 139 - } // L: 140 - @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmr;Lmr;Lmr;B)V", - garbageValue = "32" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (class4.canvasWidth - 765) / 2; // L: 1325 - Login.loginBoxX = Login.xPadding + 202; // L: 1326 - class134.loginBoxCenter = Login.loginBoxX + 180; // L: 1327 - if (Login.worldSelectOpen) { // L: 1328 - class346.method6482(var0, var1); // L: 1329 - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1332 - class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1333 - HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 1334 - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { // L: 1335 - byte var3 = 20; // L: 1336 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1337 - var4 = 253 - var3; // L: 1338 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1339 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1340 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1341 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1342 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1343 - } + void vmethod3162(ClanSettings var1) { + var1.method2964(this.field1543, this.field1544); // L: 139 + } // L: 140 - String var5; - String var7; - String var8; - int var9; - char[] var10; - int var11; - short var22; - int var23; - short var24; - if (Client.gameState == 20) { // L: 1345 - AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX + 180 - AbstractByteArrayCopier.titleboxSprite.subWidth / 2, 271 - AbstractByteArrayCopier.titleboxSprite.subHeight / 2); // L: 1346 - var22 = 201; // L: 1347 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1348 - var23 = var22 + 15; // L: 1349 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1350 - var23 += 15; // L: 1351 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1352 - var23 += 15; // L: 1353 - var23 += 7; // L: 1354 - if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1355 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 16777215, 0); // L: 1356 - var24 = 200; // L: 1357 - - for (var5 = class360.method6636(); var0.stringWidth(var5) > var24; var5 = var5.substring(0, var5.length() - 1)) { // L: 1358 1359 1360 - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var23, 16777215, 0); // L: 1362 - var23 += 15; // L: 1363 - var7 = Login.Login_password; // L: 1365 - var9 = var7.length(); // L: 1368 - var10 = new char[var9]; // L: 1370 - - for (var11 = 0; var11 < var9; ++var11) { // L: 1371 - var10[var11] = '*'; - } - - var8 = new String(var10); // L: 1372 - - for (var8 = var8; var0.stringWidth(var8) > var24; var8 = var8.substring(1)) { // L: 1376 1377 1378 - } - - var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1380 - var23 += 15; // L: 1381 - } - } - - if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1384 - AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1385 - short var13; - if (Login.loginIndex == 0) { // L: 1386 - var22 = 251; // L: 1387 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1388 - var23 = var22 + 30; // L: 1389 - var4 = Login.loginBoxX + 180 - 80; // L: 1390 - var13 = 291; // L: 1391 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1392 - var0.drawLines("New User", var4 - 73, var13 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1393 - var4 = Login.loginBoxX + 180 + 80; // L: 1394 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1395 - var0.drawLines("Existing User", var4 - 73, var13 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1396 - } else if (Login.loginIndex == 1) { // L: 1398 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1399 - var22 = 236; // L: 1400 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1401 - var23 = var22 + 15; // L: 1402 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1403 - var23 += 15; // L: 1404 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1405 - var23 += 15; // L: 1406 - var4 = Login.loginBoxX + 180 - 80; // L: 1407 - var13 = 321; // L: 1408 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1409 - var0.drawCentered("Continue", var4, var13 + 5, 16777215, 0); // L: 1410 - var4 = Login.loginBoxX + 180 + 80; // L: 1411 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1412 - var0.drawCentered("Cancel", var4, var13 + 5, 16777215, 0); // L: 1413 - } else { - short var12; - IndexedSprite var25; - if (Login.loginIndex == 2) { // L: 1415 - var22 = 201; // L: 1416 - var0.drawCentered(Login.Login_response1, class134.loginBoxCenter, var22, 16776960, 0); // L: 1417 - var23 = var22 + 15; // L: 1418 - var0.drawCentered(Login.Login_response2, class134.loginBoxCenter, var23, 16776960, 0); // L: 1419 - var23 += 15; // L: 1420 - var0.drawCentered(Login.Login_response3, class134.loginBoxCenter, var23, 16776960, 0); // L: 1421 - var23 += 15; // L: 1422 - var23 += 7; // L: 1423 - var0.draw("Login: ", class134.loginBoxCenter - 110, var23, 16777215, 0); // L: 1424 - var24 = 200; // L: 1425 - - for (var5 = class360.method6636(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { // L: 1426 1427 1428 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), class134.loginBoxCenter - 70, var23, 16777215, 0); // L: 1430 - var23 += 15; // L: 1431 - var7 = Login.Login_password; // L: 1433 - var9 = var7.length(); // L: 1436 - var10 = new char[var9]; // L: 1438 - - for (var11 = 0; var11 < var9; ++var11) { // L: 1439 - var10[var11] = '*'; - } - - var8 = new String(var10); // L: 1440 - - for (var8 = var8; var0.stringWidth(var8) > var24; var8 = var8.substring(1)) { // L: 1444 1445 1446 - } - - var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), class134.loginBoxCenter - 108, var23, 16777215, 0); // L: 1448 - var23 += 15; // L: 1449 - var22 = 277; // L: 1450 - var9 = class134.loginBoxCenter + -117; // L: 1451 - var25 = MouseHandler.method622(Client.Login_isUsernameRemembered, Login.field901); // L: 1452 - var25.drawAt(var9, var22); // L: 1453 - var9 = var9 + var25.subWidth + 5; // L: 1454 - var1.draw("Remember username", var9, var22 + 13, 16776960, 0); // L: 1455 - var9 = class134.loginBoxCenter + 24; // L: 1456 - var25 = MouseHandler.method622(Interpreter.clientPreferences.method2257(), Login.field902); // L: 1457 - var25.drawAt(var9, var22); // L: 1458 - var9 = var9 + var25.subWidth + 5; // L: 1459 - var1.draw("Hide username", var9, var22 + 13, 16776960, 0); // L: 1460 - var23 = var22 + 15; // L: 1461 - var11 = class134.loginBoxCenter - 80; // L: 1462 - var12 = 321; // L: 1463 - class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1464 - var0.drawCentered("Login", var11, var12 + 5, 16777215, 0); // L: 1465 - var11 = class134.loginBoxCenter + 80; // L: 1466 - class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1467 - var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1468 - var22 = 357; // L: 1469 - switch(Login.field897) { // L: 1470 - case 2: - class286.field3281 = "Having trouble logging in?"; // L: 1475 - break; - default: - class286.field3281 = "Can't login? Click here."; // L: 1472 - } - - DynamicObject.field973 = new Bounds(class134.loginBoxCenter, var22, var1.stringWidth(class286.field3281), 11); // L: 1478 - Projectile.field946 = new Bounds(class134.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1479 - var1.drawCentered(class286.field3281, class134.loginBoxCenter, var22, 16777215, 0); // L: 1480 - } else if (Login.loginIndex == 3) { // L: 1482 - var22 = 201; // L: 1483 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1484 - var23 = var22 + 20; // L: 1485 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1486 - var23 += 15; // L: 1487 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1488 - var23 += 15; // L: 1489 - var4 = Login.loginBoxX + 180; // L: 1490 - var13 = 276; // L: 1491 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1492 - var2.drawCentered("Try again", var4, var13 + 5, 16777215, 0); // L: 1493 - var4 = Login.loginBoxX + 180; // L: 1494 - var13 = 326; // L: 1495 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1496 - var2.drawCentered("Forgotten password?", var4, var13 + 5, 16777215, 0); // L: 1497 - } else if (Login.loginIndex == 4) { // L: 1499 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1500 - var22 = 236; // L: 1501 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1502 - var23 = var22 + 15; // L: 1503 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1504 - var23 += 15; // L: 1505 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1506 - var23 += 15; // L: 1507 - var5 = "PIN: "; // L: 1509 - var7 = class452.otp; // L: 1511 - var9 = var7.length(); // L: 1514 - var10 = new char[var9]; // L: 1516 - - for (var11 = 0; var11 < var9; ++var11) { // L: 1517 - var10[var11] = '*'; - } - - var8 = new String(var10); // L: 1518 - var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1522 - var23 -= 8; // L: 1523 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1524 - var23 += 15; // L: 1525 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1526 - int var16 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1527 - var9 = var23 - var0.ascent; // L: 1528 - if (Login.field903) { // L: 1530 - var25 = Skeleton.options_buttons_2Sprite; // L: 1531 - } else { - var25 = class160.options_buttons_0Sprite; // L: 1534 - } - - var25.drawAt(var16, var9); // L: 1536 - var23 += 15; // L: 1537 - var11 = Login.loginBoxX + 180 - 80; // L: 1538 - var12 = 321; // L: 1539 - class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1540 - var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); // L: 1541 - var11 = Login.loginBoxX + 180 + 80; // L: 1542 - class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1543 - var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1544 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var12 + 36, 255, 0); // L: 1545 - } else { - String var6; - int var15; - short var28; - if (Login.loginIndex == 5) { // L: 1547 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1548 - var22 = 221; // L: 1549 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1550 - var23 = var22 + 15; // L: 1551 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1552 - var23 += 15; // L: 1553 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1554 - var23 += 15; // L: 1555 - var23 += 14; // L: 1556 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 16777215, 0); // L: 1557 - var24 = 174; // L: 1558 - if (!Interpreter.clientPreferences.method2257()) { // L: 1562 - var6 = Login.Login_username; // L: 1577 - } else { - var8 = Login.Login_username; // L: 1564 - int var18 = var8.length(); // L: 1567 - char[] var19 = new char[var18]; // L: 1569 - - for (int var26 = 0; var26 < var18; ++var26) { // L: 1570 - var19[var26] = '*'; - } - - String var20 = new String(var19); // L: 1571 - var6 = var20; // L: 1575 - } - - for (var6 = var6; var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { // L: 1580 1581 1582 - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 16777215, 0); // L: 1584 - var23 += 15; // L: 1585 - var15 = Login.loginBoxX + 180 - 80; // L: 1586 - var28 = 321; // L: 1587 - class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1588 - var0.drawCentered("Recover", var15, var28 + 5, 16777215, 0); // L: 1589 - var15 = Login.loginBoxX + 180 + 80; // L: 1590 - class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1591 - var0.drawCentered("Back", var15, var28 + 5, 16777215, 0); // L: 1592 - var28 = 356; // L: 1593 - var1.drawCentered("Still having trouble logging in?", class134.loginBoxCenter, var28, 268435455, 0); // L: 1594 - } else if (Login.loginIndex == 6) { // L: 1596 - var22 = 201; // L: 1597 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1598 - var23 = var22 + 15; // L: 1599 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1600 - var23 += 15; // L: 1601 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1602 - var23 += 15; // L: 1603 - var4 = Login.loginBoxX + 180; // L: 1604 - var13 = 321; // L: 1605 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1606 - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); // L: 1607 - } else if (Login.loginIndex == 7) { // L: 1609 - if (class260.field2888 && !Client.onMobile) { // L: 1610 - var22 = 201; // L: 1611 - var0.drawCentered(Login.Login_response1, class134.loginBoxCenter, var22, 16776960, 0); // L: 1612 - var23 = var22 + 15; // L: 1613 - var0.drawCentered(Login.Login_response2, class134.loginBoxCenter, var23, 16776960, 0); // L: 1614 - var23 += 15; // L: 1615 - var0.drawCentered(Login.Login_response3, class134.loginBoxCenter, var23, 16776960, 0); // L: 1616 - var4 = class134.loginBoxCenter - 150; // L: 1617 - var23 += 10; // L: 1618 - - int var27; - for (var27 = 0; var27 < 8; ++var27) { // L: 1619 - class137.titlebuttonSprite.method8161(var4, var23, 30, 40); // L: 1620 - boolean var17 = var27 == Login.field899 & Client.cycle % 40 < 20; // L: 1621 - var0.draw((Login.field900[var27] == null ? "" : Login.field900[var27]) + (var17 ? ChatChannel.colorStartTag(16776960) + "|" : ""), var4 + 10, var23 + 27, 16777215, 0); // L: 1622 - if (var27 != 1 && var27 != 3) { // L: 1623 - var4 += 35; // L: 1628 - } else { - var4 += 50; // L: 1624 - var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var23 + 27, 16777215, 0); // L: 1625 - } - } - - var27 = class134.loginBoxCenter - 80; // L: 1631 - short var30 = 321; // L: 1632 - class137.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); // L: 1633 - var0.drawCentered("Submit", var27, var30 + 5, 16777215, 0); // L: 1634 - var27 = class134.loginBoxCenter + 80; // L: 1635 - class137.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); // L: 1636 - var0.drawCentered("Cancel", var27, var30 + 5, 16777215, 0); // L: 1637 - } else { - var22 = 216; // L: 1640 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1641 - var23 = var22 + 15; // L: 1642 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1643 - var23 += 15; // L: 1644 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1645 - var23 += 15; // L: 1646 - var4 = Login.loginBoxX + 180 - 80; // L: 1647 - var13 = 321; // L: 1648 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1649 - var0.drawCentered("Set Date of Birth", var4, var13 + 5, 16777215, 0); // L: 1650 - var4 = Login.loginBoxX + 180 + 80; // L: 1651 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1652 - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); // L: 1653 - } - } else if (Login.loginIndex == 8) { // L: 1656 - var22 = 216; // L: 1657 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1658 - var23 = var22 + 15; // L: 1659 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1660 - var23 += 15; // L: 1661 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1662 - var23 += 15; // L: 1663 - var4 = Login.loginBoxX + 180 - 80; // L: 1664 - var13 = 321; // L: 1665 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1666 - var0.drawCentered("Privacy Policy", var4, var13 + 5, 16777215, 0); // L: 1667 - var4 = Login.loginBoxX + 180 + 80; // L: 1668 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1669 - var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); // L: 1670 - } else if (Login.loginIndex == 9) { // L: 1672 - var22 = 221; // L: 1673 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1674 - var23 = var22 + 25; // L: 1675 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1676 - var23 += 25; // L: 1677 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1678 - var4 = Login.loginBoxX + 180; // L: 1679 - var13 = 311; // L: 1680 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1681 - var0.drawCentered("Try again", var4, var13 + 5, 16777215, 0); // L: 1682 - } else if (Login.loginIndex == 10) { // L: 1684 - var23 = Login.loginBoxX + 180; // L: 1685 - var24 = 209; // L: 1686 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1687 - var4 = var24 + 20; // L: 1688 - Login.field882.drawAt(var23 - 109, var4); // L: 1689 - Login.field913.drawAt(var23 - 48, var4 + 18); // L: 1690 - } else if (Login.loginIndex == 12) { // L: 1692 - var23 = class134.loginBoxCenter; // L: 1693 - var24 = 216; // L: 1694 - var2.drawCentered("Before using this app, please read and accept our", var23, var24, 16777215, 0); // L: 1695 - var4 = var24 + 17; // L: 1696 - var2.drawCentered("terms of use, privacy policy, and end user licence", var23, var4, 16777215, 0); // L: 1697 - var4 += 17; // L: 1698 - var2.drawCentered("agreement (EULA).", var23, var4, 16777215, 0); // L: 1699 - var4 += 17; // L: 1700 - var2.drawCentered("By accepting, you agree to these documents.", var23, var4, 16777215, 0); // L: 1701 - var23 = class134.loginBoxCenter - 80; // L: 1702 - var24 = 311; // L: 1703 - class137.titlebuttonSprite.drawAt(var23 - 73, var24 - 20); // L: 1704 - var0.drawCentered("Accept", var23, var24 + 5, 16777215, 0); // L: 1705 - var23 = class134.loginBoxCenter + 80; // L: 1706 - class137.titlebuttonSprite.drawAt(var23 - 73, var24 - 20); // L: 1707 - var0.drawCentered("Decline", var23, var24 + 5, 16777215, 0); // L: 1708 - } else if (Login.loginIndex == 13) { // L: 1710 - var22 = 231; // L: 1711 - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var22, 16777215, 0); // L: 1712 - var23 = var22 + 20; // L: 1713 - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var23, 16777215, 0); // L: 1714 - var4 = Login.loginBoxX + 180; // L: 1715 - var22 = 311; // L: 1716 - class137.titlebuttonSprite.drawAt(var4 - 73, var22 - 20); // L: 1717 - var0.drawCentered("Back", var4, var22 + 5, 16777215, 0); // L: 1718 - } else if (Login.loginIndex == 14) { // L: 1720 - var22 = 201; // L: 1721 - String var14 = ""; // L: 1722 - var5 = ""; // L: 1723 - var6 = ""; // L: 1724 - switch(Login.field892) { // L: 1725 - case 0: - var14 = "Your account has been disabled."; // L: 1735 - var5 = Strings.field3731; // L: 1736 - var6 = ""; // L: 1737 - break; // L: 1738 - case 1: - var14 = "Account locked as we suspect it has been stolen."; // L: 1728 - var5 = Strings.field3684; // L: 1729 - var6 = ""; // L: 1730 - break; - default: - class127.Login_promptCredentials(false); // L: 1742 - } - - var0.drawCentered(var14, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1746 - var23 = var22 + 15; // L: 1747 - var2.drawCentered(var5, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1748 - var23 += 15; // L: 1749 - var2.drawCentered(var6, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1750 - var23 += 15; // L: 1751 - var15 = Login.loginBoxX + 180; // L: 1752 - var28 = 276; // L: 1753 - class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1754 - var0.drawCentered("Support Page", var15, var28 + 5, 16777215, 0); // L: 1755 - var15 = Login.loginBoxX + 180; // L: 1756 - var28 = 326; // L: 1757 - class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1758 - var0.drawCentered("Back", var15, var28 + 5, 16777215, 0); // L: 1759 - } else if (Login.loginIndex == 24) { // L: 1761 - var22 = 221; // L: 1762 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1763 - var23 = var22 + 15; // L: 1764 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1765 - var23 += 15; // L: 1766 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1767 - var23 += 15; // L: 1768 - var4 = Login.loginBoxX + 180; // L: 1769 - var13 = 301; // L: 1770 - class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1771 - var0.drawCentered("Ok", var4, var13 + 5, 16777215, 0); // L: 1772 - } - } - } - } - - if (Client.gameState >= 10) { // L: 1775 - int[] var21 = new int[4]; // L: 1776 - Rasterizer2D.Rasterizer2D_getClipArray(var21); // L: 1777 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class309.canvasHeight); // L: 1778 - Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1779 - Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1780 - Rasterizer2D.Rasterizer2D_setClipArray(var21); // L: 1781 - } - - class114.title_muteSprite[Interpreter.clientPreferences.method2259() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1783 - if (Client.gameState > 5 && Language.Language_EN == FriendSystem.clientLanguage) { // L: 1784 - if (class19.field96 != null) { // L: 1785 - var23 = Login.xPadding + 5; // L: 1786 - var24 = 463; // L: 1787 - byte var29 = 100; // L: 1788 - byte var31 = 35; // L: 1789 - class19.field96.drawAt(var23, var24); // L: 1790 - var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var23, var31 / 2 + var24 - 2, 16777215, 0); // L: 1791 - if (class345.World_request != null) { // L: 1792 - var1.drawCentered("Loading...", var29 / 2 + var23, var31 / 2 + var24 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var29 / 2 + var23, var31 / 2 + var24 + 12, 16777215, 0); // L: 1793 - } - } else { - class19.field96 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(WorldMapData_1.archive8, "sl_button", ""); // L: 1796 - } - } - - } - } // L: 1330 1799 - - @ObfuscatedName("au") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "-110" + descriptor = "([FIFZFZ[FB)I", + garbageValue = "0" ) - static int method2861(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2697 - if (var0 == 3702) { // L: 2702 - ++class295.Interpreter_intStackSize; // L: 2703 - return 1; // L: 2704 - } else { - return 2; // L: 2706 - } + public static int method2888(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; // L: 15 + + for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16 + var7 += Math.abs(var0[var8]); // L: 17 + } + + float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1382; // L: 19 + if (var7 <= var24) { // L: 20 + return -1; // L: 21 } else { - --class295.Interpreter_intStackSize; // L: 2698 - --ChatChannel.Interpreter_stringStackSize; // L: 2699 - return 1; // L: 2700 + float[] var9 = new float[var1 + 1]; // L: 23 + + int var10; + for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24 + var9[var10] = 1.0F / var7 * var0[var10]; // L: 25 + } + + while (Math.abs(var9[var1]) < var24) { // L: 27 + --var1; // L: 28 + } + + var10 = 0; // L: 30 + if (var1 == 0) { // L: 31 + return var10; // L: 32 + } else if (var1 == 1) { // L: 34 + var6[0] = -var9[0] / var9[1]; // L: 35 + boolean var22 = var3 ? var2 < var24 + var6[0] : var2 < var6[0] - var24; // L: 36 + boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37 + var10 = var22 && var23 ? 1 : 0; // L: 38 + if (var10 > 0) { // L: 39 + if (var3 && var6[0] < var2) { // L: 40 + var6[0] = var2; // L: 41 + } else if (var5 && var6[0] > var4) { // L: 43 + var6[0] = var4; // L: 44 + } + } + + return var10; // L: 47 + } else { + class389 var11 = new class389(var9, var1); // L: 50 + float[] var12 = new float[var1 + 1]; // L: 51 + + for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 + var12[var13 - 1] = var9[var13] * (float)var13; // L: 53 + } + + float[] var21 = new float[var1 + 1]; // L: 55 + int var14 = method2888(var12, var1 - 1, var2, false, var4, false, var21); // L: 56 + if (var14 == -1) { // L: 57 + return 0; // L: 58 + } else { + boolean var15 = false; // L: 60 + float var17 = 0.0F; // L: 62 + float var18 = 0.0F; // L: 63 + float var19 = 0.0F; // L: 64 + + for (int var20 = 0; var20 <= var14; ++var20) { // L: 65 + if (var10 > var1) { // L: 66 + return var10; + } + + float var16; + if (var20 == 0) { // L: 67 + var16 = var2; // L: 68 + var18 = class306.method5786(var9, var1, var2); // L: 69 + if (Math.abs(var18) <= var24 && var3) { // L: 70 + var6[var10++] = var2; + } + } else { + var16 = var19; // L: 73 + var18 = var17; // L: 74 + } + + if (var14 == var20) { // L: 76 + var19 = var4; // L: 77 + var15 = false; // L: 78 + } else { + var19 = var21[var20]; // L: 81 + } + + var17 = class306.method5786(var9, var1, var19); // L: 83 + if (var15) { // L: 84 + var15 = false; // L: 85 + } else if (Math.abs(var17) < var24) { // L: 88 + if (var20 != var14 || var5) { // L: 89 + var6[var10++] = var19; // L: 90 + var15 = true; // L: 91 + } + } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94 + var6[var10++] = class154.method3181(var11, var16, var19, 0.0F); // L: 95 + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96 + var6[var10 - 2] = 0.5F * (var6[var10 - 1] + var6[var10 - 2]); // L: 97 + --var10; // L: 98 + } + } + } + + return var10; // L: 104 + } + } } } - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "48" - ) - static final void method2864(int var0, int var1) { - if (var0 < 128) { // L: 3528 - var0 = 128; - } - - if (var0 > 383) { // L: 3529 - var0 = 383; - } - - if (Language.cameraPitch < var0) { // L: 3530 - Language.cameraPitch = (var0 - Language.cameraPitch) * JagexCache.field1737 / 1000 + Language.cameraPitch + ClanChannel.field1660; // L: 3531 - if (Language.cameraPitch > var0) { // L: 3532 - Language.cameraPitch = var0; - } - } - - if (Language.cameraPitch > var0) { // L: 3534 - Language.cameraPitch -= (Language.cameraPitch - var0) * JagexCache.field1737 / 1000 + ClanChannel.field1660; // L: 3535 - if (Language.cameraPitch < var0) { // L: 3536 - Language.cameraPitch = var0; - } - } - - int var2 = var1 - MusicPatchNode2.cameraYaw; // L: 3538 - if (var2 > 1024) { // L: 3539 - var2 -= 2048; - } - - if (var2 < -1024) { // L: 3540 - var2 += 2048; - } - - if (var2 > 0) { // L: 3541 - MusicPatchNode2.cameraYaw = MusicPatchNode2.cameraYaw + ClanChannel.field1660 + var2 * JagexCache.field1737 / 1000; // L: 3542 - MusicPatchNode2.cameraYaw &= 2047; // L: 3543 - } - - if (var2 < 0) { // L: 3545 - MusicPatchNode2.cameraYaw -= -var2 * JagexCache.field1737 / 1000 + ClanChannel.field1660; // L: 3546 - MusicPatchNode2.cameraYaw &= 2047; // L: 3547 - } - - int var3 = var1 - MusicPatchNode2.cameraYaw; // L: 3549 - if (var3 > 1024) { // L: 3550 - var3 -= 2048; - } - - if (var3 < -1024) { // L: 3551 - var3 += 2048; - } - - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3552 - MusicPatchNode2.cameraYaw = var1; - } - - } // L: 3553 - - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1895605377" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9242 - SecureRandomFuture.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9243 - } - - long var4 = -1L; // L: 9246 - long var6 = -1L; // L: 9247 - - int var8; - for (var8 = 0; var8 < SpotAnimationDefinition.method3515(); ++var8) { // L: 9248 - long var22 = WorldMapLabel.method4997(var8); // L: 9249 - if (var22 != var6) { // L: 9250 - var6 = var22; // L: 9251 - int var24 = DynamicObject.method1987(var8); // L: 9252 - int var12 = class150.method3091(var8); // L: 9253 - long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9257 - int var14 = (int)(var15 >>> 14 & 3L); // L: 9259 - int var25 = UserComparator10.method2615(var8); // L: 9264 - if (var14 == 2 && FriendSystem.scene.getObjectFlags(class160.Client_plane, var24, var12, var22) >= 0) { // L: 9265 9266 - ObjectComposition var16 = class116.getObjectDefinition(var25); // L: 9267 - if (var16.transforms != null) { // L: 9268 - var16 = var16.transform(); - } - - if (var16 == null) { // L: 9269 - continue; - } - - if (Client.isItemSelected == 1) { // L: 9270 - SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(65535) + var16.name, 1, var25, var24, var12); // L: 9271 - } else if (Client.isSpellSelected) { // L: 9274 - if ((class154.selectedSpellFlags & 4) == 4) { // L: 9275 - SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(65535) + var16.name, 2, var25, var24, var12); // L: 9276 - } - } else { - String[] var17 = var16.actions; // L: 9281 - if (var17 != null) { // L: 9282 - for (int var18 = 4; var18 >= 0; --var18) { // L: 9283 - if (var17[var18] != null) { // L: 9284 - short var19 = 0; // L: 9285 - if (var18 == 0) { // L: 9286 - var19 = 3; - } - - if (var18 == 1) { // L: 9287 - var19 = 4; - } - - if (var18 == 2) { // L: 9288 - var19 = 5; - } - - if (var18 == 3) { // L: 9289 - var19 = 6; - } - - if (var18 == 4) { // L: 9290 - var19 = 1001; - } - - SecureRandomFuture.insertMenuItemNoShift(var17[var18], ChatChannel.colorStartTag(65535) + var16.name, var19, var25, var24, var12); // L: 9291 - } - } - } - - SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(65535) + var16.name, 1002, var16.id, var24, var12); // L: 9296 - } - } - - Player var20; - int var26; - NPC var27; - int var34; - int[] var35; - if (var14 == 1) { // L: 9301 - NPC var30 = Client.npcs[var25]; // L: 9302 - if (var30 == null) { // L: 9303 - continue; - } - - if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { // L: 9304 - for (var26 = 0; var26 < Client.npcCount; ++var26) { // L: 9305 - var27 = Client.npcs[Client.npcIndices[var26]]; // L: 9306 - if (var27 != null && var30 != var27 && var27.definition.size == 1 && var27.x == var30.x && var27.y == var30.y) { // L: 9307 - NPCComposition.addNpcToMenu(var27, Client.npcIndices[var26], var24, var12); - } - } - - var26 = Players.Players_count; // L: 9309 - var35 = Players.Players_indices; // L: 9310 - - for (var34 = 0; var34 < var26; ++var34) { // L: 9311 - var20 = Client.players[var35[var34]]; // L: 9312 - if (var20 != null && var30.x == var20.x && var20.y == var30.y) { // L: 9313 - WorldMapSprite.addPlayerToMenu(var20, var35[var34], var24, var12); - } - } - } - - NPCComposition.addNpcToMenu(var30, var25, var24, var12); // L: 9316 - } - - if (var14 == 0) { // L: 9318 - Player var31 = Client.players[var25]; // L: 9319 - if (var31 == null) { // L: 9320 - continue; - } - - if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 9321 - for (var26 = 0; var26 < Client.npcCount; ++var26) { // L: 9322 - var27 = Client.npcs[Client.npcIndices[var26]]; // L: 9323 - if (var27 != null && var27.definition.size == 1 && var27.x == var31.x && var31.y == var27.y) { // L: 9324 - NPCComposition.addNpcToMenu(var27, Client.npcIndices[var26], var24, var12); - } - } - - var26 = Players.Players_count; // L: 9326 - var35 = Players.Players_indices; // L: 9327 - - for (var34 = 0; var34 < var26; ++var34) { // L: 9328 - var20 = Client.players[var35[var34]]; // L: 9329 - if (var20 != null && var20 != var31 && var20.x == var31.x && var20.y == var31.y) { // L: 9330 - WorldMapSprite.addPlayerToMenu(var20, var35[var34], var24, var12); - } - } - } - - if (var25 != Client.combatTargetPlayerIndex) { // L: 9333 - WorldMapSprite.addPlayerToMenu(var31, var25, var24, var12); - } else { - var4 = var22; // L: 9334 - } - } - - if (var14 == 3) { // L: 9336 - NodeDeque var33 = Client.groundItems[class160.Client_plane][var24][var12]; // L: 9337 - if (var33 != null) { // L: 9338 - for (TileItem var32 = (TileItem)var33.first(); var32 != null; var32 = (TileItem)var33.next()) { // L: 9339 9340 9373 - ItemComposition var36 = class67.ItemDefinition_get(var32.id); // L: 9341 - if (Client.isItemSelected == 1) { // L: 9342 - SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var36.name, 16, var32.id, var24, var12); // L: 9343 - } else if (Client.isSpellSelected) { // L: 9346 - if ((class154.selectedSpellFlags & 1) == 1) { // L: 9347 - SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var36.name, 17, var32.id, var24, var12); // L: 9348 - } - } else { - String[] var28 = var36.groundActions; // L: 9353 - - for (int var29 = 4; var29 >= 0; --var29) { // L: 9354 - if (var28 != null && var28[var29] != null) { // L: 9355 - byte var21 = 0; // L: 9356 - if (var29 == 0) { // L: 9357 - var21 = 18; - } - - if (var29 == 1) { // L: 9358 - var21 = 19; - } - - if (var29 == 2) { // L: 9359 - var21 = 20; - } - - if (var29 == 3) { // L: 9360 - var21 = 21; - } - - if (var29 == 4) { // L: 9361 - var21 = 22; - } - - SecureRandomFuture.insertMenuItemNoShift(var28[var29], ChatChannel.colorStartTag(16748608) + var36.name, var21, var32.id, var24, var12); // L: 9362 - } else if (var29 == 2) { // L: 9365 - SecureRandomFuture.insertMenuItemNoShift("Take", ChatChannel.colorStartTag(16748608) + var36.name, 20, var32.id, var24, var12); // L: 9366 - } - } - - SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16748608) + var36.name, 1004, var32.id, var24, var12); // L: 9370 - } - } - } - } - } - } - - if (-1L != var4) { // L: 9378 - var8 = (int)(var4 >>> 0 & 127L); // L: 9381 - int var10 = PcmPlayer.method771(var4); // L: 9384 - Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9385 - WorldMapSprite.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); // L: 9386 - } - - } // L: 9388 } diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java index 5280eebcaf..308b0707e8 100644 --- a/runescape-client/src/main/java/class133.java +++ b/runescape-client/src/main/java/class133.java @@ -1,37 +1,41 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("ej") public class class133 extends class128 { + @ObfuscatedName("hh") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 124738811 + intValue = 432924361 ) - int field1560; - @ObfuscatedName("o") + int field1556; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1528369699 + intValue = -2115932519 ) - int field1558; - @ObfuscatedName("h") + int field1555; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 556051491 + intValue = 117330729 ) - int field1562; - @ObfuscatedName("g") + int field1552; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -387663765 + intValue = -850318401 ) - int field1561; + int field1550; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class133(class131 var1) { this.this$0 = var1; // L: 289 @@ -39,22 +43,22 @@ public class class133 extends class128 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1560 = var1.readInt(); // L: 292 - this.field1561 = var1.readInt(); // L: 293 - this.field1558 = var1.readUnsignedByte(); // L: 294 - this.field1562 = var1.readUnsignedByte(); // L: 295 + void vmethod3168(Buffer var1) { + this.field1556 = var1.readInt(); // L: 292 + this.field1550 = var1.readInt(); // L: 293 + this.field1555 = var1.readUnsignedByte(); // L: 294 + this.field1552 = var1.readUnsignedByte(); // L: 295 } // L: 296 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2928(this.field1560, this.field1561, this.field1558, this.field1562); // L: 299 + void vmethod3162(ClanSettings var1) { + var1.method2969(this.field1556, this.field1550, this.field1555, this.field1552); // L: 299 } // L: 300 } diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java index 70973663de..36156a9b4c 100644 --- a/runescape-client/src/main/java/class134.java +++ b/runescape-client/src/main/java/class134.java @@ -2,77 +2,174 @@ 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("eb") +@ObfuscatedName("em") public class class134 extends class144 { - @ObfuscatedName("rc") - @ObfuscatedSignature( - descriptor = "Leh;" - ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1229066847 - ) - @Export("gameCyclesToDo") - static int gameCyclesToDo; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1626167143 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1869646227 + intValue = -890090541 ) - int field1566; - @ObfuscatedName("o") - byte field1564; - @ObfuscatedName("h") + int field1558; + @ObfuscatedName("c") + byte field1557; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1456142123 + intValue = -1576822887 ) - int field1565; - @ObfuscatedName("g") - String field1567; + int field1559; + @ObfuscatedName("f") + String field1560; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Ler;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Lez;)V" + descriptor = "(Ler;)V" ) class134(class145 var1) { this.this$0 = var1; - this.field1566 = -1; // L: 101 + this.field1558 = -1; // L: 101 } // L: 106 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "3239" + descriptor = "(Lpi;B)V", + garbageValue = "23" ) - void vmethod3096(Buffer var1) { - this.field1566 = var1.readUnsignedShort(); // L: 109 - this.field1564 = var1.readByte(); // L: 110 - this.field1565 = var1.readUnsignedShort(); // L: 111 + void vmethod3152(Buffer var1) { + this.field1558 = var1.readUnsignedShort(); // L: 109 + this.field1557 = var1.readByte(); // L: 110 + this.field1559 = var1.readUnsignedShort(); // L: 111 var1.readLong(); // L: 112 - this.field1567 = var1.readStringCp1252NullTerminated(); // L: 113 + this.field1560 = var1.readStringCp1252NullTerminated(); // L: 113 } // L: 114 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;B)V", - garbageValue = "26" + descriptor = "(Lea;I)V", + garbageValue = "1764669808" ) - void vmethod3093(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1566); // L: 117 - var2.rank = this.field1564; // L: 118 - var2.world = this.field1565; // L: 119 - var2.username = new Username(this.field1567); // L: 120 + void vmethod3153(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1558); // L: 117 + var2.rank = this.field1557; // L: 118 + var2.world = this.field1559; // L: 119 + var2.username = new Username(this.field1560); // L: 120 } // L: 121 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)Lfb;", + garbageValue = "6" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 + if (var1 != null) { // L: 19 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 + var1 = new VarpDefinition(); // L: 21 + if (var2 != null) { // L: 22 + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 + return var1; // L: 24 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-939584832" + ) + public static boolean method2905(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 + if (var0 != 0) { // L: 46 + char[] var1 = class345.cp1252AsciiExtension; // L: 48 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 + char var3 = var1[var2]; // L: 50 + if (var0 == var3) { + return true; // L: 52 + } + } + } + + return false; // L: 57 + } else { + return true; + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILbd;ZS)I", + garbageValue = "300" + ) + static int method2906(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 818 + var0 -= 1000; // L: 819 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 820 + } else { + var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 822 + } + + class346.invalidateWidget(var3); // L: 823 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 824 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 844 + var3.modelType = 2; // L: 845 + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 846 + return 1; // L: 847 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 849 + var3.modelType = 3; // L: 850 + var3.modelId = GrandExchangeEvents.localPlayer.appearance.getChatHeadId(); // L: 851 + return 1; // L: 852 + } else { + return 2; // L: 854 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 825 + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 826 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 827 + var3.itemId = var4; // L: 828 + var3.itemQuantity = var5; // L: 829 + ItemComposition var6 = class19.ItemDefinition_get(var4); // L: 830 + var3.modelAngleX = var6.xan2d; // L: 831 + var3.modelAngleY = var6.yan2d; // L: 832 + var3.modelAngleZ = var6.zan2d; // L: 833 + var3.modelOffsetX = var6.offsetX2d; // L: 834 + var3.modelOffsetY = var6.offsetY2d; // L: 835 + var3.modelZoom = var6.zoom2d; // L: 836 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 837 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 838 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 839 + } + + if (var3.field3467 > 0) { // L: 840 + var3.modelZoom = var3.modelZoom * 32 / var3.field3467; + } else if (var3.rawWidth > 0) { // L: 841 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 842 + } + } + + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-77" + ) + static void method2908() { + Client.packetWriter.addNode(WorldMapSprite.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher)); // L: 12607 + Client.oculusOrbState = 0; // L: 12608 + } // L: 12609 } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index 9d2f82e43a..de9e611601 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -1,33 +1,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("er") +@ObfuscatedName("ei") public class class135 extends class128 { - @ObfuscatedName("ek") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Lqq;" ) - @Export("archive12") - static Archive archive12; + static IndexedSprite field1569; @ObfuscatedName("v") - boolean field1575; - @ObfuscatedName("o") - byte field1573; - @ObfuscatedName("h") - byte field1574; - @ObfuscatedName("g") - byte field1576; - @ObfuscatedName("l") - byte field1572; + boolean field1566; + @ObfuscatedName("c") + byte field1565; + @ObfuscatedName("i") + byte field1567; + @ObfuscatedName("f") + byte field1564; + @ObfuscatedName("b") + byte field1568; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class135(class131 var1) { this.this$0 = var1; // L: 248 @@ -35,27 +35,457 @@ public class class135 extends class128 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1575 = var1.readUnsignedByte() == 1; // L: 251 - this.field1573 = var1.readByte(); // L: 252 - this.field1574 = var1.readByte(); // L: 253 - this.field1576 = var1.readByte(); // L: 254 - this.field1572 = var1.readByte(); // L: 255 + void vmethod3168(Buffer var1) { + this.field1566 = var1.readUnsignedByte() == 1; // L: 251 + this.field1565 = var1.readByte(); // L: 252 + this.field1567 = var1.readByte(); // L: 253 + this.field1564 = var1.readByte(); // L: 254 + this.field1568 = var1.readByte(); // L: 255 } // L: 256 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.allowGuests = this.field1575; // L: 259 - var1.field1602 = this.field1573; // L: 260 - var1.field1603 = this.field1574; // L: 261 - var1.field1604 = this.field1576; // L: 262 - var1.field1613 = this.field1572; // L: 263 + void vmethod3162(ClanSettings var1) { + var1.allowGuests = this.field1566; // L: 259 + var1.field1591 = this.field1565; // L: 260 + var1.field1592 = this.field1567; // L: 261 + var1.field1593 = this.field1564; // L: 262 + var1.field1606 = this.field1568; // L: 263 } // L: 264 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)Z", + garbageValue = "1081787239" + ) + static final boolean method2919(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 124 + if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 125 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; // L: 126 + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; // L: 127 + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; // L: 128 + if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 129 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; // L: 130 + return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 131 + } + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Lqi;", + garbageValue = "-152475428" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 365 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 366 + var4 = 1; + } + + long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); // L: 367 + SpritePixels var8; + if (!var5) { // L: 369 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 370 + if (var8 != null) { // L: 371 + return var8; + } + } + + ItemComposition var9 = class19.ItemDefinition_get(var0); // L: 373 + if (var1 > 1 && var9.countobj != null) { // L: 374 + int var10 = -1; // L: 375 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 376 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 377 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 379 + var9 = class19.ItemDefinition_get(var10); + } + } + + Model var21 = var9.getModel(1); // L: 381 + if (var21 == null) { // L: 382 + return null; + } else { + SpritePixels var22 = null; // L: 383 + if (var9.noteTemplate != -1) { // L: 384 + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 385 + if (var22 == null) { // L: 386 + return null; + } + } else if (var9.notedId != -1) { // L: 388 + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 389 + if (var22 == null) { // L: 390 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 392 + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 393 + if (var22 == null) { // L: 394 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 396 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 397 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 398 + int[] var15 = new int[4]; // L: 399 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 400 + var8 = new SpritePixels(36, 32); // L: 401 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 402 + Rasterizer2D.Rasterizer2D_clear(); // L: 403 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 404 + Rasterizer3D.method4631(16, 16); // L: 405 + Rasterizer3D.field2553 = false; // L: 406 + if (var9.placeholderTemplate != -1) { // L: 407 + var22.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 408 + if (var5) { // L: 409 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 410 + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 411 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 412 + var21.calculateBoundsCylinder(); // L: 413 + var21.method5003(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 414 + if (var9.notedId != -1) { // L: 415 + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 416 + var8.outline(1); + } + + if (var2 >= 2) { // L: 417 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 418 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 419 + if (var9.noteTemplate != -1) { // L: 420 + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 421 + Font var19 = ParamComposition.ItemDefinition_fontPlain11; // L: 422 + String var20; + if (var1 < 100000) { // L: 425 + var20 = "" + var1 + ""; // L: 426 + } else if (var1 < 10000000) { // L: 429 + var20 = "" + var1 / 1000 + "K" + ""; // L: 430 + } else { + var20 = "" + var1 / 1000000 + "M" + ""; // L: 433 + } + + var19.draw(var20, 0, 9, 16776960, 1); // L: 435 + } + + if (!var5) { // L: 437 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 438 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 439 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 440 + Rasterizer3D.field2553 = true; // L: 441 + return var8; // L: 442 + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1999407180" + ) + static int method2922(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1199 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1200 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1201 + return 1; // L: 1202 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1204 + if (var3.itemId != -1) { // L: 1205 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1206 + } + + return 1; // L: 1207 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1209 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1210 + return 1; // L: 1211 + } else if (var0 == 1707) { // L: 1213 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method5690() ? 1 : 0; // L: 1214 + return 1; // L: 1215 + } else if (var0 == 1708) { // L: 1217 + return UserComparator9.method2617(var3); // L: 1218 + } else { + return var0 == 1708 ? class305.method5782(var3) : 2; // L: 1220 1221 1223 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILbd;ZB)I", + garbageValue = "-35" + ) + static int method2921(int var0, Script var1, boolean var2) { + Widget var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1341 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1342 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1343 + return 1; // L: 1344 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1346 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1347 + return 1; // L: 1348 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1350 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.text; // L: 1351 + return 1; // L: 1352 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1354 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1355 + return 1; // L: 1356 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1358 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1359 + return 1; // L: 1360 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1362 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1363 + return 1; // L: 1364 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1366 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1367 + return 1; // L: 1368 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1370 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1371 + return 1; // L: 1372 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1374 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1375 + return 1; // L: 1376 + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1378 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1379 + return 1; // L: 1380 + } else if (var0 == 2610) { // L: 1382 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1383 + return 1; // L: 1384 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1386 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1387 + return 1; // L: 1388 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1390 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1391 + return 1; // L: 1392 + } else if (var0 == 2613) { // L: 1394 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1395 + return 1; // L: 1396 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1398 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1399 + return 1; // L: 1400 + } else if (var0 != 2615 && var0 != 2616) { // L: 1402 + return 2; // L: 1406 + } else { + ++Interpreter.Interpreter_intStackSize; // L: 1403 + return 1; // L: 1404 + } + } + + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "241580709" + ) + static final void method2920() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3801 + var0 = GrandExchangeEvents.localPlayer.x; // L: 3802 + var1 = GrandExchangeEvents.localPlayer.y; // L: 3803 + if (class10.oculusOrbFocalPointX - var0 < -500 || class10.oculusOrbFocalPointX - var0 > 500 || ClientPacket.oculusOrbFocalPointY - var1 < -500 || ClientPacket.oculusOrbFocalPointY - var1 > 500) { // L: 3804 + class10.oculusOrbFocalPointX = var0; // L: 3805 + ClientPacket.oculusOrbFocalPointY = var1; // L: 3806 + } + + if (var0 != class10.oculusOrbFocalPointX) { // L: 3808 + class10.oculusOrbFocalPointX += (var0 - class10.oculusOrbFocalPointX) / 16; + } + + if (var1 != ClientPacket.oculusOrbFocalPointY) { // L: 3809 + ClientPacket.oculusOrbFocalPointY += (var1 - ClientPacket.oculusOrbFocalPointY) / 16; + } + + var2 = class10.oculusOrbFocalPointX >> 7; // L: 3810 + var3 = ClientPacket.oculusOrbFocalPointY >> 7; // L: 3811 + var4 = WorldMapLabel.getTileHeight(class10.oculusOrbFocalPointX, ClientPacket.oculusOrbFocalPointY, class18.Client_plane); // L: 3812 + var5 = 0; // L: 3813 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3814 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3815 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3816 + int var8 = class18.Client_plane; // L: 3817 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3818 + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3819 + if (var9 > var5) { // L: 3820 + var5 = var9; + } + } + } + } + + var6 = var5 * 192; // L: 3824 + if (var6 > 98048) { // L: 3825 + var6 = 98048; + } + + if (var6 < 32768) { // L: 3826 + var6 = 32768; + } + + if (var6 > Client.field718) { // L: 3827 + Client.field718 += (var6 - Client.field718) / 24; + } else if (var6 < Client.field718) { // L: 3828 + Client.field718 += (var6 - Client.field718) / 80; + } + + Decimator.field397 = WorldMapLabel.getTileHeight(GrandExchangeEvents.localPlayer.x, GrandExchangeEvents.localPlayer.y, class18.Client_plane) - Client.camFollowHeight; // L: 3829 + } else if (Client.oculusOrbState == 1) { // L: 3831 + UrlRequest.method2560(); // L: 3832 + short var10 = -1; // L: 3833 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3834 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3835 + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3836 + if (var10 == 0) { // L: 3837 + var10 = 1792; + } else if (var10 == 1024) { // L: 3838 + var10 = 1280; + } else { + var10 = 1536; // L: 3839 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3841 + if (var10 == 0) { // L: 3842 + var10 = 256; + } else if (var10 == 1024) { // L: 3843 + var10 = 768; + } else { + var10 = 512; // L: 3844 + } + } + + byte var11 = 0; // L: 3846 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3847 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3848 + var11 = 1; + } + + var2 = 0; // L: 3849 + if (var10 >= 0 || var11 != 0) { // L: 3850 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 868767683 * -1383870229 : Client.oculusOrbNormalSpeed * -210849807 * -1329831663; // L: 3851 + var2 *= 16; // L: 3852 + Client.field590 = var10; // L: 3853 + Client.field489 = var11; // L: 3854 + } + + if (Client.field581 < var2) { // L: 3856 + Client.field581 += var2 / 8; // L: 3857 + if (Client.field581 > var2) { // L: 3858 + Client.field581 = var2; + } + } else if (Client.field581 > var2) { // L: 3860 + Client.field581 = Client.field581 * 9 / 10; + } + + if (Client.field581 > 0) { // L: 3861 + var3 = Client.field581 / 16; // L: 3862 + if (Client.field590 >= 0) { // L: 3863 + var0 = Client.field590 - class21.cameraYaw & 2047; // L: 3864 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3865 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3866 + class10.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3867 + ClientPacket.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3868 + } + + if (Client.field489 != 0) { // L: 3870 + Decimator.field397 += var3 * Client.field489; // L: 3871 + if (Decimator.field397 > 0) { // L: 3872 + Decimator.field397 = 0; + } + } + } else { + Client.field590 = -1; // L: 3876 + Client.field489 = -1; // L: 3877 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3879 + class134.method2908(); // L: 3880 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && GameBuild.mouseCam) { // L: 3883 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3884 + Client.camAngleDX = var0 * 2; // L: 3885 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 1209120729 * -785295255; // L: 3886 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3887 + Client.camAngleDY = var1 * 2; // L: 3888 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * 945035617 * -611956063; // L: 3889 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3892 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3893 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 3894 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3895 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3896 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 3897 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3898 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3899 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3901 + Client.camAngleX += Client.camAngleDX / 2; // L: 3902 + if (Client.camAngleX < 128) { // L: 3903 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 3904 + Client.camAngleX = 383; + } + + } // L: 3905 } diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java index 4b7f473f58..0fa7496646 100644 --- a/runescape-client/src/main/java/class136.java +++ b/runescape-client/src/main/java/class136.java @@ -1,43 +1,35 @@ -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("ei") +@ObfuscatedName("ep") public class class136 extends class144 { - @ObfuscatedName("ow") - @ObfuscatedGetter( - intValue = -1282904603 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1060413805 + intValue = -855933295 ) - int field1581; + int field1571; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Ler;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Lez;)V" + descriptor = "(Ler;)V" ) class136(class145 var1) { this.this$0 = var1; - this.field1581 = -1; // L: 82 + this.field1571 = -1; // L: 82 } // L: 84 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "3239" + descriptor = "(Lpi;B)V", + garbageValue = "23" ) - void vmethod3096(Buffer var1) { - this.field1581 = var1.readUnsignedShort(); // L: 87 + void vmethod3152(Buffer var1) { + this.field1571 = var1.readUnsignedShort(); // L: 87 var1.readUnsignedByte(); // L: 88 if (var1.readUnsignedByte() != 255) { // L: 89 --var1.offset; // L: 90 @@ -46,47 +38,114 @@ public class class136 extends class144 { } // L: 93 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;B)V", - garbageValue = "26" + descriptor = "(Lea;I)V", + garbageValue = "1764669808" ) - void vmethod3093(ClanChannel var1) { - var1.removeMember(this.field1581); // L: 96 + void vmethod3153(ClanChannel var1) { + var1.removeMember(this.field1571); // L: 96 } // L: 97 - @ObfuscatedName("w") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-2073039041" + descriptor = "(I)J", + garbageValue = "1053003515" ) - static int method2896(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1248 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var3)); // L: 1250 - return 1; // L: 1251 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260 - if (var3.dataText == null) { // L: 1261 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262 + public static final synchronized long method2931() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class269.field3149) { // L: 15 + class269.field3147 += class269.field3149 - var0; // L: 16 + } + + class269.field3149 = var0; // L: 18 + return class269.field3147 + var0; // L: 19 + } + + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "885015273" + ) + static final void method2923() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3493 + int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3494 + if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3495 + SoundEffect var1 = Client.soundEffects[var0]; // L: 3507 + if (var1 == null) { // L: 3508 + Object var10000 = null; // L: 3509 + var1 = SoundEffect.readSoundEffect(class182.archive4, Client.soundEffectIds[var0], 0); + if (var1 == null) { // L: 3510 + continue; + } + + int[] var12 = Client.queuedSoundEffectDelays; // L: 3511 + var12[var0] += var1.calculateDelay(); + Client.soundEffects[var0] = var1; // L: 3512 } - return 1; // L: 1263 + if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3518 + int var2; + if (Client.soundLocations[var0] != 0) { // L: 3520 + int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3521 + int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3522 + int var5 = var4 * 128 + 64 - GrandExchangeEvents.localPlayer.x; // L: 3523 + if (var5 < 0) { // L: 3524 + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3525 + int var7 = var6 * 128 + 64 - GrandExchangeEvents.localPlayer.y; // L: 3526 + if (var7 < 0) { // L: 3527 + var7 = -var7; + } + + int var8 = var5 + var7 - 128; // L: 3528 + if (var8 > var3) { // L: 3529 + Client.queuedSoundEffectDelays[var0] = -100; // L: 3530 + continue; // L: 3531 + } + + if (var8 < 0) { // L: 3533 + var8 = 0; + } + + var2 = (var3 - var8) * class131.clientPreferences.method2270() / var3; // L: 3534 + } else { + var2 = class131.clientPreferences.method2243(); // L: 3536 + } + + if (var2 > 0) { // L: 3537 + RawSound var9 = var1.toRawSound().resample(WorldMapRectangle.decimator); // L: 3538 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3539 + var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3540 + StructComposition.pcmStreamMixer.addSubStream(var10); // L: 3541 + } + + Client.queuedSoundEffectDelays[var0] = -100; // L: 3543 + } } else { - return 2; // L: 1265 + --Client.soundEffectCount; // L: 3496 + + for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3497 + Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3498 + Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3499 + Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3500 + Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3501 + Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3502 + } + + --var0; // L: 3504 } - } else { - int var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1254 - --var4; // L: 1255 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; + } + + if (Client.field746 && !class307.method5789()) { // L: 3546 + if (class131.clientPreferences.method2321() != 0 && Client.currentTrackGroupId != -1) { // L: 3547 + class18.method266(class16.archive6, Client.currentTrackGroupId, 0, class131.clientPreferences.method2321(), false); } - return 1; // L: 1258 + Client.field746 = false; // L: 3548 } - } + + } // L: 3550 } diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java index 6ce1208e78..86afc5026b 100644 --- a/runescape-client/src/main/java/class137.java +++ b/runescape-client/src/main/java/class137.java @@ -1,25 +1,20 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ef") public class class137 extends class128 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; + @ObfuscatedName("ax") + static String field1573; @ObfuscatedName("v") - String field1584; + String field1574; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class137(class131 var1) { this.this$0 = var1; // L: 229 @@ -27,53 +22,29 @@ public class class137 extends class128 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1584 = var1.readStringCp1252NullTerminated(); // L: 232 + void vmethod3168(Buffer var1) { + this.field1574 = var1.readStringCp1252NullTerminated(); // L: 232 var1.readInt(); // L: 233 } // L: 234 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.name = this.field1584; // L: 237 + void vmethod3162(ClanSettings var1) { + var1.name = this.field1574; // L: 237 } // L: 238 - @ObfuscatedName("hb") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "-1868672153" + descriptor = "(II)Z", + garbageValue = "-66675521" ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - PendingSpawn var9 = null; // L: 7335 - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7336 7337 7342 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7338 - var9 = var10; // L: 7339 - break; - } - } - - if (var9 == null) { // L: 7344 - var9 = new PendingSpawn(); // L: 7345 - var9.plane = var0; // L: 7346 - var9.type = var3; // L: 7347 - var9.x = var1; // L: 7348 - var9.y = var2; // L: 7349 - WorldMapRegion.method4795(var9); // L: 7350 - Client.pendingSpawns.addFirst(var9); // L: 7351 - } - - var9.id = var4; // L: 7353 - var9.field1122 = var5; // L: 7354 - var9.orientation = var6; // L: 7355 - var9.delay = var7; // L: 7356 - var9.hitpoints = var8; // L: 7357 - } // L: 7358 + public static boolean method2938(int var0) { + return var0 >= WorldMapDecorationType.field3498.id && var0 <= WorldMapDecorationType.field3518.id; // L: 42 + } } diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java index 134cedf47a..40b292c387 100644 --- a/runescape-client/src/main/java/class138.java +++ b/runescape-client/src/main/java/class138.java @@ -1,24 +1,37 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("eo") public class class138 extends class128 { + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("mz") + @ObfuscatedGetter( + intValue = -1603030107 + ) + @Export("menuX") + static int menuX; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1629578279 + intValue = -1526195035 ) - int field1590; - @ObfuscatedName("o") - String field1587; + int field1580; + @ObfuscatedName("c") + String field1576; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class138(class131 var1) { this.this$0 = var1; // L: 323 @@ -26,20 +39,190 @@ public class class138 extends class128 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1590 = var1.readInt(); // L: 326 - this.field1587 = var1.readStringCp1252NullTerminated(); // L: 327 + void vmethod3168(Buffer var1) { + this.field1580 = var1.readInt(); // L: 326 + this.field1576 = var1.readStringCp1252NullTerminated(); // L: 327 } // L: 328 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2956(this.field1590, this.field1587); // L: 331 + void vmethod3162(ClanSettings var1) { + var1.method2971(this.field1580, this.field1576); // L: 331 } // L: 332 + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(Lky;IIS)V", + garbageValue = "-3167" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 11027 + class21.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 11028 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 11031 + var3 = class152.Widget_getSpellActionName(var0); // L: 11032 + if (var3 != null) { // L: 11033 + class21.insertMenuItemNoShift(var3, UserComparator9.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 11034 + } + } + + if (var0.buttonType == 3) { // L: 11038 + class21.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 11039 + } + + if (var0.buttonType == 4) { // L: 11042 + class21.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 11043 + } + + if (var0.buttonType == 5) { // L: 11046 + class21.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 11047 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 11050 + class21.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 11051 + } + + int var4; + int var5; + int var13; + if (var0.type == 2) { // L: 11054 + var13 = 0; // L: 11055 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 11056 + for (var5 = 0; var5 < var0.width; ++var5) { // L: 11057 + int var6 = (var0.paddingX + 32) * var5; // L: 11058 + int var7 = (var0.paddingY + 32) * var4; // L: 11059 + if (var13 < 20) { // L: 11060 + var6 += var0.inventoryXOffsets[var13]; // L: 11061 + var7 += var0.inventoryYOffsets[var13]; // L: 11062 + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 11064 + Client.dragItemSlotDestination = var13; // L: 11065 + GrandExchangeEvent.hoveredItemContainer = var0; // L: 11066 + if (var0.itemIds[var13] > 0) { // L: 11067 + ItemComposition var8 = class19.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 11068 + if (Client.isItemSelected == 1 && class150.method3149(class326.getWidgetFlags(var0))) { // L: 11069 + if (var0.id != TaskHandler.selectedItemWidget || var13 != class432.selectedItemSlot) { // L: 11070 + class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 11071 + } + } else if (Client.isSpellSelected && class150.method3149(class326.getWidgetFlags(var0))) { // L: 11075 + if ((class17.selectedSpellFlags & 16) == 16) { // L: 11076 + class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 11077 + } + } else { + String[] var9 = var8.inventoryActions; // L: 11082 + int var10 = -1; // L: 11083 + if (Client.shiftClickDrop && class168.method3351()) { // L: 11084 + var10 = var8.getShiftClickIndex(); // L: 11085 + } + + int var11; + if (class150.method3149(class326.getWidgetFlags(var0))) { // L: 11087 + for (var11 = 4; var11 >= 3; --var11) { // L: 11088 + if (var10 != var11) { // L: 11089 + class65.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 11090 + } + } + } + + if (UserComparator10.method2629(class326.getWidgetFlags(var0))) { // L: 11093 + class21.insertMenuItemNoShift("Use", UserComparator9.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 11094 + } + + if (class150.method3149(class326.getWidgetFlags(var0))) { // L: 11097 + for (var11 = 2; var11 >= 0; --var11) { // L: 11098 + if (var11 != var10) { // L: 11099 + class65.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 11100 + } + } + + if (var10 >= 0) { // L: 11102 + class65.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 11103 + } + } + + var9 = var0.itemActions; // L: 11106 + if (var9 != null) { // L: 11107 + for (var11 = 4; var11 >= 0; --var11) { // L: 11108 + if (var9[var11] != null) { // L: 11109 + byte var12 = 0; // L: 11110 + if (var11 == 0) { // L: 11111 + var12 = 39; + } + + if (var11 == 1) { // L: 11112 + var12 = 40; + } + + if (var11 == 2) { // L: 11113 + var12 = 41; + } + + if (var11 == 3) { // L: 11114 + var12 = 42; + } + + if (var11 == 4) { // L: 11115 + var12 = 43; + } + + class21.insertMenuItemNoShift(var9[var11], UserComparator9.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 11116 + } + } + } + + class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 11121 + } + } + } + + ++var13; // L: 11126 + } + } + } + + if (var0.isIf3) { // L: 11130 + if (Client.isSpellSelected) { // L: 11131 + if (PacketWriter.method2498(class326.getWidgetFlags(var0)) && (class17.selectedSpellFlags & 32) == 32) { // L: 11132 + class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11133 + } + } else { + for (var13 = 9; var13 >= 5; --var13) { // L: 11138 + String var15 = class358.method6583(var0, var13); // L: 11139 + if (var15 != null) { // L: 11140 + class21.insertMenuItemNoShift(var15, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 11141 + } + } + + var3 = class152.Widget_getSpellActionName(var0); // L: 11145 + if (var3 != null) { // L: 11146 + class21.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11147 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 11150 + String var14 = class358.method6583(var0, var4); // L: 11151 + if (var14 != null) { // L: 11152 + class28.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11153 + } + } + + var5 = class326.getWidgetFlags(var0); // L: 11158 + boolean var16 = (var5 & 1) != 0; // L: 11160 + if (var16) { // L: 11162 + class21.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11163 + } + } + } + + } // L: 11168 } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index f6dd7ee1a1..f413bc1a44 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -6,190 +6,122 @@ 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; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -@ObfuscatedName("p") +@ObfuscatedName("d") public class class14 { - @ObfuscatedName("ug") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("iu") + @ObfuscatedName("b") + @Export("Tiles_overlays") + static byte[][][] Tiles_overlays; + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqi;" ) @Export("compass") static SpritePixels compass; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 659185471 + intValue = 225446733 ) - final int field76; - @ObfuscatedName("o") - final String field74; - @ObfuscatedName("h") + final int field73; + @ObfuscatedName("c") + final String field69; + @ObfuscatedName("i") final ThreadFactory field75; - @ObfuscatedName("g") - final ThreadPoolExecutor field73; + @ObfuscatedName("f") + final ThreadPoolExecutor field71; public class14(String var1, int var2, int var3) { - this.field74 = var1; // L: 15 - this.field76 = var2; // L: 16 + this.field69 = var1; // L: 15 + this.field73 = var2; // L: 16 this.field75 = new class16(this); // L: 17 - this.field73 = this.method176(var3); // L: 18 + this.field71 = this.method165(var3); // L: 18 } // L: 19 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "-2010668855" + descriptor = "(IB)Ljava/util/concurrent/ThreadPoolExecutor;", + garbageValue = "-61" ) - final ThreadPoolExecutor method176(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field76), this.field75); // L: 22 + final ThreadPoolExecutor method165(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field73), this.field75); // L: 22 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lk;I)Lm;", - garbageValue = "-964082167" + descriptor = "(Lr;B)Lx;", + garbageValue = "3" ) - public class19 method180(class10 var1) { - if (this.field73.getQueue().remainingCapacity() <= 0) { // L: 26 - System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field73.getCorePoolSize() + " Queue capacity " + this.field76); // L: 27 + public class19 method166(class10 var1) { + if (this.field71.getQueue().remainingCapacity() <= 0) { // L: 26 + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field71.getCorePoolSize() + " Queue capacity " + this.field73); // L: 27 return new class19("Queue full"); // L: 28 } else { - class19 var2 = new class19(this.field73.submit(new class20(this, var1))); // L: 30 + class19 var2 = new class19(this.field71.submit(new class20(this, var1))); // L: 30 return var2; // L: 31 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-302987445" + descriptor = "(B)V", + garbageValue = "-31" ) - public final void method178() { + public final void method167() { try { - this.field73.shutdown(); // L: 36 + this.field71.shutdown(); // L: 36 } catch (Exception var2) { // L: 38 System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39 } } // L: 41 - @ObfuscatedName("v") + @ObfuscatedName("gi") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1120017674" + descriptor = "(Lky;III)V", + garbageValue = "-1754195222" ) - public static boolean method175(int var0) { - return var0 >= WorldMapDecorationType.field3519.id && var0 <= WorldMapDecorationType.field3511.id || var0 == WorldMapDecorationType.field3514.id; // L: 43 - } + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3641 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3642 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3643 + if (var3 == null) { // L: 3644 + return; + } - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;B)[F", - garbageValue = "28" - ) - static float[] method186(JSONObject var0, String var1) throws JSONException { - float[] var2 = new float[4]; // L: 307 + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3645 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3646 + if (var3.contains(var4, var5)) { // L: 3647 + var4 -= var3.width / 2; // L: 3648 + var5 -= var3.height / 2; // L: 3649 + int var6 = Client.camAngleY & 2047; // L: 3650 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3651 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3652 + int var9 = var7 * var5 + var4 * var8 >> 11; // L: 3653 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3654 + int var11 = var9 + GrandExchangeEvents.localPlayer.x >> 7; // L: 3655 + int var12 = GrandExchangeEvents.localPlayer.y - var10 >> 7; // L: 3656 + PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2910, Client.packetWriter.isaacCipher); // L: 3658 + var13.packetBuffer.writeByte(18); // L: 3659 + var13.packetBuffer.method7710(var11 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 3660 + var13.packetBuffer.writeShort(var12 + VarcInt.baseY); // L: 3661 + var13.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3662 + var13.packetBuffer.writeByte(var4); // L: 3663 + var13.packetBuffer.writeByte(var5); // L: 3664 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3665 + var13.packetBuffer.writeByte(57); // L: 3666 + var13.packetBuffer.writeByte(0); // L: 3667 + var13.packetBuffer.writeByte(0); // L: 3668 + var13.packetBuffer.writeByte(89); // L: 3669 + var13.packetBuffer.writeShort(GrandExchangeEvents.localPlayer.x); // L: 3670 + var13.packetBuffer.writeShort(GrandExchangeEvents.localPlayer.y); // L: 3671 + var13.packetBuffer.writeByte(63); // L: 3672 + Client.packetWriter.addNode(var13); // L: 3673 + Client.destinationX = var11; // L: 3674 + Client.destinationY = var12; // L: 3675 + } + } - try { - JSONArray var3 = var0.getJSONArray(var1); // L: 309 - var2[0] = (float)var3.optDouble(0, 0.0D); // L: 310 - var2[1] = (float)var3.optDouble(1, 0.0D); // L: 311 - var2[2] = (float)var3.optDouble(2, 1.0D); // L: 312 - var2[3] = (float)var3.optDouble(3, 1.0D); // L: 313 - } catch (JSONException var4) { // L: 315 - var2[0] = 0.0F; // L: 316 - var2[1] = 0.0F; // L: 317 - var2[2] = 1.0F; // L: 318 - var2[3] = 1.0F; // L: 319 } - - return var2; // L: 321 - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1324190419" - ) - static int method184(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2270 - class295.Interpreter_intStackSize -= 2; // L: 2271 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2272 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2273 - EnumComposition var10 = class268.getEnum(var3); // L: 2274 - if (var10.outputType != 's') { // L: 2275 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2276 - if (var9 == var10.keys[var6]) { // L: 2277 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2278 - var10 = null; // L: 2279 - break; - } - } - - if (var10 != null) { // L: 2283 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 2284 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 2286 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2312 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2313 - EnumComposition var4 = class268.getEnum(var3); // L: 2314 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.size(); // L: 2315 - return 1; // L: 2316 - } else { - return 2; // L: 2318 - } - } else { - class295.Interpreter_intStackSize -= 4; // L: 2287 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2288 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2289 - int var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2290 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 2291 - EnumComposition var7 = class268.getEnum(var5); // L: 2292 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2293 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2298 - if (var6 == var7.keys[var8]) { // L: 2299 - if (var9 == 115) { // L: 2300 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2301 - } - - var7 = null; // L: 2302 - break; - } - } - - if (var7 != null) { // L: 2306 - if (var9 == 115) { // L: 2307 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2308 - } - } - - return 1; // L: 2310 - } else { - if (var9 == 115) { // L: 2294 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2295 - } - - return 1; // L: 2296 - } - } - } + } // L: 3678 } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java index 477ead20a5..3afa72e997 100644 --- a/runescape-client/src/main/java/class140.java +++ b/runescape-client/src/main/java/class140.java @@ -2,67 +2,82 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("eq") public class class140 extends class144 { @ObfuscatedName("v") - String field1623; - @ObfuscatedName("o") + String field1613; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1314589285 + intValue = 127019119 ) - int field1625; - @ObfuscatedName("h") - byte field1624; + int field1615; + @ObfuscatedName("i") + byte field1612; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Ler;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Lez;)V" + descriptor = "(Ler;)V" ) class140(class145 var1) { this.this$0 = var1; - this.field1623 = null; // L: 55 + this.field1613 = null; // L: 55 } // L: 59 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "3239" + descriptor = "(Lpi;B)V", + garbageValue = "23" ) - void vmethod3096(Buffer var1) { + void vmethod3152(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 62 --var1.offset; // L: 63 var1.readLong(); // L: 64 } - this.field1623 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 - this.field1625 = var1.readUnsignedShort(); // L: 67 - this.field1624 = var1.readByte(); // L: 68 + this.field1613 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 + this.field1615 = var1.readUnsignedShort(); // L: 67 + this.field1612 = var1.readByte(); // L: 68 var1.readLong(); // L: 69 } // L: 70 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;B)V", - garbageValue = "26" + descriptor = "(Lea;I)V", + garbageValue = "1764669808" ) - void vmethod3093(ClanChannel var1) { + void vmethod3153(ClanChannel var1) { ClanChannelMember var2 = new ClanChannelMember(); // L: 73 - var2.username = new Username(this.field1623); // L: 74 - var2.world = this.field1625; // L: 75 - var2.rank = this.field1624; // L: 76 + var2.username = new Username(this.field1613); // L: 74 + var2.world = this.field1615; // L: 75 + var2.rank = this.field1612; // L: 76 var1.addMember(var2); // L: 77 } // L: 78 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1416883390" + descriptor = "(I)[Ldi;", + garbageValue = "1379522153" ) - public static void method2985() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 46 - } // L: 47 + static class116[] method3045() { + return new class116[]{class116.field1403, class116.field1399, class116.field1400, class116.field1406, class116.field1401}; // L: 130 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CII)Ljava/lang/String;", + garbageValue = "1078157971" + ) + public static String method3040(char var0, int var1) { + char[] var2 = new char[var1]; // L: 169 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 170 + var2[var3] = var0; + } + + return new String(var2); // L: 171 + } } diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java index 965bbbb163..9a2222bde5 100644 --- a/runescape-client/src/main/java/class141.java +++ b/runescape-client/src/main/java/class141.java @@ -1,191 +1,61 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("ed") public class class141 extends class144 { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -945029977 + intValue = -705325855 ) - int field1629; - @ObfuscatedName("o") - byte field1626; - @ObfuscatedName("h") + int field1616; + @ObfuscatedName("c") + byte field1617; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -292002615 + intValue = -1660871845 ) - int field1627; - @ObfuscatedName("g") - String field1628; + int field1618; + @ObfuscatedName("f") + String field1619; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Ler;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Lez;)V" + descriptor = "(Ler;)V" ) class141(class145 var1) { this.this$0 = var1; - this.field1629 = -1; + this.field1616 = -1; // L: 125 } // L: 130 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "3239" + descriptor = "(Lpi;B)V", + garbageValue = "23" ) - void vmethod3096(Buffer var1) { - var1.readUnsignedByte(); - this.field1629 = var1.readUnsignedShort(); // L: 134 - this.field1626 = var1.readByte(); // L: 135 - this.field1627 = var1.readUnsignedShort(); // L: 136 + void vmethod3152(Buffer var1) { + var1.readUnsignedByte(); // L: 133 + this.field1616 = var1.readUnsignedShort(); // L: 134 + this.field1617 = var1.readByte(); // L: 135 + this.field1618 = var1.readUnsignedShort(); // L: 136 var1.readLong(); // L: 137 - this.field1628 = var1.readStringCp1252NullTerminated(); // L: 138 + this.field1619 = var1.readStringCp1252NullTerminated(); // L: 138 var1.readUnsignedByte(); // L: 139 } // L: 140 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;B)V", - garbageValue = "26" + descriptor = "(Lea;I)V", + garbageValue = "1764669808" ) - void vmethod3093(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1629); // L: 143 - var2.rank = this.field1626; // L: 144 - var2.world = this.field1627; // L: 145 - var2.username = new Username(this.field1628); // L: 146 + void vmethod3153(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1616); // L: 143 + var2.rank = this.field1617; // L: 144 + var2.world = this.field1618; // L: 145 + var2.username = new Username(this.field1619); // L: 146 } // L: 147 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;B)I", - garbageValue = "29" - ) - static final int method2990(long var0, String var2) { - Random var3 = new Random(); // L: 35 - Buffer var4 = new Buffer(128); // L: 36 - Buffer var5 = new Buffer(128); // L: 37 - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42 - var4.writeByte(10); // L: 43 - - int var7; - for (var7 = 0; var7 < 4; ++var7) { // L: 44 - var4.writeInt(var3.nextInt()); // L: 45 - } - - var4.writeInt(var6[0]); // L: 47 - var4.writeInt(var6[1]); // L: 48 - var4.writeLong(var0); // L: 49 - var4.writeLong(0L); // L: 50 - - for (var7 = 0; var7 < 4; ++var7) { // L: 51 - var4.writeInt(var3.nextInt()); // L: 52 - } - - var4.encryptRsa(class65.field861, class65.field862); // L: 54 - var5.writeByte(10); // L: 55 - - for (var7 = 0; var7 < 3; ++var7) { // L: 56 - var5.writeInt(var3.nextInt()); - } - - var5.writeLong(var3.nextLong()); // L: 59 - var5.writeLongMedium(var3.nextLong()); // L: 60 - if (Client.randomDatData != null) { // L: 62 - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 63 - } else { - byte[] var16 = class67.method1878(); // L: 66 - var5.writeBytes(var16, 0, var16.length); // L: 67 - } - - var5.writeLong(var3.nextLong()); // L: 69 - var5.encryptRsa(class65.field861, class65.field862); // L: 70 - var7 = ItemLayer.stringCp1252NullTerminatedByteSize(var2); // L: 71 - if (var7 % 8 != 0) { // L: 72 - var7 += 8 - var7 % 8; - } - - Buffer var8 = new Buffer(var7); // L: 73 - var8.writeStringCp1252NullTerminated(var2); // L: 74 - var8.offset = var7; // L: 75 - var8.xteaEncryptAll(var6); // L: 76 - Buffer var9 = new Buffer(var8.offset + var4.offset + var5.offset + 5); // L: 77 - var9.writeByte(2); // L: 78 - var9.writeByte(var4.offset); // L: 79 - var9.writeBytes(var4.array, 0, var4.offset); // L: 80 - var9.writeByte(var5.offset); // L: 81 - var9.writeBytes(var5.array, 0, var5.offset); // L: 82 - var9.writeShort(var8.offset); // L: 83 - var9.writeBytes(var8.array, 0, var8.offset); // L: 84 - String var10 = class29.method425(var9.array); // L: 85 - - try { - URL var11 = new URL(class129.method2849("services", false) + "m=accountappeal/login.ws"); // L: 87 - URLConnection var12 = var11.openConnection(); // L: 88 - var12.setDoInput(true); // L: 89 - var12.setDoOutput(true); // L: 90 - var12.setConnectTimeout(5000); // L: 91 - OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); // L: 92 - var13.write("data2=" + class126.method2817(var10) + "&dest=" + class126.method2817("passwordchoice.ws")); // L: 93 - var13.flush(); // L: 94 - InputStream var14 = var12.getInputStream(); // L: 95 - var9 = new Buffer(new byte[1000]); // L: 96 - - do { - int var15 = var14.read(var9.array, var9.offset, 1000 - var9.offset); // L: 98 - if (var15 == -1) { // L: 99 - var13.close(); // L: 105 - var14.close(); // L: 106 - String var17 = new String(var9.array); // L: 107 - if (var17.startsWith("OFFLINE")) { // L: 108 - return 4; // L: 109 - } else if (var17.startsWith("WRONG")) { // L: 111 - return 7; // L: 112 - } else if (var17.startsWith("RELOAD")) { // L: 114 - return 3; // L: 115 - } else if (var17.startsWith("Not permitted for social network accounts.")) { // L: 117 - return 6; // L: 118 - } else { - var9.xteaDecryptAll(var6); // L: 120 - - while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 121 - --var9.offset; // L: 122 - } - - var17 = new String(var9.array, 0, var9.offset); // L: 124 - if (Login.method1945(var17)) { // L: 125 - class11.openURL(var17, true, false); // L: 126 - return 2; // L: 127 - } else { - return 5; // L: 129 - } - } - } - - var9.offset += var15; // L: 100 - } while(var9.offset < 1000); // L: 101 - - return 5; // L: 102 - } catch (Throwable var18) { // L: 131 - var18.printStackTrace(); // L: 132 - return 5; // L: 133 - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1812294948" - ) - public static void method2995() { - StructComposition.StructDefinition_cached.clear(); // L: 57 - } // L: 58 } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java index cbe38b91c0..c84fcd397f 100644 --- a/runescape-client/src/main/java/class142.java +++ b/runescape-client/src/main/java/class142.java @@ -3,62 +3,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("ek") public class class142 extends class128 { - @ObfuscatedName("fr") - @ObfuscatedGetter( - intValue = -1385057085 - ) - static int field1634; - @ObfuscatedName("ic") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "[Lql;" + descriptor = "Lky;" ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 397410515 + intValue = -1140726439 ) - int field1630; + int field1623; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class142(class131 var1) { this.this$0 = var1; - this.field1630 = -1; // L: 213 + this.field1623 = -1; // L: 213 } // L: 215 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1630 = var1.readUnsignedShort(); // L: 218 + void vmethod3168(Buffer var1) { + this.field1623 = var1.readUnsignedShort(); // L: 218 } // L: 219 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2922(this.field1630); // L: 222 + void vmethod3162(ClanSettings var1) { + var1.method2963(this.field1623); // L: 222 } // L: 223 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "1" - ) - public static boolean method3004(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; // L: 13 - } } diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java index 6043a61c95..92eba48e09 100644 --- a/runescape-client/src/main/java/class143.java +++ b/runescape-client/src/main/java/class143.java @@ -3,97 +3,125 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("eb") public class class143 extends class128 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - static IndexedSprite field1639; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 7651930284509588633L + longValue = -5266391678876425789L ) - long field1636; - @ObfuscatedName("o") - String field1637; - @ObfuscatedName("h") + long field1627; + @ObfuscatedName("c") + String field1626; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1748652711 + intValue = 386086251 ) - int field1638; + int field1625; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class143(class131 var1) { this.this$0 = var1; - this.field1636 = -1L; // L: 93 - this.field1637 = null; // L: 94 - this.field1638 = 0; // L: 95 + this.field1627 = -1L; // L: 93 + this.field1626 = null; // L: 94 + this.field1625 = 0; // L: 95 } // L: 97 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { + void vmethod3168(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 100 --var1.offset; // L: 101 - this.field1636 = var1.readLong(); // L: 102 + this.field1627 = var1.readLong(); // L: 102 } - this.field1637 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field1638 = var1.readUnsignedShort(); // L: 105 + this.field1626 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field1625 = var1.readUnsignedShort(); // L: 105 } // L: 106 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" - ) - void vmethod3104(ClanSettings var1) { - var1.method2918(this.field1636, this.field1637, this.field1638); // L: 109 - } // L: 110 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)Lkn;", - garbageValue = "1044730683" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = HorizontalAlignment.getWidget(var0); // L: 230 - if (var1 == -1) { // L: 231 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 232 233 - } - } - @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lgo;", - garbageValue = "1616770151" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 316 - if (var1 != null) { // L: 317 - return var1; - } else { - var1 = class346.method6480(SequenceDefinition.SequenceDefinition_animationsArchive, DevicePcmPlayerProvider.SequenceDefinition_skeletonsArchive, var0, false); // L: 318 - if (var1 != null) { // L: 319 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } + void vmethod3162(ClanSettings var1) { + var1.method2959(this.field1627, this.field1626, this.field1625); // L: 109 + } // L: 110 - return var1; // L: 320 + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "34" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 60 + if (var0 < 0 || var0 >= 65536) { // L: 61 + var0 >>>= 16; // L: 62 + var1 += 16; // L: 63 } + + if (var0 >= 256) { // L: 65 + var0 >>>= 8; // L: 66 + var1 += 8; // L: 67 + } + + if (var0 >= 16) { // L: 69 + var0 >>>= 4; // L: 70 + var1 += 4; // L: 71 + } + + if (var0 >= 4) { // L: 73 + var0 >>>= 2; // L: 74 + var1 += 2; // L: 75 + } + + if (var0 >= 1) { // L: 77 + var0 >>>= 1; // L: 78 + ++var1; // L: 79 + } + + return var0 + var1; // L: 81 } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "345981332" + ) + static void method3072() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11881 + int var1 = var0.group; // L: 11882 + if (class155.loadInterface(var1)) { // L: 11883 + boolean var2 = true; // L: 11884 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11885 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11886 + if (var3[var4] != null) { // L: 11887 + var2 = var3[var4].isIf3; // L: 11888 + break; + } + } + + if (!var2) { // L: 11892 + var4 = (int)var0.key; // L: 11893 + Widget var5 = class127.getWidget(var4); // L: 11894 + if (var5 != null) { // L: 11895 + class346.invalidateWidget(var5); + } + } + } + } + + } // L: 11899 } diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index 68cd6213c3..2691c6746a 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -1,60 +1,135 @@ +import java.io.IOException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ew") public abstract class class144 extends Node { + @ObfuscatedName("o") + public static short[][] field1629; + class144() { - } // L: 49 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "3239" + descriptor = "(Lpi;B)V", + garbageValue = "23" ) - abstract void vmethod3096(Buffer var1); + abstract void vmethod3152(Buffer var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;B)V", - garbageValue = "26" + descriptor = "(Lea;I)V", + garbageValue = "1764669808" ) - abstract void vmethod3093(ClanChannel var1); + abstract void vmethod3153(ClanChannel var1); - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", - garbageValue = "-413374556" + descriptor = "(Lln;Lln;ZIB)V", + garbageValue = "64" ) - static void method3022(Float var0, Float var1) { - if (var0 + class114.field1396 < 1.3333334F) { // L: 283 - float var2 = var0 - 2.0F; // L: 284 - float var3 = var0 - 1.0F; // L: 285 - float var4 = (float)Math.sqrt((double)(var2 * var2 - var3 * 4.0F * var3)); // L: 286 - float var5 = (var4 + -var2) * 0.5F; // L: 287 - if (var1 + class114.field1396 > var5) { // L: 288 - var1 = var5 - class114.field1396; // L: 289 + static void method3080(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 159 + if (var3 == 4) { // L: 160 + Ignored.method6828(4); // L: 161 + } + + } else { + if (var3 == 0) { // L: 165 + class348.method6505(var2); // L: 166 } else { - var5 = (-var2 - var4) * 0.5F; // L: 292 - if (var1 < var5 + class114.field1396) { // L: 293 - var1 = class114.field1396 + var5; // L: 294 + Ignored.method6828(var3); // L: 169 + } + + Rasterizer2D.Rasterizer2D_clear(); // L: 171 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 172 + class17.leftTitleSprite = Interpreter.method1889(var4); // L: 173 + ViewportMouse.rightTitleSprite = class17.leftTitleSprite.mirrorHorizontally(); // L: 174 + class260.method5174(var1, Client.worldProperties); // L: 175 + Login.titleboxSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 176 + Login.titlebuttonSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 177 + class296.field3496 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 178 + class259.field2887 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 179 + AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 180 + Login.runesSprite = class93.method2386(var1, "runes", ""); // L: 181 + class92.title_muteSprite = class93.method2386(var1, "title_mute", ""); // L: 182 + WorldMapSection2.options_buttons_0Sprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 183 + class93.field1254 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 184 + class54.options_buttons_2Sprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 185 + ParamComposition.field1983 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 186 + AbstractSocket.field4275 = WorldMapSection2.options_buttons_0Sprite.subWidth; // L: 187 + Occluder.field2687 = WorldMapSection2.options_buttons_0Sprite.subHeight; // L: 188 + class341.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 189 + if (var2) { // L: 190 + Login.Login_username = ""; // L: 191 + Login.Login_password = ""; // L: 192 + Login.field904 = new String[8]; // L: 193 + Login.field903 = 0; // L: 194 + } + + WorldMapID.field2386 = 0; // L: 196 + HealthBar.otp = ""; // L: 197 + Login.field907 = true; // L: 198 + Login.worldSelectOpen = false; // L: 199 + if (!class131.clientPreferences.method2279()) { // L: 200 + Archive var5 = class16.archive6; // L: 201 + int var6 = var5.getGroupId("scape main"); // L: 203 + int var7 = var5.getFileId(var6, ""); // L: 204 + NPCComposition.method3530(2, var5, var6, var7, 255, false); // L: 205 + } else { + Actor.method2183(2); // L: 208 + } + + if (NetCache.NetCache_socket != null) { // L: 210 + try { + Buffer var11 = new Buffer(4); // L: 212 + var11.writeByte(3); // L: 213 + var11.writeMedium(0); // L: 214 + NetCache.NetCache_socket.write(var11.array, 0, 4); // L: 215 + } catch (IOException var10) { + try { + NetCache.NetCache_socket.close(); // L: 219 + } catch (Exception var9) { // L: 221 + } + + ++NetCache.NetCache_ioExceptions; // L: 222 + NetCache.NetCache_socket = null; // L: 223 } } - } else { - var0 = 1.3333334F - class114.field1396; // L: 299 - var1 = 0.33333334F - class114.field1396; // L: 300 + + Login.clearLoginScreen = true; // L: 226 + Login.xPadding = (InvDefinition.canvasWidth - 765) / 2; // L: 227 + Login.loginBoxX = Login.xPadding + 202; // L: 228 + HealthBarDefinition.loginBoxCenter = Login.loginBoxX + 180; // L: 229 + class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 230 + ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 231 + Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 232 } + } // L: 163 233 - } // L: 302 - - @ObfuscatedName("gy") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1886110394" + descriptor = "(IB)I", + garbageValue = "-9" ) - static void method3014() { - if (class19.localPlayer.x >> 7 == Client.destinationX && class19.localPlayer.y >> 7 == Client.destinationY) { // L: 4282 - Client.destinationX = 0; // L: 4283 + public static int method3081(int var0) { + return class400.field4391[var0 & 16383]; // L: 32 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "([BIIB)I", + garbageValue = "18" + ) + public static int method3082(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 47 + + for (int var4 = var1; var4 < var2; ++var4) { // L: 48 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 } - } // L: 4285 + var3 = ~var3; // L: 51 + return var3; // L: 52 + } } diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java index fab28d3373..8db7b7fd62 100644 --- a/runescape-client/src/main/java/class145.java +++ b/runescape-client/src/main/java/class145.java @@ -3,47 +3,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("er") public class class145 { - @ObfuscatedName("eh") + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llx;" ) - @Export("archive7") - static Archive archive7; + @Export("archive8") + static Archive archive8; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -7880473209241660409L + longValue = -8660248817658951919L ) - long field1651; - @ObfuscatedName("o") + long field1633; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 7161139519803830859L + longValue = 945677273558696457L ) - long field1644; - @ObfuscatedName("h") + long field1635; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llk;" ) - IterableNodeDeque field1647; + IterableNodeDeque field1632; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) public class145(Buffer var1) { - this.field1644 = -1L; // L: 10 - this.field1647 = new IterableNodeDeque(); // L: 11 - this.method3024(var1); // L: 19 + this.field1635 = -1L; // L: 10 + this.field1632 = new IterableNodeDeque(); // L: 11 + this.method3084(var1); // L: 19 } // L: 20 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1820436577" + descriptor = "(Lpi;I)V", + garbageValue = "1488842408" ) - void method3024(Buffer var1) { - this.field1651 = var1.readLong(); // L: 23 - this.field1644 = var1.readLong(); // L: 24 + void method3084(Buffer var1) { + this.field1633 = var1.readLong(); // L: 23 + this.field1635 = var1.readLong(); // L: 24 for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36 Object var3; @@ -63,39 +63,88 @@ public class class145 { var3 = new class141(this); } - ((class144)var3).vmethod3096(var1); // L: 34 - this.field1647.addFirst((Node)var3); // L: 35 + ((class144)var3).vmethod3152(var1); // L: 34 + this.field1632.addFirst((Node)var3); // L: 35 } } // L: 38 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "451732035" + descriptor = "(Lea;I)V", + garbageValue = "1969966641" ) - public void method3030(ClanChannel var1) { - if (this.field1651 == var1.key && var1.field1664 == this.field1644) { // L: 41 - for (class144 var2 = (class144)this.field1647.last(); var2 != null; var2 = (class144)this.field1647.previous()) { // L: 42 - var2.vmethod3093(var1); // L: 43 + public void method3086(ClanChannel var1) { + if (var1.key == this.field1633 && var1.field1656 == this.field1635) { // L: 41 + for (class144 var2 = (class144)this.field1632.last(); var2 != null; var2 = (class144)this.field1632.previous()) { // L: 42 + var2.vmethod3153(var1); // L: 43 } - ++var1.field1664; // L: 45 + ++var1.field1656; // L: 45 } else { throw new RuntimeException(""); } } // L: 46 - @ObfuscatedName("fh") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1527642591" + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "803323107" ) - static void method3032(int var0, int var1) { - if (Interpreter.clientPreferences.method2288() != 0 && var0 != -1) { // L: 3365 - WorldMapSection2.method4561(class268.archive11, var0, 0, Interpreter.clientPreferences.method2288(), false); // L: 3366 - Client.field731 = true; // L: 3367 - } + static String method3085(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 110 + if (var2 && var0 >= 0) { // L: 111 + int var3 = 2; // L: 112 - } // L: 3369 + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 113 114 116 + var4 /= var1; // L: 115 + } + + char[] var5 = new char[var3]; // L: 118 + var5[0] = '+'; // L: 119 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 120 + int var7 = var0; // L: 121 + var0 /= var1; // L: 122 + int var8 = var7 - var0 * var1; // L: 123 + if (var8 >= 10) { // L: 124 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 125 + } + } + + return new String(var5); // L: 127 + } else { + return Integer.toString(var0, var1); + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-62" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4722 + if (class155.loadInterface(var0)) { // L: 4723 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4724 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725 + Widget var3 = var1[var2]; // L: 4726 + if (var3.onLoad != null) { // L: 4727 + ScriptEvent var4 = new ScriptEvent(); // L: 4728 + var4.widget = var3; // L: 4729 + var4.args = var3.onLoad; // L: 4730 + Interpreter.runScript(var4, 5000000, 0); // L: 4731 + } + } + + } + } + } // L: 4734 } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java index dead090f4d..06a35cb99e 100644 --- a/runescape-client/src/main/java/class146.java +++ b/runescape-client/src/main/java/class146.java @@ -3,316 +3,76 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("et") public class class146 extends class128 { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1735785845 + intValue = 1180397183 ) - int field1653; - @ObfuscatedName("o") + int field1645; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -463030185 + intValue = -176284947 ) - int field1652; + int field1640; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class146(class131 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 271 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1653 = var1.readInt(); // L: 274 - this.field1652 = var1.readInt(); - } + void vmethod3168(Buffer var1) { + this.field1645 = var1.readInt(); // L: 274 + this.field1640 = var1.readInt(); // L: 275 + } // L: 276 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2927(this.field1653, this.field1652); - } + void vmethod3162(ClanSettings var1) { + var1.method2968(this.field1645, this.field1640); // L: 279 + } // L: 280 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IILge;Lgf;B)Z", - garbageValue = "46" + descriptor = "(IB)Lgj;", + garbageValue = "0" ) - static final boolean method3041(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 197 - int var5 = var1; // L: 198 - byte var6 = 64; // L: 199 - byte var7 = 64; // L: 200 - int var8 = var0 - var6; // L: 201 - int var9 = var1 - var7; // L: 202 - class194.directions[var6][var7] = 99; // L: 203 - class194.distances[var6][var7] = 0; // L: 204 - byte var10 = 0; // L: 205 - int var11 = 0; // L: 206 - class194.bufferX[var10] = var0; // L: 207 - byte var10001 = var10; - int var18 = var10 + 1; - class194.bufferY[var10001] = var1; // L: 208 - int[][] var12 = var3.flags; // L: 209 - - while (var11 != var18) { // L: 210 - var4 = class194.bufferX[var11]; // L: 211 - var5 = class194.bufferY[var11]; // L: 212 - var11 = var11 + 1 & 4095; // L: 213 - int var16 = var4 - var8; // L: 214 - int var17 = var5 - var9; // L: 215 - int var13 = var4 - var3.xInset; // L: 216 - int var14 = var5 - var3.yInset; // L: 217 - if (var2.hasArrived(2, var4, var5, var3)) { // L: 218 - VarpDefinition.field1819 = var4; // L: 219 - class194.field2202 = var5; // L: 220 - return true; // L: 221 - } - - int var15 = class194.distances[var16][var17] + 1; // L: 223 - if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 224 225 226 227 - class194.bufferX[var18] = var4 - 1; // L: 228 - class194.bufferY[var18] = var5; // L: 229 - var18 = var18 + 1 & 4095; // L: 230 - class194.directions[var16 - 1][var17] = 2; // L: 231 - class194.distances[var16 - 1][var17] = var15; // L: 232 - } - - if (var16 < 126 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 234 235 236 237 - class194.bufferX[var18] = var4 + 1; // L: 238 - class194.bufferY[var18] = var5; // L: 239 - var18 = var18 + 1 & 4095; // L: 240 - class194.directions[var16 + 1][var17] = 8; // L: 241 - class194.distances[var16 + 1][var17] = var15; // L: 242 - } - - if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 244 245 246 247 - class194.bufferX[var18] = var4; // L: 248 - class194.bufferY[var18] = var5 - 1; // L: 249 - var18 = var18 + 1 & 4095; // L: 250 - class194.directions[var16][var17 - 1] = 1; // L: 251 - class194.distances[var16][var17 - 1] = var15; // L: 252 - } - - if (var17 < 126 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 254 255 256 257 - class194.bufferX[var18] = var4; // L: 258 - class194.bufferY[var18] = var5 + 1; // L: 259 - var18 = var18 + 1 & 4095; // L: 260 - class194.directions[var16][var17 + 1] = 4; // L: 261 - class194.distances[var16][var17 + 1] = var15; // L: 262 - } - - if (var16 > 0 && var17 > 0 && class194.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 264 265 266 267 268 - class194.bufferX[var18] = var4 - 1; // L: 269 - class194.bufferY[var18] = var5 - 1; // L: 270 - var18 = var18 + 1 & 4095; // L: 271 - class194.directions[var16 - 1][var17 - 1] = 3; // L: 272 - class194.distances[var16 - 1][var17 - 1] = var15; // L: 273 - } - - if (var16 < 126 && var17 > 0 && class194.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 275 276 277 278 279 - class194.bufferX[var18] = var4 + 1; // L: 280 - class194.bufferY[var18] = var5 - 1; // L: 281 - var18 = var18 + 1 & 4095; // L: 282 - class194.directions[var16 + 1][var17 - 1] = 9; // L: 283 - class194.distances[var16 + 1][var17 - 1] = var15; // L: 284 - } - - if (var16 > 0 && var17 < 126 && class194.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 286 287 288 289 290 - class194.bufferX[var18] = var4 - 1; // L: 291 - class194.bufferY[var18] = var5 + 1; // L: 292 - var18 = var18 + 1 & 4095; // L: 293 - class194.directions[var16 - 1][var17 + 1] = 6; // L: 294 - class194.distances[var16 - 1][var17 + 1] = var15; // L: 295 - } - - if (var16 < 126 && var17 < 126 && class194.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 297 298 299 300 301 - class194.bufferX[var18] = var4 + 1; // L: 302 - class194.bufferY[var18] = var5 + 1; // L: 303 - var18 = var18 + 1 & 4095; // L: 304 - class194.directions[var16 + 1][var17 + 1] = 12; // L: 305 - class194.distances[var16 + 1][var17 + 1] = var15; // L: 306 - } - } - - VarpDefinition.field1819 = var4; // L: 309 - class194.field2202 = var5; // L: 310 - return false; // L: 311 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1112634096" - ) - public static void method3040() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 171 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 172 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 173 - } // L: 174 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILkn;IIIII[FB)Lkn;", - garbageValue = "125" - ) - static Widget method3043(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { - Widget var8 = new Widget(); // L: 897 - var8.type = var0; // L: 898 - var8.parentId = var1.id; // L: 899 - var8.childIndex = var2; // L: 900 - var8.isIf3 = true; // L: 901 - var8.xAlignment = var3; // L: 902 - var8.yAlignment = var4; // L: 903 - var8.widthAlignment = var5; // L: 904 - var8.heightAlignment = var6; // L: 905 - var8.rawX = (int)((float)var1.width * var7[0]); // L: 906 - var8.rawY = (int)(var7[1] * (float)var1.height); // L: 907 - var8.rawWidth = (int)(var7[2] * (float)var1.width); // L: 908 - var8.rawHeight = (int)((float)var1.height * var7[3]); // L: 909 - return var8; // L: 910 - } - - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "(ZLpy;I)V", - garbageValue = "1921667201" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 5076 - int var2; - int var3; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 5077 - var2 = var1.method7935(); // L: 5078 - var3 = var1.method7935(); // L: 5079 - int var4 = var1.readUnsignedShort(); // L: 5080 - Message.xteaKeys = new int[var4][4]; // L: 5081 - - for (var5 = 0; var5 < var4; ++var5) { // L: 5082 - for (var6 = 0; var6 < 4; ++var6) { // L: 5083 - Message.xteaKeys[var5][var6] = var1.readInt(); // L: 5084 - } - } - - class123.regions = new int[var4]; // L: 5087 - ObjectComposition.regionMapArchiveIds = new int[var4]; // L: 5088 - Message.regionLandArchiveIds = new int[var4]; // L: 5089 - WorldMapSectionType.regionLandArchives = new byte[var4][]; // L: 5090 - Occluder.regionMapArchives = new byte[var4][]; // L: 5091 - boolean var16 = false; // L: 5092 - if (Client.field753) { // L: 5093 - if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5094 - var16 = true; - } - - if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5095 - var16 = true; - } - } - - var4 = 0; // L: 5097 - - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5098 - for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5099 - var8 = var7 + (var6 << 8); // L: 5100 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5101 - class123.regions[var4] = var8; // L: 5102 - ObjectComposition.regionMapArchiveIds[var4] = class302.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5103 - Message.regionLandArchiveIds[var4] = class302.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5104 - ++var4; // L: 5105 - } - } - } - - class321.method6030(var2, var3, true); // L: 5108 + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73 + if (var1 != null) { // L: 74 + return var1; } else { - var2 = var1.method7971(); // L: 5111 - var3 = var1.method7798(); // L: 5112 - boolean var15 = var1.readUnsignedByte() == 1; // L: 5113 - var5 = var1.readUnsignedShort(); // L: 5114 - var1.importIndex(); // L: 5115 - - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 5116 - for (var7 = 0; var7 < 13; ++var7) { // L: 5117 - for (var8 = 0; var8 < 13; ++var8) { // L: 5118 - var9 = var1.readBits(1); // L: 5119 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5120 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5121 - } - } - } + byte[] var2 = WorldMapData_0.ObjectDefinition_archive.takeFile(6, var0); // L: 75 + var1 = new ObjectComposition(); // L: 76 + var1.id = var0; // L: 77 + if (var2 != null) { // L: 78 + var1.decode(new Buffer(var2)); } - var1.exportIndex(); // L: 5125 - Message.xteaKeys = new int[var5][4]; // L: 5126 - - for (var6 = 0; var6 < var5; ++var6) { // L: 5127 - for (var7 = 0; var7 < 4; ++var7) { // L: 5128 - Message.xteaKeys[var6][var7] = var1.readInt(); // L: 5129 - } + var1.postDecode(); // L: 79 + if (var1.isSolid) { // L: 80 + var1.interactType = 0; // L: 81 + var1.boolean1 = false; // L: 82 } - class123.regions = new int[var5]; // L: 5132 - ObjectComposition.regionMapArchiveIds = new int[var5]; // L: 5133 - Message.regionLandArchiveIds = new int[var5]; // L: 5134 - WorldMapSectionType.regionLandArchives = new byte[var5][]; // L: 5135 - Occluder.regionMapArchives = new byte[var5][]; // L: 5136 - var5 = 0; // L: 5137 - - for (var6 = 0; var6 < 4; ++var6) { // L: 5138 - for (var7 = 0; var7 < 13; ++var7) { // L: 5139 - for (var8 = 0; var8 < 13; ++var8) { // L: 5140 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5141 - if (var9 != -1) { // L: 5142 - int var10 = var9 >> 14 & 1023; // L: 5143 - int var11 = var9 >> 3 & 2047; // L: 5144 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5145 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 5146 - if (class123.regions[var13] == var12) { - var12 = -1; // L: 5147 - break; // L: 5148 - } - } - - if (var12 != -1) { // L: 5150 - class123.regions[var5] = var12; // L: 5151 - var13 = var12 >> 8 & 255; // L: 5152 - int var14 = var12 & 255; // L: 5153 - ObjectComposition.regionMapArchiveIds[var5] = class302.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5154 - Message.regionLandArchiveIds[var5] = class302.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5155 - ++var5; // L: 5156 - } - } - } - } - } - - class321.method6030(var3, var2, !var15); // L: 5162 + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84 + return var1; // L: 85 } - - } // L: 5164 + } } diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java index ca6732231e..c5d639299e 100644 --- a/runescape-client/src/main/java/class147.java +++ b/runescape-client/src/main/java/class147.java @@ -3,90 +3,71 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("ee") public class class147 extends class128 { - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; + @Export("KitDefinition_modelsArchive") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("n") + @Export("Tiles_shapes") + static byte[][][] Tiles_shapes; + @ObfuscatedName("ih") + @ObfuscatedGetter( + intValue = -882300729 + ) + @Export("cameraPitch") + static int cameraPitch; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -774752119 + intValue = -1886878919 ) - int field1658; + int field1651; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class147(class131 var1) { this.this$0 = var1; - this.field1658 = -1; // L: 144 + this.field1651 = -1; // L: 144 } // L: 146 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1658 = var1.readUnsignedShort(); // L: 149 + void vmethod3168(Buffer var1) { + this.field1651 = var1.readUnsignedShort(); // L: 149 } // L: 150 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2924(this.field1658); // L: 153 + void vmethod3162(ClanSettings var1) { + var1.method2965(this.field1651); // L: 153 } // L: 154 - @ObfuscatedName("gk") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "57" + descriptor = "(Ldt;FI)F", + garbageValue = "-952832501" ) - static final void method3052() { - int var0 = PcmPlayer.field302 * 128 + 64; // L: 3556 - int var1 = DevicePcmPlayerProvider.field146 * 128 + 64; // L: 3557 - int var2 = Archive.getTileHeight(var0, var1, class160.Client_plane) - ClanSettings.field1608; // L: 3558 - class428.method7654(var0, var2, var1); // L: 3559 - var0 = class12.field62 * 128 + 64; // L: 3560 - var1 = WorldMapSectionType.field2778 * 128 + 64; // L: 3561 - var2 = Archive.getTileHeight(var0, var1, class160.Client_plane) - class351.field4157; // L: 3562 - int var3 = var0 - EnumComposition.cameraX; // L: 3563 - int var4 = var2 - FriendSystem.cameraY; // L: 3564 - int var5 = var1 - CollisionMap.cameraZ; // L: 3565 - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); // L: 3566 - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3567 - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3568 - class132.method2864(var7, var8); // L: 3569 - } // L: 3570 - - @ObfuscatedName("lo") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "-53" - ) - static final void method3051(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { // L: 11766 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3056()) { // L: 11767 - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11768 - PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 11769 - var4.packetBuffer.writeByte(4 + ItemLayer.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 11770 - var4.packetBuffer.writeByte(var0); // L: 11771 - var4.packetBuffer.writeShort(var1); // L: 11772 - var4.packetBuffer.writeBoolean(var2); // L: 11773 - var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 11774 - Client.packetWriter.addNode(var4); // L: 11775 - } + static float method3106(class117 var0, float var1) { + if (var0 == null) { // L: 191 + return 0.0F; // L: 192 + } else { + float var2 = var1 - var0.field1422; // L: 194 + return var0.field1415[3] + (var0.field1415[2] + (var0.field1415[1] + var2 * var0.field1415[0]) * var2) * var2; // L: 195 } - } // L: 11776 + } } diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java index f39763bfed..00e02cb2dd 100644 --- a/runescape-client/src/main/java/class149.java +++ b/runescape-client/src/main/java/class149.java @@ -1,419 +1,228 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("es") +@ObfuscatedName("eu") public class class149 { - @ObfuscatedName("ah") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-2047833702" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-55422083" ) - static int method3081(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 4118 - var3 = class160.Client_plane; // L: 4119 - int var15 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 4120 - int var8 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 4121 - StudioGame.getWorldMap().method7313(var3, var15, var8, true); // L: 4122 - return 1; // L: 4123 + static final void method3138(String var0) { + Actor.addGameMessage(30, "", var0); // L: 102 + } // L: 103 + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(Lcb;IB)V", + garbageValue = "-21" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.field1143 >= Client.cycle) { // L: 3919 + UserComparator8.method2578(var0); } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4125 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4126 - String var16 = ""; // L: 4127 - var9 = StudioGame.getWorldMap().getMapArea(var3); // L: 4128 - if (var9 != null) { // L: 4129 - var16 = var9.getExternalName(); // L: 4130 + int var3; + int var4; + int var5; + int var7; + int var11; + if (var0.field1163 >= Client.cycle) { // L: 3920 + if (var0.field1163 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class163.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3921 + var11 = var0.field1163 - var0.field1143; // L: 3922 + var3 = Client.cycle - var0.field1143; // L: 3923 + var4 = var0.field1150 * 64 + var0.field1129 * 128; // L: 3924 + var5 = var0.field1150 * 64 + var0.field1160 * 128; // L: 3925 + int var12 = var0.field1150 * 64 + var0.field1132 * 128; // L: 3926 + var7 = var0.field1150 * 64 + var0.field1161 * 128; // L: 3927 + var0.x = (var12 * var3 + var4 * (var11 - var3)) / var11; // L: 3928 + var0.y = (var3 * var7 + var5 * (var11 - var3)) / var11; // L: 3929 } - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var16; // L: 4132 - return 1; // L: 4133 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4135 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4136 - StudioGame.getWorldMap().setCurrentMapAreaId(var3); // L: 4137 - return 1; // L: 4138 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4140 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getZoomLevel(); // L: 4141 - return 1; // L: 4142 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4144 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4145 - StudioGame.getWorldMap().setZoomPercentage(var3); // L: 4146 - return 1; // L: 4147 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4149 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4150 - return 1; // L: 4151 + var0.field1179 = 0; // L: 3931 + var0.orientation = var0.field1135; // L: 3932 + var0.rotation = var0.orientation; // L: 3933 } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4153 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4154 - StudioGame.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4155 - return 1; // L: 4156 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4158 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4159 - StudioGame.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4160 - return 1; // L: 4161 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4163 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4164 - StudioGame.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4165 - return 1; // L: 4166 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4168 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4169 - StudioGame.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4170 - return 1; // L: 4171 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4173 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayX(); // L: 4174 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayY(); // L: 4175 - return 1; // L: 4176 + var0.movementSequence = var0.idleSequence; // L: 3936 + if (var0.pathLength == 0) { // L: 3937 + var0.field1179 = 0; // L: 3938 } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4178 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4179 - var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4180 - if (var11 == null) { // L: 4181 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4182 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4185 - } - - return 1; // L: 4187 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4189 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4190 - var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4191 - if (var11 == null) { // L: 4192 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4193 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4194 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4197 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4198 - } - - return 1; // L: 4200 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4202 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4203 - var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4204 - if (var11 == null) { // L: 4205 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4206 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4207 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4208 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4209 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4212 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4213 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4214 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4215 - } - - return 1; // L: 4217 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4219 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4220 - var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4221 - if (var11 == null) { // L: 4222 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4223 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4226 - } - - return 1; // L: 4228 - } else if (var0 == 6615) { // L: 4230 - var14 = StudioGame.getWorldMap().getDisplayCoord(); // L: 4231 - if (var14 == null) { // L: 4232 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4233 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4234 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var14.x; // L: 4237 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var14.y; // L: 4238 - } - - return 1; // L: 4240 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4242 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().currentMapAreaId(); // L: 4243 - return 1; // L: 4244 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4246 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4247 - var11 = StudioGame.getWorldMap().getCurrentMapArea(); // L: 4248 - if (var11 == null) { // L: 4249 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4250 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4251 - return 1; // L: 4252 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4254 - if (var12 == null) { // L: 4255 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4256 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4257 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12[0]; // L: 4260 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12[1]; // L: 4261 + label286: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3941 + SequenceDefinition var2 = class163.SequenceDefinition_get(var0.sequence); // L: 3942 + if (var0.field1170 > 0 && var2.field2159 == 0) { // L: 3943 + ++var0.field1179; // L: 3944 + break label286; // L: 3945 } - return 1; // L: 4263 - } - } else { - Coord var5; - if (var0 == 6618) { // L: 4265 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4266 - var11 = StudioGame.getWorldMap().getCurrentMapArea(); // L: 4267 - if (var11 == null) { // L: 4268 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4269 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4270 - return 1; // L: 4271 - } else { - var5 = var11.coord(var14.x, var14.y); // L: 4273 - if (var5 == null) { // L: 4274 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4275 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.packed(); // L: 4278 - } - - return 1; // L: 4280 + if (var0.field1170 <= 0 && var2.field2158 == 0) { // L: 3947 + ++var0.field1179; // L: 3948 + break label286; // L: 3949 } - } else { - Coord var10; - if (var0 == 6619) { // L: 4282 - class295.Interpreter_intStackSize -= 2; // L: 4283 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4284 - var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4285 - class263.method5204(var3, var10, false); // L: 4286 - return 1; // L: 4287 - } else if (var0 == 6620) { // L: 4289 - class295.Interpreter_intStackSize -= 2; // L: 4290 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4291 - var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4292 - class263.method5204(var3, var10, true); // L: 4293 - return 1; // L: 4294 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4296 - class295.Interpreter_intStackSize -= 2; // L: 4297 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4298 - var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4299 - var9 = StudioGame.getWorldMap().getMapArea(var3); // L: 4300 - if (var9 == null) { // L: 4301 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4302 - return 1; // L: 4303 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4305 - return 1; // L: 4306 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4308 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayWith(); // L: 4309 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayHeight(); // L: 4310 - return 1; // L: 4311 - } else if (var0 == 6623) { // L: 4313 - var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4314 - var11 = StudioGame.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4315 - if (var11 == null) { // L: 4316 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4317 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getId(); // L: 4320 - } + } - return 1; // L: 4322 - } else if (var0 == 6624) { // L: 4324 - StudioGame.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4325 - return 1; // L: 4326 - } else if (var0 == 6625) { // L: 4328 - StudioGame.getWorldMap().resetMaxFlashCount(); // L: 4329 - return 1; // L: 4330 - } else if (var0 == 6626) { // L: 4332 - StudioGame.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4333 - return 1; // L: 4334 - } else if (var0 == 6627) { // L: 4336 - StudioGame.getWorldMap().resetCyclesPerFlash(); // L: 4337 - return 1; // L: 4338 + var11 = var0.x; // L: 3952 + var3 = var0.y; // L: 3953 + var4 = var0.field1150 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3954 + var5 = var0.field1150 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3955 + if (var11 < var4) { // L: 3956 + if (var3 < var5) { // L: 3957 + var0.orientation = 1280; + } else if (var3 > var5) { // L: 3958 + var0.orientation = 1792; } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4340 - var13 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 4341 - StudioGame.getWorldMap().setPerpetualFlash(var13); // L: 4342 - return 1; // L: 4343 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4345 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4346 - StudioGame.getWorldMap().flashElement(var3); // L: 4347 - return 1; // L: 4348 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4350 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4351 - StudioGame.getWorldMap().flashCategory(var3); // L: 4352 - return 1; // L: 4353 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4355 - StudioGame.getWorldMap().stopCurrentFlashes(); // L: 4356 - return 1; // L: 4357 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4359 - var13 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 4360 - StudioGame.getWorldMap().setElementsDisabled(var13); // L: 4361 - return 1; // L: 4362 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4364 - class295.Interpreter_intStackSize -= 2; // L: 4365 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4366 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 4367 - StudioGame.getWorldMap().disableElement(var3, var7); // L: 4368 - return 1; // L: 4369 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4371 - class295.Interpreter_intStackSize -= 2; // L: 4372 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4373 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 4374 - StudioGame.getWorldMap().setCategoryDisabled(var3, var7); // L: 4375 - return 1; // L: 4376 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4378 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4379 - return 1; // L: 4380 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4382 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4383 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4384 - return 1; // L: 4385 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4387 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4388 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4389 - return 1; // L: 4390 - } else if (var0 == 6638) { // L: 4392 - class295.Interpreter_intStackSize -= 2; // L: 4393 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4394 - var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4395 - var5 = StudioGame.getWorldMap().method7342(var3, var10); // L: 4396 - if (var5 == null) { // L: 4397 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4398 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.packed(); // L: 4401 - } + var0.orientation = 1536; // L: 3959 + } + } else if (var11 > var4) { // L: 3961 + if (var3 < var5) { // L: 3962 + var0.orientation = 768; + } else if (var3 > var5) { // L: 3963 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3964 + } + } else if (var3 < var5) { // L: 3966 + var0.orientation = 1024; + } else if (var3 > var5) { // L: 3967 + var0.orientation = 0; + } - return 1; // L: 4403 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4405 - var6 = StudioGame.getWorldMap().iconStart(); // L: 4406 - if (var6 == null) { // L: 4407 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4408 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4409 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4412 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4413 - } + class193 var6 = var0.pathTraversed[var0.pathLength - 1]; // L: 3968 + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3969 + var7 = var0.orientation - var0.rotation & 2047; // L: 3976 + if (var7 > 1024) { // L: 3977 + var7 -= 2048; + } - return 1; // L: 4415 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4417 - var6 = StudioGame.getWorldMap().iconNext(); // L: 4418 - if (var6 == null) { // L: 4419 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4420 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4421 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4424 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4425 - } + int var8 = var0.walkBackSequence; // L: 3978 + if (var7 >= -256 && var7 <= 256) { // L: 3979 + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { // L: 3980 + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { // L: 3981 + var8 = var0.walkLeftSequence; + } - return 1; // L: 4427 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4429 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4430 - var4 = class19.WorldMapElement_get(var3); // L: 4431 - if (var4.name == null) { // L: 4432 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4433 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.name; // L: 4436 - } + if (var8 == -1) { // L: 3982 + var8 = var0.walkSequence; + } - return 1; // L: 4438 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4440 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4441 - var4 = class19.WorldMapElement_get(var3); // L: 4442 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.textSize; // L: 4443 - return 1; // L: 4444 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4446 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4447 - var4 = class19.WorldMapElement_get(var3); // L: 4448 - if (var4 == null) { // L: 4449 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4450 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.category; // L: 4453 - } + var0.movementSequence = var8; // L: 3983 + int var9 = 4; // L: 3984 + boolean var10 = true; // L: 3985 + if (var0 instanceof NPC) { // L: 3986 + var10 = ((NPC)var0).definition.isClickable; + } - return 1; // L: 4455 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4457 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4458 - var4 = class19.WorldMapElement_get(var3); // L: 4459 - if (var4 == null) { // L: 4460 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4461 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4464 - } + if (var10) { // L: 3987 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1175 != 0) { // L: 3988 + var9 = 2; + } - return 1; // L: 4466 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4468 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class293.worldMapEvent.mapElement; // L: 4469 - return 1; // L: 4470 - } else if (var0 == 6698) { // L: 4472 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class293.worldMapEvent.coord1.packed(); // L: 4473 - return 1; // L: 4474 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4476 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class293.worldMapEvent.coord2.packed(); // L: 4477 - return 1; // L: 4478 - } else { - return 2; // L: 4480 - } - } + if (var0.pathLength > 2) { // L: 3989 + var9 = 6; + } + + if (var0.pathLength > 3) { // L: 3990 + var9 = 8; + } + + if (var0.field1179 > 0 && var0.pathLength > 1) { // L: 3991 + var9 = 8; // L: 3992 + --var0.field1179; // L: 3993 + } + } else { + if (var0.pathLength > 1) { // L: 3997 + var9 = 6; + } + + if (var0.pathLength > 2) { // L: 3998 + var9 = 8; + } + + if (var0.field1179 > 0 && var0.pathLength > 1) { // L: 3999 + var9 = 8; // L: 4000 + --var0.field1179; // L: 4001 + } + } + + if (var6 == class193.field2187) { // L: 4004 + var9 <<= 1; + } else if (var6 == class193.field2184) { // L: 4005 + var9 >>= 1; + } + + if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4006 + var0.movementSequence = var0.runSequence; + } + + if (var11 != var4 || var5 != var3) { // L: 4007 + if (var11 < var4) { // L: 4008 + var0.x += var9; // L: 4009 + if (var0.x > var4) { // L: 4010 + var0.x = var4; + } + } else if (var11 > var4) { // L: 4012 + var0.x -= var9; // L: 4013 + if (var0.x < var4) { // L: 4014 + var0.x = var4; } } + + if (var3 < var5) { // L: 4016 + var0.y += var9; // L: 4017 + if (var0.y > var5) { // L: 4018 + var0.y = var5; + } + } else if (var3 > var5) { // L: 4020 + var0.y -= var9; // L: 4021 + if (var0.y < var5) { // L: 4022 + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { // L: 4025 + --var0.pathLength; // L: 4026 + if (var0.field1170 > 0) { // L: 4027 + --var0.field1170; + } + } + } else { + var0.x = var4; // L: 3970 + var0.y = var5; // L: 3971 + --var0.pathLength; // L: 3972 + if (var0.field1170 > 0) { // L: 3973 + --var0.field1170; } } } } } } - } - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "47" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 381 - int var2 = var1.readUnsignedByte(); // L: 382 - int var3 = var1.readInt(); // L: 383 - if (var3 < 0 || AbstractArchive.field3960 != 0 && var3 > AbstractArchive.field3960) { // L: 384 - throw new RuntimeException(); // L: 385 - } else if (var2 == 0) { // L: 387 - byte[] var6 = new byte[var3]; // L: 388 - var1.readBytes(var6, 0, var3); // L: 389 - return var6; // L: 390 - } else { - int var4 = var1.readInt(); // L: 393 - if (var4 >= 0 && (AbstractArchive.field3960 == 0 || var4 <= AbstractArchive.field3960)) { // L: 394 - byte[] var5 = new byte[var4]; // L: 397 - if (var2 == 1) { // L: 398 - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 - } - - return var5; // L: 400 - } else { - throw new RuntimeException(); // L: 395 - } + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4030 + var0.sequence = -1; // L: 4031 + var0.spotAnimation = -1; // L: 4032 + var0.field1143 = 0; // L: 4033 + var0.field1163 = 0; // L: 4034 + var0.x = var0.pathX[0] * 128 + var0.field1150 * 64; // L: 4035 + var0.y = var0.field1150 * 64 + var0.pathY[0] * 128; // L: 4036 + var0.method2179(); // L: 4037 } - } - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "369546615" - ) - static boolean method3079() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1358 - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1359 - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1360 - if (!var0.isLoaded()) { // L: 1361 - return false; - } - - ++Client.archiveLoadersDone; // L: 1362 - } - - return true; // L: 1364 - } else { - return true; // L: 1363 + if (GrandExchangeEvents.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4039 4040 + var0.sequence = -1; // L: 4041 + var0.spotAnimation = -1; // L: 4042 + var0.field1143 = 0; // L: 4043 + var0.field1163 = 0; // L: 4044 + var0.x = var0.field1150 * 64 + var0.pathX[0] * 128; // L: 4045 + var0.y = var0.pathY[0] * 128 + var0.field1150 * 64; // L: 4046 + var0.method2179(); // L: 4047 } - } + + Skeleton.method4730(var0); // L: 4050 + GrandExchangeOfferWorldComparator.method6006(var0); // L: 4051 + } // L: 4052 } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index a26b60ed30..d7ef5a0f0f 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -12,10 +12,10 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("s") +@ObfuscatedName("m") public class class15 extends SSLSocketFactory { @ObfuscatedName("v") - SecureRandom field82; + SecureRandom field76; static { if (Security.getProvider("BC") == null) { // L: 40 @@ -25,52 +25,52 @@ public class class15 extends SSLSocketFactory { } // L: 41 public class15() { - this.field82 = new SecureRandom(); // L: 43 + this.field76 = new SecureRandom(); // L: 43 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", - garbageValue = "8" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;", + garbageValue = "352726134" ) - SSLSocket method189(String var1, TlsClientProtocol var2) { - return new class12(this, var2, var1); // L: 88 + SSLSocket method176(String var1, TlsClientProtocol var2) { + return new class12(this, var2, var1); // L: 81 } public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { - if (var1 == null) { // L: 47 - var1 = new Socket(); // L: 48 + if (var1 == null) { // L: 46 + var1 = new Socket(); // L: 47 } - if (!var1.isConnected()) { // L: 50 - var1.connect(new InetSocketAddress(var2, var3)); // L: 51 + if (!var1.isConnected()) { // L: 49 + var1.connect(new InetSocketAddress(var2, var3)); // L: 50 } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field82); // L: 53 - return this.method189(var2, var5); // L: 54 - } - - public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { - return null; // L: 84 - } - - public Socket createSocket(InetAddress var1, int var2) throws IOException { - return null; // L: 74 - } - - public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { - return null; // L: 79 - } - - public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { - return null; // L: 69 + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field76); // L: 52 + return this.method176(var2, var5); // L: 53 } public String[] getSupportedCipherSuites() { - return null; // L: 64 + return null; // L: 61 + } + + public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { + return null; // L: 65 + } + + public Socket createSocket(InetAddress var1, int var2) throws IOException { + return null; // L: 69 + } + + public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { + return null; // L: 77 + } + + public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { + return null; // L: 73 } public String[] getDefaultCipherSuites() { - return null; // L: 59 + return null; // L: 57 } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java index 359ae898e5..06852145fe 100644 --- a/runescape-client/src/main/java/class150.java +++ b/runescape-client/src/main/java/class150.java @@ -3,208 +3,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("eg") public class class150 extends class128 { + @ObfuscatedName("ik") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -7750632583538685477L + longValue = -4465707830753509645L ) - long field1680; - @ObfuscatedName("o") - String field1679; + long field1675; + @ObfuscatedName("c") + String field1670; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class150(class131 var1) { this.this$0 = var1; - this.field1680 = -1L; // L: 194 - this.field1679 = null; // L: 195 + this.field1675 = -1L; // L: 194 + this.field1670 = null; // L: 195 } // L: 197 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { + void vmethod3168(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 200 --var1.offset; // L: 201 - this.field1680 = var1.readLong(); // L: 202 + this.field1675 = var1.readLong(); // L: 202 } - this.field1679 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + this.field1670 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 } // L: 205 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2912(this.field1680, this.field1679); // L: 208 + void vmethod3162(ClanSettings var1) { + var1.method2996(this.field1675, this.field1670); // L: 208 } // L: 209 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-75" + ) + public static int method3150(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 28 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 29 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 30 + var0 += var0 >>> 8; // L: 31 + var0 += var0 >>> 16; // L: 32 + return var0 & 255; // L: 33 + } + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1682779053" + descriptor = "(IB)Z", + garbageValue = "3" ) - public static int method3091(int var0) { - return PcmPlayer.method771(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 65 + public static boolean method3149(int var0) { + return (var0 >> 30 & 1) != 0; // L: 37 } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1443556885" - ) - static void method3092(String var0, String var1, String var2) { - method3089(7); // L: 1259 - GrandExchangeEvent.setLoginResponseString(var0, var1, var2); // L: 1260 - } // L: 1261 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "16213" - ) - static void method3089(int var0) { - if (var0 != Login.loginIndex) { // L: 2091 - Login.loginIndex = var0; // L: 2092 - } - } // L: 2093 - - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-101" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { // L: 2448 - GrandExchangeEvent.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 2449 - GrandExchangeEvent.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 2450 - GrandExchangeEvent.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 2451 - method3089(3); // L: 2452 - Login.field897 = 1; // L: 2453 - } else if (var0 == 4) { // L: 2455 - class128.method2841(0); // L: 2456 - } else if (var0 == 5) { // L: 2458 - Login.field897 = 2; // L: 2459 - GrandExchangeEvent.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2460 - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2462 - if (var0 == 7) { // L: 2465 - GrandExchangeEvent.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 2466 - GrandExchangeEvent.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 2467 - GrandExchangeEvent.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 2468 - GrandExchangeEvent.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 2469 - GrandExchangeEvent.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 2470 - GrandExchangeEvent.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 2471 - GrandExchangeEvent.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 2472 - GrandExchangeEvent.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 2473 - GrandExchangeEvent.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 2474 - GrandExchangeEvent.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { // L: 2475 - class128.method2841(1); // L: 2476 - } else if (var0 == 19) { // L: 2478 - GrandExchangeEvent.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 2479 - GrandExchangeEvent.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 2480 - GrandExchangeEvent.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 2481 - GrandExchangeEvent.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 2482 - GrandExchangeEvent.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 2483 - GrandExchangeEvent.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 2484 - GrandExchangeEvent.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 2485 - GrandExchangeEvent.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 2486 - GrandExchangeEvent.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) { // L: 2487 - GrandExchangeEvent.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) { // L: 2488 - GrandExchangeEvent.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 2489 - GrandExchangeEvent.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 2490 - method3089(8); // L: 2491 - } else { - if (var0 == 56) { // L: 2493 - GrandExchangeEvent.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2494 - InterfaceParent.updateGameState(11); // L: 2495 - return; // L: 2496 - } - - if (var0 == 57) { // L: 2498 - GrandExchangeEvent.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2499 - InterfaceParent.updateGameState(11); // L: 2500 - return; // L: 2501 - } - - if (var0 == 61) { // L: 2503 - GrandExchangeEvent.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2504 - method3089(7); // L: 2505 - } else { - if (var0 == 62) { // L: 2507 - InterfaceParent.updateGameState(10); // L: 2508 - method3089(9); // L: 2509 - GrandExchangeEvent.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2510 - return; // L: 2511 - } - - if (var0 == 63) { // L: 2513 - InterfaceParent.updateGameState(10); // L: 2514 - method3089(9); // L: 2515 - GrandExchangeEvent.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2516 - return; // L: 2517 - } - - if (var0 == 65 || var0 == 67) { // L: 2519 - InterfaceParent.updateGameState(10); // L: 2520 - method3089(9); // L: 2521 - GrandExchangeEvent.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2522 - return; // L: 2523 - } - - if (var0 == 71) { // L: 2525 - InterfaceParent.updateGameState(10); // L: 2526 - method3089(7); // L: 2527 - GrandExchangeEvent.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2528 - } else { - GrandExchangeEvent.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2530 - } - } - } - } else { - GrandExchangeEvent.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2463 - } - - InterfaceParent.updateGameState(10); // L: 2531 - if (Client.field517.method8013()) { // L: 2532 - method3089(9); // L: 2533 - } - - } // L: 2535 } diff --git a/runescape-client/src/main/java/class151.java b/runescape-client/src/main/java/class151.java index c432c759fd..e6d2a219e6 100644 --- a/runescape-client/src/main/java/class151.java +++ b/runescape-client/src/main/java/class151.java @@ -1,22 +1,34 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eg") +@ObfuscatedName("en") public class class151 extends class144 { @ObfuscatedName("v") - String field1684; - @ObfuscatedName("o") - byte field1682; - @ObfuscatedName("h") - byte field1683; + String field1678; + @ObfuscatedName("c") + byte field1677; + @ObfuscatedName("i") + byte field1676; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Ler;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Lez;)V" + descriptor = "(Ler;)V" ) class151(class145 var1) { this.this$0 = var1; // L: 155 @@ -24,52 +36,382 @@ public class class151 extends class144 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;S)V", - garbageValue = "3239" + descriptor = "(Lpi;B)V", + garbageValue = "23" ) - void vmethod3096(Buffer var1) { - this.field1684 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 - if (this.field1684 != null) { // L: 159 + void vmethod3152(Buffer var1) { + this.field1678 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 + if (this.field1678 != null) { // L: 159 var1.readUnsignedByte(); // L: 160 - this.field1682 = var1.readByte(); // L: 161 - this.field1683 = var1.readByte(); // L: 162 + this.field1677 = var1.readByte(); // L: 161 + this.field1676 = var1.readByte(); // L: 162 } } // L: 164 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ley;B)V", - garbageValue = "26" + descriptor = "(Lea;I)V", + garbageValue = "1764669808" ) - void vmethod3093(ClanChannel var1) { - var1.name = this.field1684; // L: 167 - if (this.field1684 != null) { // L: 168 - var1.field1666 = this.field1682; // L: 169 - var1.field1669 = this.field1683; // L: 170 + void vmethod3153(ClanChannel var1) { + var1.name = this.field1678; // L: 167 + if (this.field1678 != null) { // L: 168 + var1.field1654 = this.field1677; // L: 169 + var1.field1659 = this.field1676; // L: 170 } } // L: 172 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Lfx;", - garbageValue = "-73" + descriptor = "(II)Lgn;", + garbageValue = "-462688597" ) - public static FloorUnderlayDefinition method3100(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 return var1; } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27 - var1 = new FloorUnderlayDefinition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2), var0); + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 23 + var1 = new ParamComposition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); } - var1.postDecode(); // L: 30 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31 - return var1; // L: 32 + var1.postDecode(); // L: 26 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpz;I)V", + garbageValue = "960704527" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 35 + if (var1 != null) { // L: 36 + int var2 = var0.offset; // L: 37 + var0.writeInt(var1.id); // L: 38 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39 + if (var1.creationErrors[var3] != 0) { // L: 40 + var0.writeByte(var1.creationErrors[var3]); // L: 41 + } else { + try { + int var4 = var1.operations[var3]; // L: 45 + Field var5; + int var6; + if (var4 == 0) { // L: 46 + var5 = var1.fields[var3]; // L: 47 + var6 = Reflection.getInt(var5, (Object)null); // L: 48 + var0.writeByte(0); // L: 49 + var0.writeInt(var6); // L: 50 + } else if (var4 == 1) { // L: 52 + var5 = var1.fields[var3]; // L: 53 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 + var0.writeByte(0); // L: 55 + } else if (var4 == 2) { // L: 57 + var5 = var1.fields[var3]; // L: 58 + var6 = var5.getModifiers(); // L: 59 + var0.writeByte(0); // L: 60 + var0.writeInt(var6); // L: 61 + } + + Method var25; + if (var4 != 3) { // L: 63 + if (var4 == 4) { // L: 83 + var25 = var1.methods[var3]; // L: 84 + var6 = var25.getModifiers(); // L: 85 + var0.writeByte(0); // L: 86 + var0.writeInt(var6); // L: 87 + } + } else { + var25 = var1.methods[var3]; // L: 64 + byte[][] var10 = var1.arguments[var3]; // L: 65 + Object[] var7 = new Object[var10.length]; // L: 66 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 + var7[var8] = var9.readObject(); // L: 69 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 + if (var11 == null) { // L: 72 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 73 + var0.writeByte(1); // L: 74 + var0.writeLong(((Number)var11).longValue()); // L: 75 + } else if (var11 instanceof String) { // L: 77 + var0.writeByte(2); // L: 78 + var0.writeStringCp1252NullTerminated((String)var11); // L: 79 + } else { + var0.writeByte(4); // L: 81 + } + } + } catch (ClassNotFoundException var13) { // L: 90 + var0.writeByte(-10); // L: 91 + } catch (InvalidClassException var14) { // L: 93 + var0.writeByte(-11); // L: 94 + } catch (StreamCorruptedException var15) { // L: 96 + var0.writeByte(-12); // L: 97 + } catch (OptionalDataException var16) { // L: 99 + var0.writeByte(-13); // L: 100 + } catch (IllegalAccessException var17) { // L: 102 + var0.writeByte(-14); // L: 103 + } catch (IllegalArgumentException var18) { // L: 105 + var0.writeByte(-15); // L: 106 + } catch (InvocationTargetException var19) { // L: 108 + var0.writeByte(-16); // L: 109 + } catch (SecurityException var20) { // L: 111 + var0.writeByte(-17); // L: 112 + } catch (IOException var21) { // L: 114 + var0.writeByte(-18); // L: 115 + } catch (NullPointerException var22) { // L: 117 + var0.writeByte(-19); // L: 118 + } catch (Exception var23) { // L: 120 + var0.writeByte(-20); // L: 121 + } catch (Throwable var24) { // L: 123 + var0.writeByte(-21); // L: 124 + } + } + } + + var0.writeCrc(var2); // L: 127 + var1.remove(); // L: 128 + } + } // L: 129 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1004666991" + ) + static int method3159(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526 + return 1; // L: 3527 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529 + Interpreter.Interpreter_intStackSize -= 3; // L: 3530 + Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3531 + GameEngine.privateChatMode = class166.method3343(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3532 + if (GameEngine.privateChatMode == null) { // L: 3533 + GameEngine.privateChatMode = PrivateChatMode.field4739; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3534 + PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2916, Client.packetWriter.isaacCipher); // L: 3536 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537 + var13.packetBuffer.writeByte(GameEngine.privateChatMode.field4740); // L: 3538 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539 + Client.packetWriter.addNode(var13); // L: 3540 + return 1; // L: 3541 + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543 + var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3544 + Interpreter.Interpreter_intStackSize -= 2; // L: 3545 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3546 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3547 + var6 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2928, Client.packetWriter.isaacCipher); // L: 3549 + var6.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551 + var6.packetBuffer.writeByte(var7 - 1); // L: 3552 + var6.packetBuffer.writeByte(var9); // L: 3553 + Client.packetWriter.addNode(var6); // L: 3554 + return 1; // L: 3555 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557 + Interpreter.Interpreter_intStackSize -= 2; // L: 3558 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3559 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3560 + var5 = class291.Messages_getByChannelAndID(var3, var7); // L: 3561 + if (var5 != null) { // L: 3562 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; // L: 3563 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3571 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3572 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3573 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3574 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3575 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3576 + } + + return 1; // L: 3578 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3581 + var4 = TileItem.Messages_getMessage(var3); // L: 3582 + if (var4 != null) { // L: 3583 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; // L: 3584 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3592 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3593 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3594 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3595 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3596 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3597 + } + + return 1; // L: 3599 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601 + if (GameEngine.privateChatMode == null) { // L: 3602 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameEngine.privateChatMode.field4740; // L: 3603 + } + + return 1; // L: 3604 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606 + var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3607 + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3608 + var12 = BufferedSource.method6908(var7, var8, Skills.clientLanguage, -1); // L: 3609 + Client.packetWriter.addNode(var12); // L: 3610 + return 1; // L: 3611 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613 + class122.Interpreter_stringStackSize -= 2; // L: 3614 + var8 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3615 + String var11 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3616 + var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2907, Client.packetWriter.isaacCipher); // L: 3618 + var12.packetBuffer.writeShort(0); // L: 3619 + int var10 = var12.packetBuffer.offset; // L: 3620 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621 + class282.method5489(var12.packetBuffer, var11); // L: 3622 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623 + Client.packetWriter.addNode(var12); // L: 3624 + return 1; // L: 3625 + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627 + var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3628 + Interpreter.Interpreter_intStackSize -= 2; // L: 3629 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3630 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3631 + var6 = BufferedSource.method6908(var7, var8, Skills.clientLanguage, var9); // L: 3632 + Client.packetWriter.addNode(var6); // L: 3633 + return 1; // L: 3634 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644 + return 1; // L: 3645 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3648 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HitSplatDefinition.Messages_getHistorySize(var3); // L: 3649 + return 1; // L: 3650 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3653 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.Messages_getLastChatID(var3); // L: 3654 + return 1; // L: 3655 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3658 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SoundCache.method779(var3); // L: 3659 + return 1; // L: 3660 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662 + var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3663 + class420.doCheat(var8); // L: 3664 + return 1; // L: 3665 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667 + Client.field728 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668 + return 1; // L: 3669 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Client.field728; // L: 3672 + return 1; // L: 3673 + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675 + var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3676 + System.out.println(var8); // L: 3677 + return 1; // L: 3678 + } else if (var0 == 5024) { // L: 3680 + --Interpreter.Interpreter_intStackSize; // L: 3681 + return 1; // L: 3682 + } else if (var0 == 5025) { // L: 3684 + ++Interpreter.Interpreter_intStackSize; // L: 3685 + return 1; // L: 3686 + } else if (var0 == 5030) { // L: 3688 + Interpreter.Interpreter_intStackSize -= 2; // L: 3689 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3690 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3691 + var5 = class291.Messages_getByChannelAndID(var3, var7); // L: 3692 + if (var5 != null) { // L: 3693 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; // L: 3694 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3700 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3701 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3704 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3705 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3706 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3707 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3708 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3709 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3710 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3711 + } + + return 1; // L: 3713 + } else if (var0 == 5031) { // L: 3715 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3716 + var4 = TileItem.Messages_getMessage(var3); // L: 3717 + if (var4 != null) { // L: 3718 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; // L: 3719 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3725 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3726 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3729 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3730 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3731 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3732 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3733 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3734 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3735 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3736 + } + + return 1; // L: 3738 + } else { + return 2; // L: 3740 + } + } else { + if (GrandExchangeEvents.localPlayer != null && GrandExchangeEvents.localPlayer.username != null) { // L: 3638 + var8 = GrandExchangeEvents.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3639 + } + + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8; // L: 3640 + return 1; // L: 3641 + } + } + } + } } } } diff --git a/runescape-client/src/main/java/class152.java b/runescape-client/src/main/java/class152.java index a21a4a56dd..ee8d9eca6e 100644 --- a/runescape-client/src/main/java/class152.java +++ b/runescape-client/src/main/java/class152.java @@ -1,29 +1,40 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("ez") public class class152 extends class128 { - @ObfuscatedName("bc") - static String field1686; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lac;" + ) + @Export("soundCache") + public static SoundCache soundCache; + @ObfuscatedName("ew") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive12") + static Archive archive12; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -454158867 + intValue = -1118863201 ) - int field1687; - @ObfuscatedName("o") + int field1683; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -753746234576851427L + longValue = -4335085775687334719L ) - long field1689; + long field1682; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Les;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lee;)V" + descriptor = "(Les;)V" ) class152(class131 var1) { this.this$0 = var1; // L: 307 @@ -31,33 +42,60 @@ public class class152 extends class128 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "-73" + descriptor = "(Lpi;I)V", + garbageValue = "-413979452" ) - void vmethod3107(Buffer var1) { - this.field1687 = var1.readInt(); // L: 310 - this.field1689 = var1.readLong(); // L: 311 + void vmethod3168(Buffer var1) { + this.field1683 = var1.readInt(); // L: 310 + this.field1682 = var1.readLong(); // L: 311 } // L: 312 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Leh;I)V", - garbageValue = "-1228032820" + descriptor = "(Lex;S)V", + garbageValue = "-10316" ) - void vmethod3104(ClanSettings var1) { - var1.method2938(this.field1687, this.field1689); // L: 315 + void vmethod3162(ClanSettings var1) { + var1.method2978(this.field1683, this.field1682); // L: 315 } // L: 316 - @ObfuscatedName("fs") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lgg;IIII)V", - garbageValue = "-998811857" + descriptor = "(Lln;Lln;I)Z", + garbageValue = "-1343677207" ) - static void method3102(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Interpreter.clientPreferences.method2286() != 0) { // L: 3303 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3304 - HealthBarUpdate.method2210(var0.soundEffects[var1], var2, var3); // L: 3305 + public static boolean method3170(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; // L: 44 + if (!var0.isFullyLoaded()) { // L: 45 + return false; // L: 46 + } else { + WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 49 + + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 50 + byte[] var3 = var0.takeFile(35, var2); // L: 51 + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52 + if (var3 != null) { // L: 53 + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54 + WorldMapElement.WorldMapElement_cached[var2].method3381(); // L: 55 + } } + + return true; // L: 58 } - } // L: 3306 + } + + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "(Lky;I)Ljava/lang/String;", + garbageValue = "2139867076" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var0)) == 0) { // L: 12480 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12481 12482 12484 + } + } } diff --git a/runescape-client/src/main/java/class154.java b/runescape-client/src/main/java/class154.java index 787aceaf4d..3294a6e19f 100644 --- a/runescape-client/src/main/java/class154.java +++ b/runescape-client/src/main/java/class154.java @@ -1,232 +1,161 @@ -import java.applet.Applet; -import java.net.URL; 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("ea") +@ObfuscatedName("eh") public class class154 extends class166 { - @ObfuscatedName("ns") - @ObfuscatedGetter( - intValue = -1435820145 + @ObfuscatedName("rl") + @ObfuscatedSignature( + descriptor = "Lex;" ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("se") + @ObfuscatedGetter( + intValue = 1598240235 + ) + static int field1691; + @ObfuscatedName("id") + @ObfuscatedGetter( + intValue = 71444527 + ) + @Export("cameraZ") + static int cameraZ; @ObfuscatedName("v") - String field1695; + String field1688; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lev;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lef;Ljava/lang/String;Ljava/lang/String;)V" + descriptor = "(Lev;Ljava/lang/String;Ljava/lang/String;)V" ) class154(class155 var1, String var2, String var3) { - super(var1, var2); // L: 390 - this.this$0 = var1; // L: 389 - this.field1695 = var3; // L: 391 - } // L: 392 + super(var1, var2); // L: 389 + this.this$0 = var1; // L: 388 + this.field1688 = var3; // L: 390 + } // L: 391 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "695673663" + garbageValue = "-1689964957" ) - public int vmethod3297() { - return 1; // L: 395 + public int vmethod3341() { + return 1; // L: 394 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1251344393" + garbageValue = "-1535635597" ) - public String vmethod3296() { - return this.field1695; // L: 400 + public String vmethod3333() { + return this.field1688; // L: 398 } - @ObfuscatedName("v") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([FIFZFZ[FB)I", - garbageValue = "1" + descriptor = "(Lnj;FFFI)F", + garbageValue = "-1450671201" ) - public static int method3129(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; // L: 15 - - for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16 - var7 += Math.abs(var0[var8]); // L: 17 - } - - float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1396; // L: 19 - if (var7 <= var24) { // L: 20 - return -1; // L: 21 + static float method3181(class389 var0, float var1, float var2, float var3) { + float var4 = class306.method5786(var0.field4364, var0.field4363, var1); // L: 116 + if (Math.abs(var4) < class114.field1382) { // L: 117 + return var1; } else { - float[] var9 = new float[var1 + 1]; // L: 23 - - int var10; - for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24 - var9[var10] = var0[var10] * (1.0F / var7); // L: 25 - } - - while (Math.abs(var9[var1]) < var24) { // L: 27 - --var1; // L: 28 - } - - var10 = 0; // L: 30 - if (var1 == 0) { // L: 31 - return var10; // L: 32 - } else if (var1 == 1) { // L: 34 - var6[0] = -var9[0] / var9[1]; // L: 35 - boolean var22 = var3 ? var2 < var6[0] + var24 : var2 < var6[0] - var24; // L: 36 - boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37 - var10 = var22 && var23 ? 1 : 0; // L: 38 - if (var10 > 0) { // L: 39 - if (var3 && var6[0] < var2) { // L: 40 - var6[0] = var2; // L: 41 - } else if (var5 && var6[0] > var4) { // L: 43 - var6[0] = var4; // L: 44 - } - } - - return var10; // L: 47 + float var5 = class306.method5786(var0.field4364, var0.field4363, var2); // L: 118 + if (Math.abs(var5) < class114.field1382) { // L: 119 + return var2; } else { - class389 var11 = new class389(var9, var1); // L: 50 - float[] var12 = new float[var1 + 1]; // L: 51 + float var6 = 0.0F; // L: 120 + float var7 = 0.0F; // L: 121 + float var8 = 0.0F; // L: 122 + float var13 = 0.0F; // L: 127 + boolean var14 = true; // L: 128 + boolean var15 = false; // L: 129 - for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 - var12[var13 - 1] = var9[var13] * (float)var13; // L: 53 - } - - float[] var21 = new float[var1 + 1]; // L: 55 - int var14 = method3129(var12, var1 - 1, var2, false, var4, false, var21); - if (var14 == -1) { - return 0; - } else { - boolean var15 = false; - float var17 = 0.0F; - float var18 = 0.0F; - float var19 = 0.0F; // L: 64 - - for (int var20 = 0; var20 <= var14; ++var20) { - if (var10 > var1) { - return var10; - } - - float var16; - if (var20 == 0) { // L: 67 - var16 = var2; // L: 68 - var18 = MidiPcmStream.method5405(var9, var1, var2); - if (Math.abs(var18) <= var24 && var3) { // L: 70 - var6[var10++] = var2; - } - } else { - var16 = var19; // L: 73 - var18 = var17; - } - - if (var14 == var20) { // L: 76 - var19 = var4; // L: 77 - var15 = false; - } else { - var19 = var21[var20]; - } - - var17 = MidiPcmStream.method5405(var9, var1, var19); - if (var15) { - var15 = false; // L: 85 - } else if (Math.abs(var17) < var24) { // L: 88 - if (var14 != var20 || var5) { - var6[var10++] = var19; // L: 90 - var15 = true; // L: 91 - } - } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94 - var6[var10++] = UserList.method6823(var11, var16, var19, 0.0F); - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96 - var6[var10 - 2] = 0.5F * (var6[var10 - 1] + var6[var10 - 2]); - --var10; - } - } + do { + var15 = false; // L: 131 + if (var14) { // L: 132 + var6 = var1; // L: 133 + var13 = var4; // L: 134 + var7 = var2 - var1; // L: 135 + var8 = var7; // L: 136 + var14 = false; // L: 137 } - return var10; - } + if (Math.abs(var13) < Math.abs(var5)) { // L: 139 + var1 = var2; // L: 140 + var2 = var6; // L: 141 + var6 = var1; // L: 142 + var4 = var5; // L: 143 + var5 = var13; // L: 144 + var13 = var4; // L: 145 + } + + float var16 = class114.field1380 * Math.abs(var2) + 0.5F * var3; // L: 147 + float var17 = 0.5F * (var6 - var2); // L: 148 + boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149 + if (var18) { // L: 150 + if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151 + float var12 = var5 / var4; // L: 156 + float var9; + float var10; + if (var1 == var6) { // L: 157 + var9 = var12 * var17 * 2.0F; // L: 158 + var10 = 1.0F - var12; // L: 159 + } else { + var10 = var4 / var13; // L: 162 + float var11 = var5 / var13; // L: 163 + var9 = ((var10 - var11) * 2.0F * var17 * var10 - (var11 - 1.0F) * (var2 - var1)) * var12; // L: 164 + var10 = (var12 - 1.0F) * (var11 - 1.0F) * (var10 - 1.0F); // L: 165 + } + + if ((double)var9 > 0.0D) { // L: 167 + var10 = -var10; + } else { + var9 = -var9; // L: 168 + } + + var12 = var8; // L: 169 + var8 = var7; // L: 170 + if (2.0F * var9 < 3.0F * var17 * var10 - Math.abs(var16 * var10) && var9 < Math.abs(var12 * 0.5F * var10)) { // L: 171 + var7 = var9 / var10; // L: 172 + } else { + var7 = var17; // L: 175 + var8 = var17; // L: 176 + } + } else { + var7 = var17; // L: 152 + var8 = var17; // L: 153 + } + + var1 = var2; // L: 179 + var4 = var5; // L: 180 + if (Math.abs(var7) > var16) { // L: 181 + var2 += var7; + } else if ((double)var17 > 0.0D) { // L: 182 + var2 += var16; + } else { + var2 -= var16; // L: 183 + } + + var5 = class306.method5786(var0.field4364, var0.field4363, var2); // L: 184 + if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185 + var14 = true; // L: 186 + var15 = true; // L: 187 + } else { + var15 = true; // L: 190 + } + } + } while(var15); + + return var2; // L: 194 } } } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "0" - ) - static boolean method3128(String var0, int var1, String var2) { - if (var1 == 0) { // L: 54 - try { - if (!class29.field169.startsWith("win")) { // L: 56 - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57 - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58 - - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59 - if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 60 - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62 - return true; // L: 63 - } - } catch (Throwable var5) { // L: 65 - return false; // L: 66 - } - } else if (var1 == 1) { // L: 69 - try { - Object var10 = class27.method412(class29.field168, var2, new Object[]{(new URL(class29.field168.getCodeBase(), var0)).toString()}); // L: 71 - return var10 != null; // L: 72 - } catch (Throwable var6) { // L: 74 - return false; // L: 75 - } - } else if (var1 == 2) { // L: 78 - try { - class29.field168.getAppletContext().showDocument(new URL(class29.field168.getCodeBase(), var0), "_blank"); // L: 80 - return true; // L: 81 - } catch (Exception var7) { // L: 83 - return false; // L: 84 - } - } else if (var1 == 3) { // L: 87 - try { - Applet var3 = class29.field168; // L: 89 - JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 92 - } catch (Throwable var9) { // L: 95 - } - - try { - class29.field168.getAppletContext().showDocument(new URL(class29.field168.getCodeBase(), var0), "_top"); // L: 97 - return true; // L: 98 - } catch (Exception var8) { // L: 100 - return false; // L: 101 - } - } else { - throw new IllegalArgumentException(); // L: 104 - } - } - - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2051712033" - ) - static void method3127() { - if (ClanChannel.worldMap != null) { // L: 3890 - ClanChannel.worldMap.method7313(class160.Client_plane, (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX, (class19.localPlayer.y >> 7) + class250.baseY, false); // L: 3891 - ClanChannel.worldMap.loadCache(); // L: 3892 - } - - } // L: 3894 } diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java index bf48e8d4e6..74d49fa8a3 100644 --- a/runescape-client/src/main/java/class155.java +++ b/runescape-client/src/main/java/class155.java @@ -12,72 +12,66 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -@ObfuscatedName("ef") +@ObfuscatedName("ev") public class class155 { - @ObfuscatedName("ul") - @ObfuscatedSignature( - descriptor = "Lbc;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -636798581 + intValue = -2129786845 ) - int field1702; + int field1694; + @ObfuscatedName("o") + String field1702; @ObfuscatedName("r") - String field1714; - @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lct;" + descriptor = "Lcw;" ) - UrlRequest field1710; - @ObfuscatedName("x") - String field1711; - @ObfuscatedName("c") - float[] field1712; - @ObfuscatedName("j") - ArrayList field1717; + UrlRequest field1696; @ObfuscatedName("p") - ArrayList field1713; - @ObfuscatedName("s") - ArrayList field1708; - @ObfuscatedName("b") - Map field1716; + String field1704; @ObfuscatedName("w") + float[] field1705; + @ObfuscatedName("k") + ArrayList field1706; + @ObfuscatedName("d") + ArrayList field1707; + @ObfuscatedName("m") + ArrayList field1708; + @ObfuscatedName("u") Map field1709; + @ObfuscatedName("t") + Map field1710; public class155() { - this.field1702 = -1; // L: 24 - this.field1711 = null; // L: 27 - this.field1712 = new float[4]; // L: 28 - this.field1717 = new ArrayList(); // L: 29 - this.field1713 = new ArrayList(); // L: 30 + this.field1694 = -1; // L: 24 + this.field1704 = null; // L: 27 + this.field1705 = new float[4]; // L: 28 + this.field1706 = new ArrayList(); // L: 29 + this.field1707 = new ArrayList(); // L: 30 this.field1708 = new ArrayList(); // L: 31 - this.field1716 = new HashMap(); // L: 32 - this.field1709 = new HashMap(); // L: 33 - } + this.field1709 = new HashMap(); // L: 32 + this.field1710 = new HashMap(); // L: 33 + } // L: 385 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lci;I)Z", - garbageValue = "1113383001" + descriptor = "(Ljava/lang/String;Lck;I)Z", + garbageValue = "903767211" ) - public boolean method3131(String var1, UrlRequester var2) { + public boolean method3201(String var1, UrlRequester var2) { if (var1 != null && !var1.isEmpty()) { // L: 36 if (var2 == null) { // L: 39 return false; // L: 40 } else { - this.method3143(); // L: 42 + this.method3192(); // L: 42 try { - this.field1714 = var1; // L: 44 - this.field1710 = var2.request(new URL(this.field1714)); // L: 45 - this.field1702 = 0; // L: 46 + this.field1702 = var1; // L: 44 + this.field1696 = var2.request(new URL(this.field1702)); // L: 45 + this.field1694 = 0; // L: 46 return true; // L: 47 } catch (MalformedURLException var4) { // L: 49 - this.method3143(); // L: 50 - this.field1702 = 100; // L: 51 + this.method3192(); // L: 50 + this.field1694 = 100; // L: 51 return false; // L: 52 } } @@ -86,18 +80,18 @@ public class class155 { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lci;I)V", - garbageValue = "2095270255" + descriptor = "(Lck;I)V", + garbageValue = "2123246139" ) - public void method3165(UrlRequester var1) { - switch(this.field1702) { // L: 57 + public void method3184(UrlRequester var1) { + switch(this.field1694) { // L: 57 case 0: - this.method3142(var1); + this.method3193(var1); break; // L: 64 case 1: - this.method3135(); // L: 59 + this.method3194(); // L: 59 break; default: return; // L: 62 @@ -105,204 +99,204 @@ public class class155 { } // L: 67 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" + descriptor = "(I)I", + garbageValue = "2027263418" ) - public int method3141() { - return this.field1702; // L: 70 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "8" - ) - public int method3134(String var1) { - return this.field1716.containsKey(var1) ? (Integer)this.field1716.get(var1) : -1; // L: 74 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", - garbageValue = "24966" - ) - public String method3144(String var1) { - return (String)((String)(this.field1709.containsKey(var1) ? this.field1709.get(var1) : null)); // L: 78 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "1155378703" - ) - public ArrayList method3130() { - return this.field1713; // L: 82 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "1265617281" - ) - public ArrayList method3137() { - return this.field1708; // L: 86 + public int method3230() { + return this.field1694; // L: 70 } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1734627976" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "125" ) - public String method3138() { - return this.field1711; // L: 90 + public int method3189(String var1) { + return this.field1709.containsKey(var1) ? (Integer)this.field1709.get(var1) : -1; // L: 74 } - @ObfuscatedName("u") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "35" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1588699273" ) - public float[] method3146() { - return this.field1712; // L: 94 + public String method3223(String var1) { + return (String)(this.field1710.containsKey(var1) ? this.field1710.get(var1) : null); // L: 78 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)Ljava/util/ArrayList;", + garbageValue = "1" + ) + public ArrayList method3187() { + return this.field1707; // L: 82 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "1812482567" + ) + public ArrayList method3229() { + return this.field1708; // L: 86 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-121" + ) + public String method3188() { + return this.field1704; // L: 90 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "1243511271" + ) + public float[] method3190() { + return this.field1705; // L: 94 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "969924942" + ) + public ArrayList method3191() { + return this.field1706; // L: 98 } @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "-937062700" - ) - public ArrayList method3140() { - return this.field1717; // L: 98 - } - - @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2017672764" + garbageValue = "938648382" ) - void method3143() { - this.field1710 = null; // L: 102 - this.field1711 = null; // L: 103 - this.field1712[0] = 0.0F; // L: 104 - this.field1712[1] = 0.0F; // L: 105 - this.field1712[2] = 1.0F; // L: 106 - this.field1712[3] = 1.0F; // L: 107 - this.field1717.clear(); // L: 108 - this.field1713.clear(); // L: 109 + void method3192() { + this.field1696 = null; // L: 102 + this.field1704 = null; // L: 103 + this.field1705[0] = 0.0F; // L: 104 + this.field1705[1] = 0.0F; // L: 105 + this.field1705[2] = 1.0F; // L: 106 + this.field1705[3] = 1.0F; // L: 107 + this.field1706.clear(); // L: 108 + this.field1707.clear(); // L: 109 this.field1708.clear(); // L: 110 - this.field1716.clear(); // L: 111 - this.field1709.clear(); // L: 112 + this.field1709.clear(); // L: 111 + this.field1710.clear(); // L: 112 } // L: 113 - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lci;B)V", - garbageValue = "-74" + descriptor = "(Lck;B)V", + garbageValue = "69" ) - void method3142(UrlRequester var1) { - if (this.field1710 != null && this.field1710.isDone()) { // L: 116 - byte[] var2 = this.field1710.getResponse(); // L: 119 + void method3193(UrlRequester var1) { + if (this.field1696 != null && this.field1696.isDone()) { // L: 116 + byte[] var2 = this.field1696.getResponse(); // L: 119 if (var2 == null) { // L: 120 - this.method3143(); // L: 121 - this.field1702 = 100; // L: 122 + this.method3192(); // L: 121 + this.field1694 = 100; // L: 122 } else { JSONObject var3; try { class399 var4 = new class399(var2); // L: 127 - var3 = var4.method7225(); // L: 128 + var3 = var4.method7156(); // L: 128 var3 = var3.getJSONObject("message"); // L: 129 } catch (Exception var9) { // L: 131 - this.method3143(); // L: 132 - this.field1702 = 102; // L: 133 + this.method3192(); // L: 132 + this.field1694 = 102; // L: 133 return; // L: 134 } try { - this.method3133(var3.getJSONArray("images"), var1); // L: 137 + this.method3195(var3.getJSONArray("images"), var1); // L: 137 } catch (Exception var8) { // L: 139 - this.field1713.clear(); // L: 140 + this.field1707.clear(); // L: 140 } try { - this.method3145(var3.getJSONArray("labels")); // L: 143 + this.method3196(var3.getJSONArray("labels")); // L: 143 } catch (Exception var7) { // L: 145 this.field1708.clear(); // L: 146 } try { - this.method3161(var3.getJSONObject("behaviour")); // L: 149 + this.method3197(var3.getJSONObject("behaviour")); // L: 149 } catch (Exception var6) { // L: 151 - this.field1711 = null; // L: 152 - this.field1712[0] = 0.0F; // L: 153 - this.field1712[1] = 0.0F; // L: 154 - this.field1712[2] = 1.0F; // L: 155 - this.field1712[3] = 1.0F; // L: 156 - this.field1717.clear(); // L: 157 + this.field1704 = null; // L: 152 + this.field1705[0] = 0.0F; // L: 153 + this.field1705[1] = 0.0F; // L: 154 + this.field1705[2] = 1.0F; // L: 155 + this.field1705[3] = 1.0F; // L: 156 + this.field1706.clear(); // L: 157 } try { - this.method3147(var3.getJSONObject("meta")); // L: 160 + this.method3240(var3.getJSONObject("meta")); // L: 160 } catch (Exception var5) { // L: 162 - this.field1716.clear(); // L: 163 - this.field1709.clear(); // L: 164 + this.field1709.clear(); // L: 163 + this.field1710.clear(); // L: 164 } - this.field1702 = this.field1713.size() > 0 ? 1 : 2; // L: 166 - this.field1710 = null; // L: 167 + this.field1694 = this.field1707.size() > 0 ? 1 : 2; // L: 166 + this.field1696 = null; // L: 167 } } } // L: 117 123 168 - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-111140225" + garbageValue = "-1711663898" ) - void method3135() { - Iterator var1 = this.field1713.iterator(); // L: 171 + void method3194() { + Iterator var1 = this.field1707.iterator(); // L: 171 class160 var2; do { if (!var1.hasNext()) { - var1 = this.field1713.iterator(); // L: 179 + var1 = this.field1707.iterator(); // L: 179 - while (var1.hasNext()) { + while (var1.hasNext()) { // L: 190 var2 = (class160)var1.next(); // L: 180 - if (var2.field1749 != null) { // L: 182 - byte[] var3 = var2.field1749.getResponse(); // L: 183 + if (var2.field1737 != null) { // L: 182 + byte[] var3 = var2.field1737.getResponse(); // L: 183 if (var3 != null && var3.length > 0) { // L: 184 - this.field1702 = 2; // L: 185 + this.field1694 = 2; // L: 185 return; // L: 186 } } } - this.method3143(); // L: 191 - this.field1702 = 101; // L: 192 + this.method3192(); // L: 191 + this.field1694 = 101; // L: 192 return; // L: 193 } var2 = (class160)var1.next(); // L: 172 - } while(var2.field1749 == null || var2.field1749.isDone()); // L: 174 + } while(var2.field1737 == null || var2.field1737.isDone()); // L: 174 } // L: 175 - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;Lci;B)V", - garbageValue = "-122" + descriptor = "(Lorg/json/JSONArray;Lck;B)V", + garbageValue = "-22" ) - void method3133(JSONArray var1, UrlRequester var2) throws JSONException { + void method3195(JSONArray var1, UrlRequester var2) throws JSONException { if (var1 != null) { // L: 196 for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 197 try { JSONObject var4 = var1.getJSONObject(var3); // L: 199 class160 var5 = new class160(this); // L: 200 - var5.field1749 = var2.request(new URL(var4.getString("src"))); // L: 201 - var5.field1748 = class14.method186(var4, "placement"); // L: 202 - this.field1713.add(var5); // L: 203 + var5.field1737 = var2.request(new URL(var4.getString("src"))); // L: 201 + var5.field1735 = HorizontalAlignment.method3495(var4, "placement"); // L: 202 + this.field1707.add(var5); // L: 203 } catch (MalformedURLException var6) { // L: 205 } } @@ -310,17 +304,17 @@ public class class155 { } } // L: 207 - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(Lorg/json/JSONArray;I)V", - garbageValue = "-1894946604" + garbageValue = "1024784917" ) - void method3145(JSONArray var1) throws JSONException { + void method3196(JSONArray var1) throws JSONException { if (var1 != null) { // L: 210 for (int var2 = 0; var2 < var1.length(); ++var2) { // L: 211 JSONObject var3 = var1.getJSONObject(var2); // L: 212 class162 var4 = new class162(this); // L: 213 - var4.field1771 = var3.getString("text"); // L: 214 + var4.field1758 = var3.getString("text"); // L: 214 String var7 = var3.getString("align_x"); // L: 217 byte var6; if (var7.equals("centre")) { // L: 219 @@ -331,7 +325,7 @@ public class class155 { var6 = 2; // L: 224 } - var4.field1770 = var6; // L: 229 + var4.field1755 = var6; // L: 229 String var10 = var3.getString("align_y"); // L: 232 byte var9; if (var10.equals("centre")) { // L: 234 @@ -342,40 +336,40 @@ public class class155 { var9 = 2; // L: 239 } - var4.field1776 = var9; // L: 244 - var4.field1772 = var3.getInt("font"); // L: 245 - var4.field1769 = class14.method186(var3, "placement"); // L: 246 - this.field1708.add(var4); // L: 247 + var4.field1756 = var9; // L: 244 + var4.field1752 = var3.getInt("font"); // L: 245 + var4.field1754 = HorizontalAlignment.method3495(var3, "placement"); + this.field1708.add(var4); } } - } // L: 249 + } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;B)V", - garbageValue = "64" + descriptor = "(Lorg/json/JSONObject;I)V", + garbageValue = "222428607" ) - void method3161(JSONObject var1) throws JSONException { + void method3197(JSONObject var1) throws JSONException { if (var1 != null) { // L: 252 - this.field1712 = class14.method186(var1, "clickbounds"); // L: 253 - this.field1711 = var1.getString("endpoint"); // L: 254 - String[] var2 = JSONObject.getNames(var1); // L: 255 + this.field1705 = HorizontalAlignment.method3495(var1, "clickbounds"); + this.field1704 = var1.getString("endpoint"); + String[] var2 = JSONObject.getNames(var1); - for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 256 - if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { // L: 257 + for (int var3 = 0; var3 < var1.length(); ++var3) { + if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { try { - int var4 = var1.getInt(var2[var3]); // L: 259 - this.field1717.add(new class163(this, var2[var3], var4)); // L: 260 + int var4 = var1.getInt(var2[var3]); + this.field1706.add(new class163(this, var2[var3], var4)); } catch (Exception var8) { try { String var5 = var1.getString(var2[var3]); // L: 264 - if (var5.equals("true")) { // L: 265 - this.field1717.add(new class163(this, var2[var3], 1)); // L: 266 + if (var5.equals("true")) { + this.field1706.add(new class163(this, var2[var3], 1)); } else if (var5.equals("false")) { // L: 268 - this.field1717.add(new class163(this, var2[var3], 0)); // L: 269 + this.field1706.add(new class163(this, var2[var3], 0)); // L: 269 } else { - this.field1717.add(new class154(this, var2[var3], var5)); // L: 272 + this.field1706.add(new class154(this, var2[var3], var5)); // L: 272 } } catch (Exception var7) { // L: 275 } @@ -386,27 +380,27 @@ public class class155 { } } // L: 279 - @ObfuscatedName("b") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;S)V", - garbageValue = "1459" + descriptor = "(Lorg/json/JSONObject;I)V", + garbageValue = "1700168973" ) - void method3147(JSONObject var1) throws JSONException { + void method3240(JSONObject var1) throws JSONException { String[] var2 = JSONObject.getNames(var1); // L: 282 for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 283 try { int var4 = var1.getInt(var2[var3]); // L: 285 - this.field1716.put(var2[var3], var4); // L: 286 + this.field1709.put(var2[var3], var4); // L: 286 } catch (Exception var8) { try { String var5 = var1.getString(var2[var3]); // L: 290 if (var5.equals("true")) { // L: 291 - this.field1716.put(var2[var3], 1); // L: 292 + this.field1709.put(var2[var3], 1); // L: 292 } else if (var5.equals("false")) { // L: 294 - this.field1716.put(var2[var3], 0); // L: 295 + this.field1709.put(var2[var3], 0); // L: 295 } else { - this.field1709.put(var2[var3], var5); // L: 298 + this.field1710.put(var2[var3], var5); // L: 298 } } catch (Exception var7) { // L: 301 } @@ -414,4 +408,102 @@ public class class155 { } } // L: 304 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[Lkl;", + garbageValue = "-124826849" + ) + static GameBuild[] method3185() { + return new GameBuild[]{GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE, GameBuild.LIVE}; // L: 13 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-49" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (WorldMapSectionType.Widget_loadedInterfaces[var0]) { // L: 246 + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { // L: 247 + return false; + } else { + int var1 = Widget.Widget_archive.getGroupFileCount(var0); // L: 248 + if (var1 == 0) { // L: 249 + WorldMapSectionType.Widget_loadedInterfaces[var0] = true; // L: 250 + return true; // L: 251 + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 253 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 254 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 255 + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); // L: 256 + if (var3 != null) { // L: 257 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 258 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 259 + if (var3[0] == -1) { // L: 260 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 261 + } + } + } + } + + WorldMapSectionType.Widget_loadedInterfaces[var0] = true; // L: 265 + return true; // L: 266 + } + } + } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "([Lky;II)V", + garbageValue = "-609081385" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11723 + Widget var3 = var0[var2]; // L: 11724 + if (var3 != null) { // L: 11725 + if (var3.type == 0) { // L: 11726 + if (var3.children != null) { // L: 11727 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11728 + if (var4 != null) { // L: 11729 + MouseRecorder.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 11731 + var5 = new ScriptEvent(); // L: 11732 + var5.widget = var3; // L: 11733 + var5.args = var3.onDialogAbort; // L: 11734 + ClanSettings.runScriptEvent(var5); // L: 11735 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 11737 + if (var3.childIndex >= 0) { // L: 11738 + Widget var6 = class127.getWidget(var3.id); // L: 11739 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11740 + continue; + } + } + + var5 = new ScriptEvent(); // L: 11744 + var5.widget = var3; // L: 11745 + var5.args = var3.onSubChange; // L: 11746 + ClanSettings.runScriptEvent(var5); // L: 11747 + } + } + } + + } // L: 11750 } diff --git a/runescape-client/src/main/java/class158.java b/runescape-client/src/main/java/class158.java index 87e6e7dfdf..2179d2c532 100644 --- a/runescape-client/src/main/java/class158.java +++ b/runescape-client/src/main/java/class158.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fo") public interface class158 { - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-665818879" + garbageValue = "34380601" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 258d07f7bc..c3ef8e5d9d 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,109 +1,87 @@ +import java.io.File; +import java.io.IOException; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("b") +@ObfuscatedName("u") public class class16 implements ThreadFactory { + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive6") + static Archive archive6; @ObfuscatedName("v") - final ThreadGroup field83; - @ObfuscatedName("o") - final AtomicInteger field84; + final ThreadGroup field77; + @ObfuscatedName("c") + final AtomicInteger field78; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lp;" + descriptor = "Ld;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lp;)V" + descriptor = "(Ld;)V" ) class16(class14 var1) { - this.this$0 = var1; - this.field84 = new AtomicInteger(1); // L: 66 - SecurityManager var2 = System.getSecurityManager(); // L: 69 - this.field83 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70 - } // L: 71 + this.this$0 = var1; // L: 67 + this.field78 = new AtomicInteger(1); // L: 65 + SecurityManager var2 = System.getSecurityManager(); // L: 68 + this.field77 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 69 + } // L: 70 public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field83, var1, this.this$0.field74 + "-rest-request-" + this.field84.getAndIncrement(), 0L); // L: 75 - var2.setDaemon(true); // L: 76 - var2.setPriority(5); // L: 77 - return var2; // L: 78 + Thread var2 = new Thread(this.field77, var1, this.this$0.field69 + "-rest-request-" + this.field78.getAndIncrement(), 0L); // L: 73 + var2.setDaemon(true); // L: 74 + var2.setPriority(5); // L: 75 + return var2; // L: 76 } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llq;III)Lqx;", - garbageValue = "-1536668938" + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "2082256408" ) - static IndexedSprite method218(AbstractArchive var0, int var1, int var2) { - return !GrandExchangeEvent.method6045(var0, var1, var2) ? null : Clock.method3323(); // L: 45 46 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-805964566" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 130 - if (KeyHandler.field137 == KeyHandler.field135) { // L: 131 - return false; - } else { - class241.field2833 = KeyHandler.field130[KeyHandler.field135]; // L: 132 - class1.field3 = KeyHandler.field115[KeyHandler.field135]; // L: 133 - KeyHandler.field135 = KeyHandler.field135 + 1 & 127; // L: 134 - return true; // L: 135 + static void method194(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(class28.JagexCache_locationFile, "rw", 10000L); // L: 216 + Buffer var3 = new Buffer(500); // L: 217 + var3.writeByte(3); // L: 218 + var3.writeByte(var1 != null ? 1 : 0); // L: 219 + var3.writeCESU8(var0.getPath()); // L: 220 + if (var1 != null) { + var3.writeCESU8(""); // L: 221 } - } - } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-1927967311" - ) - public static int method217(CharSequence var0) { - return FloorOverlayDefinition.method3788(var0, 10, true); // L: 68 - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(Lco;I)V", - garbageValue = "362811494" - ) - static final void method215(Actor var0) { - if (var0.field1180 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ItemContainer.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3761 - int var1 = var0.field1180 - var0.field1179; // L: 3762 - int var2 = Client.cycle - var0.field1179; // L: 3763 - int var3 = var0.field1145 * 64 + var0.field1175 * 128; // L: 3764 - int var4 = var0.field1145 * 64 + var0.field1177 * 128; // L: 3765 - int var5 = var0.field1145 * 64 + var0.field1176 * 128; // L: 3766 - int var6 = var0.field1145 * 64 + var0.field1178 * 128; // L: 3767 - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 3768 - var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; // L: 3769 + var2.write(var3.array, 0, var3.offset); // L: 222 + var2.close(); // L: 223 + } catch (IOException var4) { // L: 225 + var4.printStackTrace(); // L: 226 } - var0.field1197 = 0; // L: 3771 - var0.orientation = var0.field1181; // L: 3772 - var0.rotation = var0.orientation; // L: 3773 - } // L: 3774 + } // L: 228 - @ObfuscatedName("lf") + @ObfuscatedName("fb") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2114031741" + descriptor = "(II)V", + garbageValue = "1157813230" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 11723 - PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 11725 - var1.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var0)); // L: 11726 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11727 - Client.packetWriter.addNode(var1); // L: 11728 + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + ItemLayer.logOut(); // L: 2941 + switch(var0) { // L: 2942 + case 1: + Ignored.method6828(24); // L: 2954 + class4.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2955 + break; + case 2: + Ignored.method6828(24); // L: 2946 + class4.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2947 } - } // L: 11729 + + } // L: 2960 } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index 1aa4ed00dd..cc69838243 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -1,98 +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 net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fa") +@ObfuscatedName("fu") public class class160 { - @ObfuscatedName("x") - public static short[][] field1747; - @ObfuscatedName("c") + @ObfuscatedName("ps") @ObfuscatedSignature( - descriptor = "Lqx;" + descriptor = "Lcj;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("lo") - @ObfuscatedGetter( - intValue = -1196067177 - ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("nx") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - static Widget field1750; + @Export("varcs") + static Varcs varcs; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lct;" + descriptor = "Lcw;" ) - public UrlRequest field1749; - @ObfuscatedName("o") - public float[] field1748; + public UrlRequest field1737; + @ObfuscatedName("c") + public float[] field1735; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lev;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lef;)V" + descriptor = "(Lev;)V" ) class160(class155 var1) { this.this$0 = var1; - this.field1748 = new float[4]; // L: 326 + this.field1735 = new float[4]; // L: 326 } // L: 328 - @ObfuscatedName("v") - public static String method3236(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 31 - int var2 = Calendar.Calendar_calendar.get(7); // L: 32 - int var3 = Calendar.Calendar_calendar.get(5); // L: 33 - int var4 = Calendar.Calendar_calendar.get(2); // L: 34 - int var5 = Calendar.Calendar_calendar.get(1); // L: 35 - int var6 = Calendar.Calendar_calendar.get(11); // L: 36 - int var7 = Calendar.Calendar_calendar.get(12); // L: 37 - int var8 = Calendar.Calendar_calendar.get(13); // L: 38 - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 39 - } - - @ObfuscatedName("o") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-235461419" + descriptor = "(ILbd;ZI)I", + garbageValue = "-1437558717" ) - public static void method3237() { - if (MouseHandler.MouseHandler_instance != null) { // L: 43 - synchronized(MouseHandler.MouseHandler_instance) { // L: 44 - MouseHandler.MouseHandler_instance = null; // L: 45 - } // L: 46 - } + static int method3279(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3744 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.getWindowedMode(); // L: 3745 + return 1; // L: 3746 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3748 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3749 + if (var3 == 1 || var3 == 2) { // L: 3750 + class131.setWindowedMode(var3); + } - } // L: 48 - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2025153042" - ) - static final void method3238() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4351 4352 4359 - if (var0.plane == Client_plane && !var0.isFinished) { // L: 4353 - if (Client.cycle >= var0.cycleStart) { // L: 4354 - var0.advance(Client.field550); // L: 4355 - if (var0.isFinished) { // L: 4356 - var0.remove(); - } else { - FriendSystem.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4357 - } + return 1; // L: 3751 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3753 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2251(); // L: 3754 + return 1; // L: 3755 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3757 + if (var0 == 5310) { // L: 3764 + --Interpreter.Interpreter_intStackSize; // L: 3765 + return 1; // L: 3766 + } else if (var0 == 5311) { // L: 3768 + Interpreter.Interpreter_intStackSize -= 2; // L: 3769 + return 1; // L: 3770 + } else if (var0 == 5312) { // L: 3772 + --Interpreter.Interpreter_intStackSize; // L: 3773 + return 1; // L: 3774 + } else if (var0 == 5350) { // L: 3776 + class122.Interpreter_stringStackSize -= 2; // L: 3777 + --Interpreter.Interpreter_intStackSize; // L: 3778 + return 1; // L: 3779 + } else if (var0 == 5351) { // L: 3781 + --class122.Interpreter_stringStackSize; // L: 3782 + return 1; // L: 3783 + } else { + return 2; // L: 3785 } } else { - var0.remove(); + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3758 + if (var3 == 1 || var3 == 2) { // L: 3759 + class131.clientPreferences.method2250(var3); // L: 3760 + } + + return 1; // L: 3762 + } + } + } + + @ObfuscatedName("mk") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-75" + ) + static String method3280(String var0) { + PlayerType[] var1 = WorldMapManager.PlayerType_values(); // L: 12632 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12633 + PlayerType var3 = var1[var2]; // L: 12634 + if (var3.modIcon != -1 && var0.startsWith(Script.method1990(var3.modIcon))) { // L: 12636 12637 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12638 + break; } } - } // L: 4361 + return var0; // L: 12645 + } } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index 9e9b7c362e..9380356122 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -3,181 +3,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fi") public class class162 { - @ObfuscatedName("r") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lln;" ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "[Lqx;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("du") - static boolean field1768; - @ObfuscatedName("g") - public String field1771; - @ObfuscatedName("l") - public float[] field1769; + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("f") + public String field1758; + @ObfuscatedName("b") + public float[] field1754; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1773240959 + intValue = 1781750243 ) - public int field1770; - @ObfuscatedName("d") + public int field1755; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2056552437 + intValue = -608154281 ) - public int field1776; - @ObfuscatedName("f") + public int field1756; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 521608745 + intValue = -454180149 ) - public int field1772; + public int field1752; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lev;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lef;)V" + descriptor = "(Lev;)V" ) class162(class155 var1) { this.this$0 = var1; - this.field1769 = new float[4]; // L: 336 - this.field1770 = 1; // L: 337 - this.field1776 = 1; // L: 338 - this.field1772 = 0; // L: 339 + this.field1754 = new float[4]; // L: 336 + this.field1755 = 1; // L: 337 + this.field1756 = 1; // L: 338 + this.field1752 = 0; // L: 339 } // L: 341 - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "137549061" + descriptor = "(IIIB)I", + garbageValue = "17" ) - public static int method3273(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 9 - int var6 = var3; // L: 10 - var3 = var4; // L: 11 - var4 = var6; // L: 12 + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 955 + var1 /= 2; } - var2 &= 3; // L: 14 - if (var2 == 0) { // L: 15 - return var0; - } else if (var2 == 1) { // L: 16 - return var1; - } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 17 18 + if (var2 > 192) { // L: 956 + var1 /= 2; } + + if (var2 > 217) { // L: 957 + var1 /= 2; + } + + if (var2 > 243) { // L: 958 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 959 + return var3; // L: 960 } - - @ObfuscatedName("o") - public static boolean method3274(long var0) { - return 0L != var0 && !Language.method6131(var0); // L: 48 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1444126157" - ) - public static boolean method3276(int var0) { - return (var0 >> 20 & 1) != 0; // L: 25 - } - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-108" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class160.Client_plane][var0][var1]; // L: 7649 - if (var2 == null) { // L: 7650 - FriendSystem.scene.removeGroundItemPile(class160.Client_plane, var0, var1); // L: 7651 - } else { - long var3 = -99999999L; // L: 7654 - TileItem var5 = null; // L: 7655 - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7656 7657 7665 - ItemComposition var7 = class67.ItemDefinition_get(var6.id); // L: 7658 - long var11 = (long)var7.price; // L: 7659 - if (var7.isStackable == 1) { - var11 *= (long)(var6.quantity + 1); // L: 7660 - } - - if (var11 > var3) { // L: 7661 - var3 = var11; // L: 7662 - var5 = var6; // L: 7663 - } - } - - if (var5 == null) { // L: 7667 - FriendSystem.scene.removeGroundItemPile(class160.Client_plane, var0, var1); // L: 7668 - } else { - var2.addLast(var5); // L: 7671 - TileItem var13 = null; // L: 7672 - TileItem var8 = null; // L: 7673 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7674 7675 7680 - if (var5.id != var6.id) { // L: 7676 - if (var13 == null) { // L: 7677 - var13 = var6; - } - - if (var13.id != var6.id && var8 == null) { // L: 7678 - var8 = var6; - } - } - } - - long var9 = MilliClock.calculateTag(var0, var1, 3, false, 0); // L: 7682 - FriendSystem.scene.newGroundItemPile(class160.Client_plane, var0, var1, Archive.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class160.Client_plane), var5, var9, var13, var8); // L: 7683 - } - } - } // L: 7652 7669 7684 - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(Lkn;IIB)V", - garbageValue = "45" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 10205 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 10206 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 10207 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 10208 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 10209 - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10210 - } - - if (var0.yAlignment == 0) { // L: 10211 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 10212 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 10213 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 10214 - } else if (var0.yAlignment == 4) { // L: 10215 - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10216 - } - - } // L: 10217 } diff --git a/runescape-client/src/main/java/class163.java b/runescape-client/src/main/java/class163.java index 4a6c2549ec..038e374c20 100644 --- a/runescape-client/src/main/java/class163.java +++ b/runescape-client/src/main/java/class163.java @@ -1,53 +1,225 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fa") public class class163 extends class166 { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 741785429 + intValue = -2137509577 ) - int field1781; + int field1761; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lev;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lef;Ljava/lang/String;I)V" + descriptor = "(Lev;Ljava/lang/String;I)V" ) class163(class155 var1, String var2, int var3) { super(var1, var2); // L: 372 this.this$0 = var1; // L: 371 - this.field1781 = var3; // L: 373 + this.field1761 = var3; // L: 373 } // L: 374 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "695673663" + garbageValue = "-1689964957" ) - public int vmethod3297() { + public int vmethod3341() { return 0; // L: 377 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2036911205" + descriptor = "(S)I", + garbageValue = "31414" ) - public int vmethod3299() { - return this.field1781; // L: 382 + public int vmethod3334() { + return this.field1761; // L: 381 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)[Lkz;", - garbageValue = "-50" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "760271805" ) - static class302[] method3283() { - return new class302[]{class302.field3557, class302.field3555}; // L: 35 + public static int method3321(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) { // L: 13 + 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; } + + @ObfuscatedName("v") + public static final int method3320(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (var2 != 0.0D) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = (1.0D + var2) * var4; + } else { + var12 = var4 + var2 - var4 * var2; // L: 15 + } + + double var14 = 2.0D * var4 - var12; // L: 16 + double var16 = var0 + 0.3333333333333333D; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (6.0D * var16 < 1.0D) { // L: 22 + var6 = var14 + 6.0D * (var12 - var14) * var16; + } else if (2.0D * var16 < 1.0D) { // L: 23 + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { // L: 24 + var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; + } else { + var6 = var14; // L: 25 + } + + if (6.0D * var0 < 1.0D) { // L: 26 + var8 = var14 + (var12 - var14) * 6.0D * var0; + } else if (2.0D * var0 < 1.0D) { // L: 27 + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (0.6666666666666666D - var0) * (var12 - var14) * 6.0D; // L: 28 + } else { + var8 = var14; // L: 29 + } + + if (6.0D * var20 < 1.0D) { // L: 30 + var10 = var14 + var20 * (var12 - var14) * 6.0D; + } else if (var20 * 2.0D < 1.0D) { // L: 31 + var10 = var12; + } else if (3.0D * var20 < 2.0D) { // L: 32 + var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; + } else { + var10 = var14; // L: 33 + } + } + + int var22 = (int)(256.0D * var6); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(var10 * 256.0D); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lln;Lln;ZLmd;I)V", + garbageValue = "845693367" + ) + public static void method3318(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + SoundCache.ItemDefinition_archive = var0; // L: 84 + AttackOption.ItemDefinition_modelArchive = var1; // L: 85 + DevicePcmPlayerProvider.ItemDefinition_inMembersWorld = var2; // L: 86 + class293.ItemDefinition_fileCount = SoundCache.ItemDefinition_archive.getGroupFileCount(10); // L: 87 + ParamComposition.ItemDefinition_fontPlain11 = var3; // L: 88 + } // L: 89 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Lgw;", + garbageValue = "-26" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 52 + if (var1 != null) { // L: 53 + return var1; + } else { + byte[] var2 = class11.SequenceDefinition_archive.takeFile(12, var0); // L: 54 + var1 = new SequenceDefinition(); // L: 55 + if (var2 != null) { // L: 56 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 57 + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 58 + return var1; // L: 59 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lln;Lln;IIB)Lmd;", + garbageValue = "3" + ) + public static Font method3322(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + byte[] var5 = var0.takeFile(var2, var3); // L: 71 + boolean var4; + if (var5 == null) { // L: 72 + var4 = false; // L: 73 + } else { + WorldMapArea.SpriteBuffer_decode(var5); // L: 76 + var4 = true; // L: 77 + } + + return !var4 ? null : ViewportMouse.method5090(var1.takeFile(var2, var3)); // L: 79 80 + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(Lct;I)V", + garbageValue = "-2096027290" + ) + static final void method3315(PendingSpawn var0) { + long var1 = 0L; // L: 7731 + int var3 = -1; // L: 7732 + int var4 = 0; // L: 7733 + int var5 = 0; // L: 7734 + if (var0.type == 0) { // L: 7735 + var1 = ArchiveLoader.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7736 + var1 = ArchiveLoader.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7737 + var1 = ArchiveLoader.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = ArchiveLoader.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7738 + } + + if (var1 != 0L) { // L: 7739 + int var6 = ArchiveLoader.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7740 + var3 = FileSystem.Entity_unpackID(var1); // L: 7741 + var4 = var6 & 31; // L: 7742 + var5 = var6 >> 6 & 3; // L: 7743 + } + + var0.objectId = var3; // L: 7745 + var0.field1105 = var4; // L: 7746 + var0.field1104 = var5; // L: 7747 + } // L: 7748 } diff --git a/runescape-client/src/main/java/class166.java b/runescape-client/src/main/java/class166.java index 1a60a195bb..6b20195baf 100644 --- a/runescape-client/src/main/java/class166.java +++ b/runescape-client/src/main/java/class166.java @@ -2,119 +2,99 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fy") public abstract class class166 { - @ObfuscatedName("g") - String field1800; + @ObfuscatedName("er") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("f") + String field1784; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lev;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lef;Ljava/lang/String;)V" + descriptor = "(Lev;Ljava/lang/String;)V" ) class166(class155 var1, String var2) { this.this$0 = var1; // L: 349 - this.field1800 = var2; // L: 350 + this.field1784 = var2; // L: 350 } // L: 351 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "695673663" + garbageValue = "-1689964957" ) - public abstract int vmethod3297(); - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1251344393" - ) - public String vmethod3296() { - return null; // L: 360 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2036911205" - ) - public int vmethod3299() { - return -1; // L: 364 - } + public abstract int vmethod3341(); @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-188699154" + garbageValue = "-1535635597" ) - public String method3295() { - return this.field1800; // L: 354 + public String vmethod3333() { + return null; // L: 360 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "31414" + ) + public int vmethod3334() { + return -1; // L: 364 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1565195200" + ) + public String method3336() { + return this.field1784; // L: 354 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;B)V", - garbageValue = "-2" + descriptor = "(IB)Lqa;", + garbageValue = "29" ) - public static void method3310(AbstractArchive var0) { - StructComposition.StructDefinition_archive = var0; // L: 19 - } // L: 20 + public static PrivateChatMode method3343(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4739, PrivateChatMode.field4741, PrivateChatMode.field4738}; // L: 18 + PrivateChatMode[] var2 = var1; // L: 20 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "536525986" - ) - public static int[] method3311() { - int[] var0 = new int[KeyHandler.field134]; // L: 248 - - for (int var1 = 0; var1 < KeyHandler.field134; ++var1) { // L: 249 - var0[var1] = KeyHandler.field133[var1]; // L: 250 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 + PrivateChatMode var4 = var2[var3]; // L: 22 + if (var0 == var4.field4740) { // L: 24 + return var4; + } } - return var0; // L: 252 + return null; // L: 28 } - @ObfuscatedName("gq") + @ObfuscatedName("fi") @ObfuscatedSignature( - descriptor = "(Lcw;ZB)V", - garbageValue = "-64" + descriptor = "(B)I", + garbageValue = "-1" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4303 - var0.isUnanimated = false; // L: 4304 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4305 4306 - var0.isUnanimated = true; + static int method3342() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1468 + int var0 = 0; // L: 1469 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1470 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1471 } - int var2 = var0.x >> 7; // L: 4308 - int var3 = var0.y >> 7; // L: 4309 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4310 - long var4 = MilliClock.calculateTag(0, 0, 0, false, var0.index); // L: 4311 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4312 - var0.isUnanimated = false; // L: 4313 - var0.tileHeight = Archive.getTileHeight(var0.x, var0.y, class160.Client_plane); // L: 4314 - var0.playerCycle = Client.cycle; // L: 4315 - FriendSystem.scene.addNullableObject(class160.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4316 - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4319 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4320 - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4321 - } - - var0.tileHeight = Archive.getTileHeight(var0.x, var0.y, class160.Client_plane); // L: 4323 - var0.playerCycle = Client.cycle; // L: 4324 - FriendSystem.scene.drawEntity(class160.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4325 - } - } + return var0 * 10000 / Client.field782; // L: 1473 + } else { + return 10000; } - - } // L: 4329 + } } diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java index 7b44d5a664..b0a7b71a69 100644 --- a/runescape-client/src/main/java/class168.java +++ b/runescape-client/src/main/java/class168.java @@ -1,33 +1,148 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ff") +@ObfuscatedName("fj") public class class168 { - @ObfuscatedName("h") - public short[] field1804; - @ObfuscatedName("g") - public short[] field1805; + @ObfuscatedName("i") + public short[] field1791; + @ObfuscatedName("f") + public short[] field1790; - public class168(int var1) { - ItemComposition var2 = class67.ItemDefinition_get(var1); // L: 12 - if (var2.method3763()) { // L: 13 - this.field1804 = new short[var2.recolorTo.length]; // L: 14 - System.arraycopy(var2.recolorTo, 0, this.field1804, 0, this.field1804.length); // L: 15 + class168(int var1) { + ItemComposition var2 = class19.ItemDefinition_get(var1); // L: 12 + if (var2.method3722()) { // L: 13 + this.field1791 = new short[var2.recolorTo.length]; // L: 14 + System.arraycopy(var2.recolorTo, 0, this.field1791, 0, this.field1791.length); // L: 15 } - if (var2.method3711()) { // L: 17 - this.field1805 = new short[var2.retextureTo.length]; // L: 18 - System.arraycopy(var2.retextureTo, 0, this.field1805, 0, this.field1805.length); // L: 19 + if (var2.method3708()) { // L: 17 + this.field1790 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1790, 0, this.field1790.length); // L: 19 } } // L: 21 - @ObfuscatedName("ih") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1915861434" + descriptor = "(ILbd;ZB)I", + garbageValue = "-32" ) - static final int method3324() { - return Client.menuOptionsCount - 1; // L: 9232 + static int method3353(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 478 + Interpreter.Interpreter_intStackSize -= 3; // L: 479 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 480 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 481 + int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 482 + if (var4 == 0) { // L: 483 + throw new RuntimeException(); // L: 484 + } else { + Widget var6 = class127.getWidget(var9); // L: 486 + if (var6.children == null) { // L: 487 + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { // L: 488 + Widget[] var7 = new Widget[var11 + 1]; // L: 489 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 490 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 491 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 493 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 494 + var12.type = var4; // L: 495 + var12.parentId = var12.id = var6.id; // L: 496 + var12.childIndex = var11; // L: 497 + var12.isIf3 = true; // L: 498 + var6.children[var11] = var12; // L: 499 + if (var2) { // L: 500 + WorldMapID.scriptDotWidget = var12; + } else { + Interpreter.scriptActiveWidget = var12; // L: 501 + } + + class346.invalidateWidget(var6); // L: 502 + return 1; // L: 503 + } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 505 + var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 506 + Widget var10 = class127.getWidget(var3.id); // L: 507 + var10.children[var3.childIndex] = null; // L: 508 + class346.invalidateWidget(var10); // L: 509 + return 1; // L: 510 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 512 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 513 + var3.children = null; // L: 514 + class346.invalidateWidget(var3); // L: 515 + return 1; // L: 516 + } else if (var0 == 103) { // L: 518 + Interpreter.Interpreter_intStackSize -= 3; // L: 519 + return 1; // L: 520 + } else if (var0 == 104) { // L: 522 + --Interpreter.Interpreter_intStackSize; // L: 523 + return 1; // L: 524 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 526 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 539 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 540 + if (var3 != null) { // L: 541 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 542 + if (var2) { // L: 543 + WorldMapID.scriptDotWidget = var3; + } else { + Interpreter.scriptActiveWidget = var3; // L: 544 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 546 + } + + return 1; // L: 547 + } else if (var0 == 202) { // L: 549 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] = 0; // L: 550 + return 1; // L: 551 + } else if (var0 == 203) { // L: 553 + Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize + 1] = 0; // L: 554 + return 1; // L: 555 + } else { + return 2; // L: 557 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 527 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 528 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 529 + Widget var5 = ItemComposition.getWidgetChild(var9, var4); // L: 530 + if (var5 != null && var4 != -1) { // L: 531 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 532 + if (var2) { // L: 533 + WorldMapID.scriptDotWidget = var5; + } else { + Interpreter.scriptActiveWidget = var5; // L: 534 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 536 + } + + return 1; // L: 537 + } + } + } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-127" + ) + static boolean method3351() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 11179 } } diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index f1a357a774..38b7c6c982 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -1,4 +1,3 @@ -import java.io.File; import java.security.Principal; import java.security.cert.Certificate; import javax.net.ssl.SSLPeerUnverifiedException; @@ -6,709 +5,248 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.security.cert.X509Certificate; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("w") +@ObfuscatedName("t") class class17 implements SSLSession { - @ObfuscatedName("o") - @Export("FileSystem_cacheDir") - public static File FileSystem_cacheDir; - @ObfuscatedName("im") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lql;" + descriptor = "Lqi;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("r") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("fu") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("no") + @ObfuscatedGetter( + intValue = -2098489797 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lc;" + descriptor = "Lw;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lc;)V" + descriptor = "(Lw;)V" ) class17(class12 var1) { - this.this$1 = var1; // L: 131 + this.this$1 = var1; // L: 115 } public int getApplicationBufferSize() { - return 0; // L: 134 + return 0; // L: 117 } public String getCipherSuite() { - throw new UnsupportedOperationException(); // L: 139 - } - - public long getCreationTime() { - throw new UnsupportedOperationException(); // L: 144 + throw new UnsupportedOperationException(); // L: 121 } public byte[] getId() { - throw new UnsupportedOperationException(); // L: 149 + throw new UnsupportedOperationException(); // L: 129 } - public long getLastAccessedTime() { - throw new UnsupportedOperationException(); // L: 154 - } - - public Principal getLocalPrincipal() { - throw new UnsupportedOperationException(); // L: 164 - } - - public void invalidate() { - throw new UnsupportedOperationException(); // L: 219 - } - - public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { - return null; // L: 174 - } - - public String getPeerHost() { - throw new UnsupportedOperationException(); // L: 184 - } - - public int getPeerPort() { - return 0; // L: 189 - } - - public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { - return null; // L: 194 - } - - public String getProtocol() { - throw new UnsupportedOperationException(); // L: 199 - } - - public boolean isValid() { - throw new UnsupportedOperationException(); // L: 224 - } - - public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field65; // L: 179 + public long getCreationTime() { + throw new UnsupportedOperationException(); // L: 125 } public Certificate[] getLocalCertificates() { - throw new UnsupportedOperationException(); // L: 159 + throw new UnsupportedOperationException(); // L: 137 } - public Object getValue(String var1) { - throw new UnsupportedOperationException(); // L: 209 + public Principal getLocalPrincipal() { + throw new UnsupportedOperationException(); // L: 141 } - public void removeValue(String var1) { - throw new UnsupportedOperationException(); // L: 234 + public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { + return null; // L: 149 + } + + public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { + return this.this$1.field62; // L: 153 + } + + public int getPeerPort() { + return 0; // L: 161 + } + + public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { + return null; // L: 165 } public void putValue(String var1, Object var2) { - throw new UnsupportedOperationException(); // L: 229 - } - - public SSLSessionContext getSessionContext() { - throw new UnsupportedOperationException(); // L: 204 + throw new UnsupportedOperationException(); // L: 193 } public int getPacketBufferSize() { - throw new UnsupportedOperationException(); // L: 169 + throw new UnsupportedOperationException(); // L: 145 } public String[] getValueNames() { - throw new UnsupportedOperationException(); // L: 214 + throw new UnsupportedOperationException(); // L: 181 } - @ObfuscatedName("e") + public boolean isValid() { + throw new UnsupportedOperationException(); // L: 189 + } + + public void removeValue(String var1) { + throw new UnsupportedOperationException(); // L: 197 + } + + public SSLSessionContext getSessionContext() { + throw new UnsupportedOperationException(); // L: 173 + } + + public String getProtocol() { + throw new UnsupportedOperationException(); // L: 169 + } + + public long getLastAccessedTime() { + throw new UnsupportedOperationException(); // L: 133 + } + + public void invalidate() { + throw new UnsupportedOperationException(); // L: 185 + } + + public String getPeerHost() { + throw new UnsupportedOperationException(); // L: 157 + } + + public Object getValue(String var1) { + throw new UnsupportedOperationException(); // L: 177 + } + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "912175547" + descriptor = "(ILnw;Llx;I)V", + garbageValue = "-71140418" ) - static int method259(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1470 - var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1471 - Login.addGameMessage(0, "", var7); // L: 1472 - return 1; // L: 1473 - } else if (var0 == ScriptOpcodes.ANIM) { - class295.Interpreter_intStackSize -= 2; // L: 1476 - KeyHandler.performPlayerAnimation(class19.localPlayer, Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 1477 - return 1; // L: 1478 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field838) { // L: 1481 - Interpreter.field837 = true; // L: 1482 - } - - return 1; // L: 1484 - } else { - int var15; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1487 - var15 = 0; // L: 1488 - if (class20.isNumber(var7)) { // L: 1489 - var15 = class16.method217(var7); - } - - PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 1491 - var13.packetBuffer.writeInt(var15); // L: 1492 - Client.packetWriter.addNode(var13); // L: 1493 - return 1; // L: 1494 - } else { - PacketBufferNode var11; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1497 - var11 = ItemContainer.getPacketBufferNode(ClientPacket.field2910, Client.packetWriter.isaacCipher); // L: 1499 - var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500 - var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501 - Client.packetWriter.addNode(var11); // L: 1502 - return 1; // L: 1503 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1506 - var11 = ItemContainer.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 1508 - var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509 - var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510 - Client.packetWriter.addNode(var11); // L: 1511 - return 1; // L: 1512 - } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1515 - var4 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1516 - VertexNormal.method4497(var10, var4); // L: 1517 - return 1; // L: 1518 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - class295.Interpreter_intStackSize -= 3; // L: 1521 - var10 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1522 - var15 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1523 - int var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 1524 - Widget var14 = HorizontalAlignment.getWidget(var9); // L: 1525 - PcmPlayer.clickWidget(var14, var10, var15); // L: 1526 - return 1; // L: 1527 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - class295.Interpreter_intStackSize -= 2; // L: 1530 - var10 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1531 - var15 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1532 - Widget var12 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1533 - PcmPlayer.clickWidget(var12, var10, var15); // L: 1534 - return 1; // L: 1535 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - UserComparator5.mouseCam = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1538 - return 1; // L: 1539 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2255() ? 1 : 0; // L: 1542 - return 1; // L: 1543 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - Interpreter.clientPreferences.method2254(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1); // L: 1546 - return 1; // L: 1547 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1550 - boolean var8 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1551 - class11.openURL(var7, var8, false); // L: 1552 - return 1; // L: 1553 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1556 - var11 = ItemContainer.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 1558 - var11.packetBuffer.writeShort(var10); // L: 1559 - Client.packetWriter.addNode(var11); // L: 1560 - return 1; // L: 1561 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1564 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 1565 - var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 1566 - String var5 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 1567 - if (var4.length() > 500) { // L: 1568 - return 1; - } else if (var5.length() > 500) { // L: 1569 - return 1; - } else { - PacketBufferNode var6 = ItemContainer.getPacketBufferNode(ClientPacket.field2956, Client.packetWriter.isaacCipher); // L: 1570 - var6.packetBuffer.writeShort(1 + ItemLayer.stringCp1252NullTerminatedByteSize(var4) + ItemLayer.stringCp1252NullTerminatedByteSize(var5)); // L: 1571 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1572 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1573 - var6.packetBuffer.method7788(var10); // L: 1574 - Client.packetWriter.addNode(var6); // L: 1575 - return 1; // L: 1576 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1579 - return 1; // L: 1580 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1583 - return 1; // L: 1584 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1587 - return 1; // L: 1588 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1591 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1592 - } - - return 1; // L: 1593 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1596 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1597 - } - - return 1; // L: 1598 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1601 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1602 - } - - return 1; // L: 1603 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1606 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1607 - } - - return 1; // L: 1608 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1611 - return 1; // L: 1612 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1615 - return 1; // L: 1616 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1619 - return 1; // L: 1620 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - SpriteMask.setTapToDrop(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1); // L: 1623 - return 1; // L: 1624 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = TextureProvider.getTapToDrop() ? 1 : 0; // L: 1627 - return 1; // L: 1628 - } else if (var0 == 3129) { - class295.Interpreter_intStackSize -= 2; // L: 1631 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1632 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1633 - return 1; // L: 1634 - } else if (var0 == 3130) { - class295.Interpreter_intStackSize -= 2; // L: 1637 - return 1; // L: 1638 - } else if (var0 == 3131) { - --class295.Interpreter_intStackSize; // L: 1641 - return 1; // L: 1642 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class4.canvasWidth; // L: 1645 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class309.canvasHeight; // L: 1646 - return 1; // L: 1647 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --class295.Interpreter_intStackSize; // L: 1650 - return 1; // L: 1651 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1654 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - class295.Interpreter_intStackSize -= 2; // L: 1657 - return 1; // L: 1658 - } else if (var0 == 3136) { - Client.field652 = 3; // L: 1661 - Client.field653 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1662 - return 1; // L: 1663 - } else if (var0 == 3137) { - Client.field652 = 2; // L: 1666 - Client.field653 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1667 - return 1; // L: 1668 - } else if (var0 == 3138) { - Client.field652 = 0; // L: 1671 - return 1; // L: 1672 - } else if (var0 == 3139) { - Client.field652 = 1; // L: 1675 - return 1; // L: 1676 - } else if (var0 == 3140) { - Client.field652 = 3; // L: 1679 - Client.field653 = var2 ? class432.scriptDotWidget.id * 2073510769 * -769712751 : class341.scriptActiveWidget.id * 2073510769 * -769712751; // L: 1680 - return 1; // L: 1681 - } else { - boolean var3; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1684 - Interpreter.clientPreferences.method2256(var3); // L: 1685 - return 1; // L: 1686 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2257() ? 1 : 0; // L: 1689 - return 1; // L: 1690 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1693 - Client.Login_isUsernameRemembered = var3; // L: 1694 - if (!var3) { // L: 1695 - Interpreter.clientPreferences.method2316(""); // L: 1696 - } - - return 1; // L: 1698 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701 - return 1; // L: 1702 - } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; // L: 1705 - } else if (var0 == 3146) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1708 - Interpreter.clientPreferences.method2258(!var3); // L: 1709 - return 1; // L: 1710 - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2259() ? 0 : 1; // L: 1713 - return 1; // L: 1714 - } else if (var0 == 3148) { - return 1; // L: 1717 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1720 - return 1; // L: 1721 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1724 - return 1; // L: 1725 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1728 - return 1; // L: 1729 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1732 - return 1; // L: 1733 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736 - return 1; // L: 1737 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = InterfaceParent.method2103(); // L: 1740 - return 1; // L: 1741 - } else if (var0 == 3155) { - --ChatChannel.Interpreter_stringStackSize; // L: 1744 - return 1; // L: 1745 - } else if (var0 == 3156) { - return 1; // L: 1748 - } else if (var0 == 3157) { - class295.Interpreter_intStackSize -= 2; // L: 1751 - return 1; // L: 1752 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1755 - return 1; // L: 1756 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1759 - return 1; // L: 1760 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1763 - return 1; // L: 1764 - } else if (var0 == 3161) { - --class295.Interpreter_intStackSize; // L: 1767 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1768 - return 1; // L: 1769 - } else if (var0 == 3162) { - --class295.Interpreter_intStackSize; // L: 1772 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1773 - return 1; // L: 1774 - } else if (var0 == 3163) { - --ChatChannel.Interpreter_stringStackSize; // L: 1777 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1778 - return 1; // L: 1779 - } else if (var0 == 3164) { - --class295.Interpreter_intStackSize; // L: 1782 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1783 - return 1; // L: 1784 - } else if (var0 == 3165) { - --class295.Interpreter_intStackSize; // L: 1787 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1788 - return 1; // L: 1789 - } else if (var0 == 3166) { - class295.Interpreter_intStackSize -= 2; // L: 1792 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1793 - return 1; // L: 1794 - } else if (var0 == 3167) { - class295.Interpreter_intStackSize -= 2; // L: 1797 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1798 - return 1; // L: 1799 - } else if (var0 == 3168) { - class295.Interpreter_intStackSize -= 2; // L: 1802 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1803 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1804 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1805 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1806 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1807 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1808 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1809 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1810 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1811 - return 1; // L: 1812 - } else if (var0 == 3169) { - return 1; // L: 1815 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1818 - return 1; // L: 1819 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1822 - return 1; // L: 1823 - } else if (var0 == 3172) { - --class295.Interpreter_intStackSize; // L: 1826 - return 1; // L: 1827 - } else if (var0 == 3173) { - --class295.Interpreter_intStackSize; // L: 1830 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1831 - return 1; // L: 1832 - } else if (var0 == 3174) { - --class295.Interpreter_intStackSize; // L: 1835 - return 1; // L: 1836 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1839 - return 1; // L: 1840 - } else if (var0 == 3176) { - return 1; // L: 1843 - } else if (var0 == 3177) { - return 1; // L: 1846 - } else if (var0 == 3178) { - --ChatChannel.Interpreter_stringStackSize; // L: 1849 - return 1; // L: 1850 - } else if (var0 == 3179) { - return 1; // L: 1853 - } else if (var0 == 3180) { - --ChatChannel.Interpreter_stringStackSize; // L: 1856 - return 1; // L: 1857 - } else if (var0 == 3181) { - WorldMapSection0.method4940(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1860 - return 1; // L: 1861 - } else if (var0 == 3182) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ViewportMouse.method4492(); // L: 1864 - return 1; // L: 1865 - } else if (var0 != 3183 && var0 != 3184) { - if (var0 == 3187) { - ChatChannel.Interpreter_stringStackSize -= 2; // L: 1872 - return 1; // L: 1873 - } else { - return var0 == 3188 ? 1 : 2; // L: 1876 1878 - } - } else { - --class295.Interpreter_intStackSize; // L: 1868 - return 1; // L: 1869 - } - } + static void method256(int var0, ArchiveDisk var1, Archive var2) { + byte[] var3 = null; // L: 18 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 20 + if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { // L: 21 + var3 = var5.data; // L: 22 + break; // L: 23 } } } + + if (var3 != null) { // L: 27 + var2.load(var1, var0, var3, true); // L: 28 + } else { + byte[] var4 = var1.read(var0); // L: 31 + var2.load(var1, var0, var4, true); // L: 32 + } + } // L: 29 33 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "-20872" + ) + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 } - @ObfuscatedName("ar") + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1840232783" + descriptor = "(IIIIZI)V", + garbageValue = "1219931698" ) - static int method280(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { // L: 3039 - class295.Interpreter_intStackSize -= 2; // L: 3040 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3041 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3042 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 + var4; // L: 3043 - return 1; // L: 3044 - } else if (var0 == ScriptOpcodes.SUB) { // L: 3046 - class295.Interpreter_intStackSize -= 2; // L: 3047 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3048 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3049 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 - var4; // L: 3050 - return 1; // L: 3051 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3053 - class295.Interpreter_intStackSize -= 2; // L: 3054 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3055 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3056 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 * var4; // L: 3057 - return 1; // L: 3058 - } else if (var0 == ScriptOpcodes.DIV) { // L: 3060 - class295.Interpreter_intStackSize -= 2; // L: 3061 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3062 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3063 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 / var4; // L: 3064 - return 1; // L: 3065 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3067 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3068 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3069 - return 1; // L: 3070 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3072 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3073 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3074 - return 1; // L: 3075 + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4702 + var2 = 1; + } + + if (var3 < 1) { // L: 4703 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4704 + int var6; + if (var5 < 0) { // L: 4706 + var6 = Client.field760; + } else if (var5 >= 100) { // L: 4707 + var6 = Client.field761; } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3077 - class295.Interpreter_intStackSize -= 5; // L: 3078 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3079 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3080 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3081 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 3082 - var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 4]; // L: 3083 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 3084 - return 1; // L: 3085 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3087 - class295.Interpreter_intStackSize -= 2; // L: 3088 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3089 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3090 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 3091 - return 1; // L: 3092 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3094 - class295.Interpreter_intStackSize -= 2; // L: 3095 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3096 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3097 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3098 - return 1; // L: 3099 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3101 - class295.Interpreter_intStackSize -= 2; // L: 3102 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3103 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3104 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3105 - return 1; // L: 3106 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3108 - class295.Interpreter_intStackSize -= 2; // L: 3109 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3110 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3111 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3112 - return 1; // L: 3113 - } else if (var0 == ScriptOpcodes.MOD) { // L: 3115 - class295.Interpreter_intStackSize -= 2; // L: 3116 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3117 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3118 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 % var4; // L: 3119 - return 1; // L: 3120 - } else if (var0 == ScriptOpcodes.POW) { // L: 3122 - class295.Interpreter_intStackSize -= 2; // L: 3123 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3124 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3125 - if (var3 == 0) { // L: 3126 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3127 + var6 = (Client.field761 - Client.field760) * var5 / 100 + Client.field760; // L: 4708 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4709 + int var8; + int var9; + short var15; + if (var7 < Client.field766) { // L: 4710 + var15 = Client.field766; // L: 4711 + var6 = var15 * var2 * 334 / (var3 * 512); // L: 4712 + if (var6 > Client.field765) { // L: 4713 + var6 = Client.field765; // L: 4714 + var8 = var3 * var6 * 512 / (var15 * 334); // L: 4715 + var9 = (var2 - var8) / 2; // L: 4716 + if (var4) { // L: 4717 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4718 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4719 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4720 } - return 1; // L: 3128 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3130 - class295.Interpreter_intStackSize -= 2; // L: 3131 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3132 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3133 - if (var3 == 0) { // L: 3134 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3135 - return 1; // L: 3136 - } else { - switch(var4) { // L: 3138 - case 0: - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3156 - break; // L: 3157 - case 1: - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3166 - break; - case 2: - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3146 - break; // L: 3147 - case 3: - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3151 - break; // L: 3152 - case 4: - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3161 - break; // L: 3162 - default: - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3141 - } - - return 1; // L: 3170 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 3172 - class295.Interpreter_intStackSize -= 2; // L: 3173 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3174 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3175 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 & var4; // L: 3176 - return 1; // L: 3177 - } else if (var0 == ScriptOpcodes.OR) { // L: 3179 - class295.Interpreter_intStackSize -= 2; // L: 3180 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3181 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3182 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 | var4; // L: 3183 - return 1; // L: 3184 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 3186 - class295.Interpreter_intStackSize -= 3; // L: 3187 - long var9 = (long)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3188 - long var11 = (long)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3189 - long var13 = (long)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3190 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 3191 - return 1; // L: 3192 - } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3194 - var3 = class263.method5208(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 3195 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3196 - return 1; // L: 3197 - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3199 - class295.Interpreter_intStackSize -= 2; // L: 3200 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3201 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3202 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3203 - return 1; // L: 3204 - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3206 - class295.Interpreter_intStackSize -= 3; // L: 3207 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3208 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3209 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3210 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = NetSocket.method3271(var3, var4, var5); // L: 3211 - return 1; // L: 3212 - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3214 - class295.Interpreter_intStackSize -= 3; // L: 3215 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3216 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3217 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3218 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class425.method7636(var3, var4, var5); // L: 3219 - return 1; // L: 3220 - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3222 - class295.Interpreter_intStackSize -= 3; // L: 3223 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3224 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3225 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3226 - var6 = 31 - var5; // L: 3227 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; // L: 3228 - return 1; // L: 3229 - } else if (var0 == 4030) { // L: 3231 - class295.Interpreter_intStackSize -= 4; // L: 3232 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3233 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3234 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3235 - var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 3236 - var3 = class425.method7636(var3, var5, var6); // L: 3237 - var7 = class260.method5203(var6 - var5 + 1); // L: 3238 - if (var4 > var7) { // L: 3239 - var4 = var7; + var0 += var9; // L: 4722 + var2 -= var9 * 2; // L: 4723 + } + } else if (var7 > Client.field666) { // L: 4726 + var15 = Client.field666; // L: 4727 + var6 = var15 * var2 * 334 / (var3 * 512); // L: 4728 + if (var6 < Client.field764) { // L: 4729 + var6 = Client.field764; // L: 4730 + var8 = var15 * var2 * 334 / (var6 * 512); // L: 4731 + var9 = (var3 - var8) / 2; // L: 4732 + if (var4) { // L: 4733 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4734 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4735 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4736 } - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3240 - return 1; // L: 3241 - } else if (var0 == 4032) { // L: 3243 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = class18.method282(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]); // L: 3244 - return 1; // L: 3245 - } else if (var0 == 4033) { // L: 3247 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = class127.method2831(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]); // L: 3248 - return 1; // L: 3249 - } else if (var0 == 4034) { // L: 3251 - class295.Interpreter_intStackSize -= 2; // L: 3252 - var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3253 - var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3254 - var5 = class392.method7190(var3, var4); // L: 3255 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5; // L: 3256 - return 1; // L: 3257 - } else if (var0 == 4035) { // L: 3259 - Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]); // L: 3260 - return 1; // L: 3261 - } else { - return 2; // L: 3263 + var1 += var9; // L: 4738 + var3 -= var9 * 2; // L: 4739 } } - } - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-28885" - ) - static void method228() { - PacketBufferNode var0 = ItemContainer.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 3938 - var0.packetBuffer.writeByte(ReflectionCheck.getWindowedMode()); // L: 3939 - var0.packetBuffer.writeShort(class4.canvasWidth); // L: 3940 - var0.packetBuffer.writeShort(class309.canvasHeight); // L: 3941 - Client.packetWriter.addNode(var0); // L: 3942 - } // L: 3943 + Client.viewportZoom = var3 * var6 / 334; // L: 4742 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4743 + int[] var14 = new int[9]; // L: 4745 + + for (var9 = 0; var9 < var14.length; ++var9) { // L: 4746 + int var10 = var9 * 32 + 15 + 128; // L: 4747 + int var11 = var10 * 3 + 600; // L: 4750 + int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4753 + int var12 = class13.method164(var11, var3); // L: 4754 + var14[var9] = var13 * var12 >> 16; // L: 4755 + } + + Scene.Scene_buildVisiblityMap(var14, 500, 800, var2 * 334 / var3, 334); // L: 4757 + } + + Client.viewportOffsetX = var0; // L: 4760 + Client.viewportOffsetY = var1; // L: 4761 + Client.viewportWidth = var2; // L: 4762 + Client.viewportHeight = var3; // L: 4763 + } // L: 4764 } diff --git a/runescape-client/src/main/java/class175.java b/runescape-client/src/main/java/class175.java index 5c88bb5710..96fb40b3b2 100644 --- a/runescape-client/src/main/java/class175.java +++ b/runescape-client/src/main/java/class175.java @@ -1,433 +1,122 @@ 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("fe") +@ObfuscatedName("fz") public class class175 { - @ObfuscatedName("ta") - @ObfuscatedGetter( - intValue = 327954161 - ) - static int field1883; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "(Lpz;II)Z", + garbageValue = "-1279876475" ) - @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 376 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 377 + if (var0.readBits(1) != 0) { // L: 378 + updateExternalPlayer(var0, var1); + } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lca;III)V", - garbageValue = "-1185850498" - ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; // L: 112 - Script var4; - int var20; - if (MusicPatchNode2.isWorldMapEvent(var0.type)) { // L: 114 - class293.worldMapEvent = (WorldMapEvent)var3[0]; // L: 115 - WorldMapElement var5 = class19.WorldMapElement_get(class293.worldMapEvent.mapElement); // L: 116 - var4 = FriendSystem.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 117 + var3 = var0.readBits(13); // L: 379 + var4 = var0.readBits(13); // L: 380 + boolean var12 = var0.readBits(1) == 1; // L: 381 + if (var12) { // L: 382 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 383 + throw new RuntimeException(); // L: 384 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 386 + var11.index = var1; // L: 387 + if (Players.field1276[var1] != null) { // L: 388 + var11.read(Players.field1276[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 389 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 390 + var7 = Players.Players_regions[var1]; // L: 391 + var8 = var7 >> 28; // L: 392 + var9 = var7 >> 14 & 255; // L: 393 + var10 = var7 & 255; // L: 394 + var11.pathTraversed[0] = Players.field1286[var1]; // L: 395 + var11.plane = (byte)var8; // L: 396 + var11.resetPath((var9 << 13) + var3 - GrandExchangeOfferOwnWorldComparator.baseX, (var10 << 13) + var4 - VarcInt.baseY); // L: 397 + var11.field1070 = false; // L: 398 + return true; // L: 399 + } + } else if (var2 == 1) { // L: 401 + var3 = var0.readBits(2); // L: 402 + var4 = Players.Players_regions[var1]; // L: 403 + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 404 + return false; // L: 405 } else { - var20 = (Integer)var3[0]; // L: 120 - var4 = class101.getScript(var20); // L: 121 + int var5; + int var6; + if (var2 == 2) { // L: 407 + var3 = var0.readBits(5); // L: 408 + var4 = var3 >> 3; // L: 409 + var5 = var3 & 7; // L: 410 + var6 = Players.Players_regions[var1]; // L: 411 + var7 = (var6 >> 28) + var4 & 3; // L: 412 + var8 = var6 >> 14 & 255; // L: 413 + var9 = var6 & 255; // L: 414 + if (var5 == 0) { // L: 415 + --var8; // L: 416 + --var9; // L: 417 + } + + if (var5 == 1) { // L: 419 + --var9; + } + + if (var5 == 2) { // L: 420 + ++var8; // L: 421 + --var9; // L: 422 + } + + if (var5 == 3) { // L: 424 + --var8; + } + + if (var5 == 4) { // L: 425 + ++var8; + } + + if (var5 == 5) { // L: 426 + --var8; // L: 427 + ++var9; // L: 428 + } + + if (var5 == 6) { // L: 430 + ++var9; + } + + if (var5 == 7) { // L: 431 + ++var8; // L: 432 + ++var9; // L: 433 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 435 + return false; // L: 436 + } else { + var3 = var0.readBits(18); // L: 438 + var4 = var3 >> 16; // L: 439 + var5 = var3 >> 8 & 255; // L: 440 + var6 = var3 & 255; // L: 441 + var7 = Players.Players_regions[var1]; // L: 442 + var8 = (var7 >> 28) + var4 & 3; // L: 443 + var9 = var5 + (var7 >> 14) & 255; // L: 444 + var10 = var6 + var7 & 255; // L: 445 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 446 + return false; // L: 447 + } } - - if (var4 != null) { // L: 123 - class295.Interpreter_intStackSize = 0; // L: 126 - ChatChannel.Interpreter_stringStackSize = 0; // L: 127 - var20 = -1; // L: 128 - int[] var6 = var4.opcodes; // L: 129 - int[] var7 = var4.intOperands; // L: 130 - byte var8 = -1; // L: 131 - Interpreter.Interpreter_frameDepth = 0; // L: 132 - Interpreter.field837 = false; // L: 133 - boolean var9 = false; // L: 134 - int var10 = 0; // L: 135 - boolean var30 = false; - - label951: { - label952: { - try { - int var13; - try { - var30 = true; // L: 137 - class385.Interpreter_intLocals = new int[var4.localIntCount]; // L: 138 - int var11 = 0; // L: 139 - Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 140 - int var12 = 0; - - int var14; - String var21; - for (var13 = 1; var13 < var3.length; ++var13) { // L: 141 - if (var3[var13] instanceof Integer) { // L: 142 - var14 = (Integer)var3[var13]; // L: 143 - if (var14 == -2147483647) { // L: 144 - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { // L: 145 - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { // L: 146 - var14 = var0.widget != null ? var0.widget.id * 2073510769 * -769712751 : -1; - } - - if (var14 == -2147483644) { // L: 147 - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { // L: 148 - var14 = var0.widget != null ? var0.widget.childIndex * -241424449 * 1035716671 : -1; - } - - if (var14 == -2147483642) { // L: 149 - var14 = var0.dragTarget != null ? var0.dragTarget.id * 2073510769 * -769712751 : -1; - } - - if (var14 == -2147483641) { // L: 150 - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -241424449 * 1035716671 : -1; - } - - if (var14 == -2147483640) { // L: 151 - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { // L: 152 - var14 = var0.keyPressed; - } - - class385.Interpreter_intLocals[var11++] = var14; // L: 153 - } else if (var3[var13] instanceof String) { // L: 155 - var21 = (String)var3[var13]; // L: 156 - if (var21.equals("event_opbase")) { // L: 157 - var21 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var12++] = var21; // L: 158 - } - } - - Interpreter.field827 = var0.field1053; // L: 162 - - label935: - while (true) { - ++var10; // L: 164 - if (var10 > var1) { // L: 165 - throw new RuntimeException(); - } - - ++var20; // L: 166 - int var33 = var6[var20]; - if (var33 >= 100) { // L: 167 - boolean var35; - if (var4.intOperands[var20] == 1) { // L: 385 - var35 = true; - } else { - var35 = false; // L: 386 - } - - var14 = UserComparator2.method8042(var33, var4, var35); // L: 387 - switch(var14) { // L: 388 - case 0: - var30 = false; - break label935; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 391 - } - } else if (var33 == 0) { // L: 168 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7[var20]; // L: 169 - } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 172 - var13 = var7[var20]; // L: 173 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 174 - } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 177 - var13 = var7[var20]; // L: 178 - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 179 - class78.changeGameOptions(var13); // L: 180 - } else if (var33 == ScriptOpcodes.SCONST) { // L: 183 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 184 - } else if (var33 == ScriptOpcodes.JUMP) { // L: 187 - var20 += var7[var20]; // L: 188 - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 191 - class295.Interpreter_intStackSize -= 2; // L: 192 - if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 193 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 196 - class295.Interpreter_intStackSize -= 2; // L: 197 - if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 198 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 201 - class295.Interpreter_intStackSize -= 2; // L: 202 - if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 203 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 206 - class295.Interpreter_intStackSize -= 2; // L: 207 - if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 208 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.RETURN) { // L: 211 - if (Interpreter.Interpreter_frameDepth == 0) { - var30 = false; - break label952; - } - - ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 213 - var4 = var40.script; // L: 214 - var6 = var4.opcodes; // L: 215 - var7 = var4.intOperands; // L: 216 - var20 = var40.pc; // L: 217 - class385.Interpreter_intLocals = var40.intLocals; // L: 218 - Interpreter.Interpreter_stringLocals = var40.stringLocals; // L: 219 - } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 222 - var13 = var7[var20]; // L: 223 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapRegion.getVarbit(var13); // L: 224 - } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 227 - var13 = var7[var20]; // L: 228 - WorldMapElement.method3384(var13, Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 229 - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 232 - class295.Interpreter_intStackSize -= 2; // L: 233 - if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 234 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 237 - class295.Interpreter_intStackSize -= 2; // L: 238 - if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 239 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.ILOAD) { // L: 242 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class385.Interpreter_intLocals[var7[var20]]; // L: 243 - } else if (var33 == ScriptOpcodes.ISTORE) { // L: 246 - class385.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 247 - } else if (var33 == ScriptOpcodes.SLOAD) { // L: 250 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var20]]; // L: 251 - } else if (var33 == ScriptOpcodes.SSTORE) { // L: 254 - Interpreter.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 255 - } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 258 - var13 = var7[var20]; // L: 259 - ChatChannel.Interpreter_stringStackSize -= var13; // L: 260 - var21 = class273.method5271(Interpreter.Interpreter_stringStack, ChatChannel.Interpreter_stringStackSize, var13); // L: 261 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var21; // L: 262 - } else if (var33 == ScriptOpcodes.POP_INT) { // L: 265 - --class295.Interpreter_intStackSize; // L: 266 - } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 269 - --ChatChannel.Interpreter_stringStackSize; // L: 270 - } else { - int var17; - if (var33 != ScriptOpcodes.INVOKE) { // L: 273 - if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 296 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = JagexCache.varcs.getInt(var7[var20]); // L: 297 - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 300 - JagexCache.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 301 - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 304 - var13 = var7[var20] >> 16; // L: 305 - var14 = var7[var20] & 65535; // L: 306 - int var24 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 307 - if (var24 < 0 || var24 > 5000) { // L: 308 - throw new RuntimeException(); // L: 309 - } - - Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 311 - byte var25 = -1; // L: 312 - if (var14 == 105) { // L: 313 - var25 = 0; - } - - for (var17 = 0; var17 < var24; ++var17) { // L: 314 - Interpreter.Interpreter_arrays[var13][var17] = var25; - } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 317 - var13 = var7[var20]; // L: 318 - var14 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 319 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 320 - throw new RuntimeException(); // L: 321 - } - - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 323 - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 326 - var13 = var7[var20]; // L: 327 - class295.Interpreter_intStackSize -= 2; // L: 328 - var14 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 329 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 330 - throw new RuntimeException(); // L: 331 - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 333 - } else { - String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 336 - var22 = JagexCache.varcs.getStringOld(var7[var20]); // L: 337 - if (var22 == null) { // L: 338 - var22 = "null"; - } - - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var22; // L: 339 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 342 - JagexCache.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 343 - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 346 - var22 = JagexCache.varcs.getString(var7[var20]); // L: 347 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var22; // L: 348 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 351 - JagexCache.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 352 - } else if (var33 == ScriptOpcodes.SWITCH) { // L: 355 - IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 356 - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 357 - if (var37 != null) { // L: 358 - var20 += var37.integer; - } - } else { - Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 361 - var39 = class129.field1535.getTitleGroupValue(var7[var20]); // L: 362 - if (var39 == null) { // L: 363 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 364 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var39; // L: 367 - } - } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 371 - throw new IllegalStateException(); // L: 381 - } - - var39 = GameEngine.field205.method7164(var7[var20]); // L: 372 - if (var39 == null) { // L: 373 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 374 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var39; // L: 377 - } - } - } - } - } else { - var13 = var7[var20]; // L: 274 - Script var36 = class101.getScript(var13); // L: 275 - int[] var15 = new int[var36.localIntCount]; // L: 276 - String[] var16 = new String[var36.localStringCount]; // L: 277 - - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 278 - var15[var17] = Interpreter.Interpreter_intStack[var17 + (class295.Interpreter_intStackSize - var36.intArgumentCount)]; - } - - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 279 - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (ChatChannel.Interpreter_stringStackSize - var36.stringArgumentCount)]; - } - - class295.Interpreter_intStackSize -= var36.intArgumentCount; // L: 280 - ChatChannel.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 281 - ScriptFrame var23 = new ScriptFrame(); // L: 282 - var23.script = var4; // L: 283 - var23.pc = var20; // L: 284 - var23.intLocals = class385.Interpreter_intLocals; // L: 285 - var23.stringLocals = Interpreter.Interpreter_stringLocals; // L: 286 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 287 - var4 = var36; // L: 288 - var6 = var36.opcodes; // L: 289 - var7 = var36.intOperands; // L: 290 - var20 = -1; // L: 291 - class385.Interpreter_intLocals = var15; // L: 292 - Interpreter.Interpreter_stringLocals = var16; // L: 293 - } - } - } - } catch (Exception var31) { // L: 401 - var9 = true; // L: 402 - StringBuilder var27 = new StringBuilder(30); // L: 404 - var27.append("").append(var4.key).append(" "); // L: 405 - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 406 - var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var27.append("").append(var8); // L: 407 - class301.RunException_sendStackTrace(var27.toString(), var31); // L: 408 - var30 = false; - break label951; - } - } finally { - if (var30) { - while (Interpreter.field839.size() > 0) { - class93 var19 = (class93)Interpreter.field839.remove(0); // L: 413 - Message.widgetDefaultMenuAction(var19.method2381(), var19.method2376(), var19.method2377(), var19.method2378(), ""); - } - - if (Interpreter.field837) { // L: 416 - Interpreter.field837 = false; // L: 417 - class9.method85(); // L: 418 - } - - if (!var9 && var2 > 0 && var10 >= var2) { - class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } - - while (Interpreter.field839.size() > 0) { - class93 var34 = (class93)Interpreter.field839.remove(0); - Message.widgetDefaultMenuAction(var34.method2381(), var34.method2376(), var34.method2377(), var34.method2378(), ""); // L: 414 - } - - if (Interpreter.field837) { - Interpreter.field837 = false; - class9.method85(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { // L: 420 - class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 421 - } - - return; // L: 394 - } - - while (Interpreter.field839.size() > 0) { - class93 var41 = (class93)Interpreter.field839.remove(0); - Message.widgetDefaultMenuAction(var41.method2381(), var41.method2376(), var41.method2377(), var41.method2378(), ""); - } - - if (Interpreter.field837) { - Interpreter.field837 = false; - class9.method85(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; // L: 212 - } - - while (Interpreter.field839.size() > 0) { // L: 412 - class93 var26 = (class93)Interpreter.field839.remove(0); - Message.widgetDefaultMenuAction(var26.method2381(), var26.method2376(), var26.method2377(), var26.method2378(), ""); - } - - if (Interpreter.field837) { - Interpreter.field837 = false; - class9.method85(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } // L: 124 424 - - @ObfuscatedName("kn") - static final void method3439(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11352 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11353 - class82.method2122(); // L: 11354 - Interpreter.clientPreferences.method2260(var0); // L: 11355 - } // L: 11356 + } } diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index a62cf23271..839e07ca33 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -1,77 +1,95 @@ import java.util.Comparator; import java.util.Map.Entry; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("g") class class18 implements Comparator { - @ObfuscatedName("py") - @ObfuscatedSignature( - descriptor = "Lfz;" + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1555742103 ) - @Export("mouseWheel") - static class158 mouseWheel; + static int field95; + @ObfuscatedName("lw") + @ObfuscatedGetter( + intValue = -1798104043 + ) + @Export("Client_plane") + static int Client_plane; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lk;" + descriptor = "Lr;" ) final class10 this$0; @ObfuscatedSignature( - descriptor = "(Lk;)V" + descriptor = "(Lr;)V" ) class18(class10 var1) { - this.this$0 = var1; // L: 40 + this.this$0 = var1; } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", - garbageValue = "-1566011867" + descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I", + garbageValue = "14" ) - int method283(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42 + int method257(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); } public int compare(Object var1, Object var2) { - return this.method283((Entry)var1, (Entry)var2); // L: 46 + return this.method257((Entry)var1, (Entry)var2); } public boolean equals(Object var1) { return super.equals(var1); // L: 50 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "14" + descriptor = "(Lln;IIIZB)V", + garbageValue = "0" ) - public static int method282(int var0) { - return class400.field4390[var0 & 16383]; // L: 33 + public static void method266(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class273.musicPlayerStatus = 1; // L: 40 + class273.musicTrackArchive = var0; // L: 41 + AccessFile.musicTrackGroupId = var1; // L: 42 + class273.musicTrackFileId = var2; // L: 43 + class273.musicTrackVolume = var3; // L: 44 + class17.musicTrackBoolean = var4; // L: 45 + class273.pcmSampleLength = 10000; // L: 46 + } // L: 47 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Ldf;", + garbageValue = "1077936192" + ) + static class118[] method258() { + return new class118[]{class118.field1433, class118.field1430, class118.field1431, class118.field1432, class118.field1434, class118.field1429}; // L: 25 } - @ObfuscatedName("h") + @ObfuscatedName("ll") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-716641004" + descriptor = "(IIS)V", + garbageValue = "-14104" ) - public static int method294() { - return KeyHandler.KeyHandler_idleCycles; // L: 140 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1321255361" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 82 - if (var1 == null) { // L: 83 - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 84 85 + static final void method264(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { // L: 12423 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3119()) { // L: 12424 + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12425 + if (var2.rank == -1) { // L: 12426 + PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 12427 + var3.packetBuffer.writeByte(3 + class425.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12428 + var3.packetBuffer.writeByte(var0); // L: 12429 + var3.packetBuffer.writeShort(var1); // L: 12430 + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12431 + Client.packetWriter.addNode(var3); // L: 12432 + } + } } - } + } // L: 12433 } diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java index cd4f23d6af..09c2156cd5 100644 --- a/runescape-client/src/main/java/class182.java +++ b/runescape-client/src/main/java/class182.java @@ -2,39 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gb") public class class182 extends DualNode { - @ObfuscatedName("sm") + @ObfuscatedName("uv") @ObfuscatedSignature( - descriptor = "Lao;" + descriptor = "Lnw;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("ep") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive4") + static Archive archive4; static { new EvictingDualNodeHashTable(64); // L: 9 } // L: 10 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lgp;", - garbageValue = "-1343847522" - ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 - var1 = new ParamComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 30 - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 - return var1; // L: 32 - } - } } diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index 52a5da05a9..6135d4e437 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -1,387 +1,216 @@ -import java.util.Date; import java.util.concurrent.Future; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("m") +@ObfuscatedName("x") public class class19 { - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Lqx;" - ) - static IndexedSprite field96; - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "Lcw;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("nd") - @ObfuscatedGetter( - intValue = -436115997 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; @ObfuscatedName("v") - Future field95; - @ObfuscatedName("o") - String field94; + Future field102; + @ObfuscatedName("c") + String field100; class19(Future var1) { - this.field95 = var1; // L: 10 + this.field102 = var1; // L: 10 } // L: 11 class19(String var1) { - this.method298(var1); // L: 14 + this.method270(var1); // L: 14 } // L: 15 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1411610741" + garbageValue = "-1907371435" ) - void method298(String var1) { + void method270(String var1) { if (var1 == null) { // L: 18 var1 = ""; } - this.field94 = var1; // L: 19 - if (this.field95 != null) { // L: 20 - this.field95.cancel(true); // L: 21 - this.field95 = null; // L: 22 + this.field100 = var1; // L: 19 + if (this.field102 != null) { // L: 20 + this.field102.cancel(true); // L: 21 + this.field102 = null; // L: 22 } } // L: 24 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1502014240" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "11" ) - public final String method299() { - return this.field94; // L: 27 + public final String method271() { + return this.field100; // L: 27 } - @ObfuscatedName("h") + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2045655469" + ) + public boolean method283() { + return this.field100 != null || this.field102 == null; // L: 31 + } + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "3" + garbageValue = "126" ) - public boolean method316() { - return this.field94 != null || this.field95 == null; // L: 31 + public final boolean method268() { + return this.method283() ? true : this.field102.isDone(); // L: 35 36 } - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "39" + descriptor = "(I)Ly;", + garbageValue = "1665321496" ) - public final boolean method303() { - return this.method316() ? true : this.field95.isDone(); // L: 35 36 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)Ly;", - garbageValue = "34" - ) - public final class21 method301() { - if (this.method316()) { // L: 40 - return new class21(this.field94); - } else if (!this.method303()) { - return null; + public final class21 method274() { + if (this.method283()) { // L: 40 + return new class21(this.field100); + } else if (!this.method268()) { + return null; // L: 41 } else { try { - return (class21)this.field95.get(); - } catch (Exception var3) { + return (class21)this.field102.get(); // L: 43 + } catch (Exception var3) { // L: 45 String var2 = "Error retrieving REST request reply"; // L: 46 System.err.println(var2 + "\r\n" + var3); // L: 47 - this.method298(var2); // L: 48 + this.method270(var2); // L: 48 return new class21(var2); // L: 49 } } } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Lfs;", - garbageValue = "1" + descriptor = "(II)Lgf;", + garbageValue = "-1420060608" ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 45 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lpq;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1591862796" - ) - static String method315(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { // L: 41 - return var2; + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 + if (var1 != null) { // L: 93 + return var1; } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 42 - return var3 == null ? var2 : (String)var3.obj; // L: 43 44 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Llq;Llq;III)Lmr;", - garbageValue = "-757685375" - ) - public static Font method319(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - if (!GrandExchangeEvent.method6045(var0, var2, var3)) { // L: 60 - return null; - } else { - byte[] var5 = var1.takeFile(var2, var3); // L: 62 - Font var4; - if (var5 == null) { // L: 64 - var4 = null; // L: 65 - } else { - Font var6 = new Font(var5, class451.SpriteBuffer_xOffsets, class451.SpriteBuffer_yOffsets, class451.SpriteBuffer_spriteWidths, class451.SpriteBuffer_spriteHeights, GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette, class460.SpriteBuffer_pixels); // L: 68 - RouteStrategy.method3872(); // L: 69 - var4 = var6; // L: 70 + byte[] var2 = SoundCache.ItemDefinition_archive.takeFile(10, var0); // L: 94 + var1 = new ItemComposition(); // L: 95 + var1.id = var0; // L: 96 + if (var2 != null) { // L: 97 + var1.decode(new Buffer(var2)); } - return var4; // L: 72 - } - } + var1.post(); // L: 98 + if (var1.noteTemplate != -1) { // L: 99 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILbo;ZB)I", - garbageValue = "-1" - ) - static int method314(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3267 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3268 - var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3269 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3270 - return 1; // L: 3271 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 3273 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3274 - var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3275 - var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3276 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3277 - return 1; // L: 3278 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3280 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3281 - var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3282 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + JagexCache.intToString(var9, true); // L: 3283 - return 1; // L: 3284 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3286 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3287 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3288 - return 1; // L: 3289 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 3291 - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3292 - long var13 = ((long)var10 + 11745L) * 86400000L; // L: 3293 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3294 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 3295 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3296 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3297 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3298 - return 1; // L: 3299 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3301 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 3309 - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3310 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3311 - return 1; // L: 3312 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3314 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3315 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UserComparator4.method2566(class118.compareStrings(Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1], FriendSystem.clientLanguage)); // L: 3316 - return 1; // L: 3317 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3319 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3320 - class295.Interpreter_intStackSize -= 2; // L: 3321 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3322 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3323 - var11 = class4.archive13.takeFile(var5, 0); // L: 3324 - var12 = new Font(var11); // L: 3325 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3326 - return 1; // L: 3327 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3329 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3330 - class295.Interpreter_intStackSize -= 2; // L: 3331 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3332 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3333 - var11 = class4.archive13.takeFile(var5, 0); // L: 3334 - var12 = new Font(var11); // L: 3335 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3336 - return 1; // L: 3337 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3339 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3340 - var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3341 - var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3342 - if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 3343 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4; // L: 3344 - } + if (var1.notedId != -1) { // L: 100 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } - return 1; // L: 3345 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3347 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3348 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3349 - return 1; // L: 3350 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3352 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3353 - var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3354 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3355 - return 1; // L: 3356 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3358 - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3359 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = RouteStrategy.isCharPrintable((char)var10) ? 1 : 0; // L: 3360 - return 1; // L: 3361 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3363 - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3364 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = NetFileRequest.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3365 - return 1; // L: 3366 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3368 - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3369 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class345.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3370 - return 1; // L: 3371 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3373 - var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3374 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class117.isDigit((char)var10) ? 1 : 0; // L: 3375 - return 1; // L: 3376 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3378 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3379 - if (var3 != null) { // L: 3380 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3381 - } + if (var1.placeholderTemplate != -1) { // L: 101 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } - return 1; // L: 3382 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3384 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3385 - class295.Interpreter_intStackSize -= 2; // L: 3386 - var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3387 - var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3388 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3389 - return 1; // L: 3390 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3392 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3393 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 3394 - boolean var16 = false; // L: 3395 + if (!DevicePcmPlayerProvider.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 + var1.name = "Members object"; // L: 103 + var1.isTradable = false; // L: 104 - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3396 - char var7 = var3.charAt(var6); // L: 3397 - if (var7 == '<') { // L: 3398 - var16 = true; - } else if (var7 == '>') { // L: 3399 - var16 = false; - } else if (!var16) { // L: 3400 - var15.append(var7); - } - } + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 105 + var1.groundActions[var3] = null; // L: 106 + } - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3402 - return 1; // L: 3403 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3405 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3406 - var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3407 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3408 - return 1; // L: 3409 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3411 - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3412 - var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3413 - var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3414 - var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3415 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3416 - return 1; // L: 3417 - } else if (var0 == 4122) { // L: 3419 - var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3420 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3421 - return 1; // L: 3422 + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 108 + if (var3 != 4) { // L: 109 + var1.inventoryActions[var3] = null; // L: 110 + } + } + + var1.shiftClickIndex = -2; // L: 113 + var1.team = 0; // L: 114 + if (var1.params != null) { // L: 115 + boolean var6 = false; // L: 116 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 117 + ParamComposition var5 = class151.getParamDefinition((int)var4.key); // L: 118 + if (var5.autoDisable) { // L: 119 + var4.remove(); } else { - return 2; // L: 3424 + var6 = true; // L: 120 } } - } else { - ChatChannel.Interpreter_stringStackSize -= 2; // L: 3302 - var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3303 - var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3304 - if (localPlayer.appearance != null && localPlayer.appearance.isFemale) { // L: 3305 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3; // L: 3306 - } - return 1; // L: 3307 + if (!var6) { + var1.params = null; // L: 122 + } } } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 125 + return var1; // L: 126 } } - @ObfuscatedName("fk") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-109" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1009415810" ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - GameObject.logOut(); // L: 2559 - switch(var0) { // L: 2560 - case 1: - StudioGame.method5785(); // L: 2563 - break; - case 2: - class150.method3089(24); // L: 2569 - GrandExchangeEvent.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2570 + public static int method288(CharSequence var0) { + return class263.method5178(var0, 10, true); // L: 67 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "-169885826" + ) + static int method286(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4639 + Interpreter.Interpreter_intStackSize -= 5; // L: 4640 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4641 + return 1; // L: 4642 + } else if (var0 == 7204) { // L: 4644 + Interpreter.Interpreter_intStackSize -= 6; // L: 4645 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4646 + return 1; // L: 4647 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4649 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4650 + return 1; // L: 4651 + } else if (var0 == 7209) { // L: 4653 + Interpreter.Interpreter_intStackSize -= 2; // L: 4654 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4655 + return 1; // L: 4656 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4658 + --Interpreter.Interpreter_intStackSize; // L: 4659 + return 1; // L: 4660 + } else if (var0 == 7214) { // L: 4662 + Interpreter.Interpreter_intStackSize -= 2; // L: 4663 + return 1; // L: 4664 + } else { + return 2; // L: 4666 } + } - } // L: 2575 - - @ObfuscatedName("lx") + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1974520943" + descriptor = "(B)V", + garbageValue = "-53" ) - static final void method307(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class83.guestClanChannel; // L: 11739 - if (var2 != null && var1 >= 0 && var1 < var2.method3056()) { // L: 11740 - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11741 - if (var3.rank == -1) { - String var4 = var3.username.getName(); // L: 11743 - PacketBufferNode var5 = ItemContainer.getPacketBufferNode(ClientPacket.field2952, Client.packetWriter.isaacCipher); // L: 11744 - var5.packetBuffer.writeByte(3 + ItemLayer.stringCp1252NullTerminatedByteSize(var4)); // L: 11745 - var5.packetBuffer.writeByte(var0); // L: 11746 - var5.packetBuffer.writeShort(var1); // L: 11747 - var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11748 - Client.packetWriter.addNode(var5); // L: 11749 + static final void method287() { + if (SoundSystem.field309) { // L: 3629 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3631 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3632 + var1.method2121(); // L: 3633 } - } - } // L: 11742 11750 - @ObfuscatedName("lk") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-246418962" - ) - static void method318(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11779 - if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11780 - var1.remove(); // L: 11781 - } + SoundSystem.field309 = false; // L: 3636 } - } // L: 11784 + } // L: 3638 } diff --git a/runescape-client/src/main/java/class193.java b/runescape-client/src/main/java/class193.java index 179e8517c5..1386a69d83 100644 --- a/runescape-client/src/main/java/class193.java +++ b/runescape-client/src/main/java/class193.java @@ -1,208 +1,64 @@ 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("gv") +@ObfuscatedName("gm") public enum class193 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgm;" ) - field2192((byte)-1), - @ObfuscatedName("o") + field2186((byte)-1), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgm;" ) - field2195((byte)0), - @ObfuscatedName("h") + field2184((byte)0), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgm;" ) - field2193((byte)1), - @ObfuscatedName("g") + field2185((byte)1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgm;" ) - field2191((byte)2); + field2187((byte)2); - @ObfuscatedName("hj") - @ObfuscatedGetter( - intValue = 1576162761 - ) - static int field2197; - @ObfuscatedName("l") - public byte field2194; + @ObfuscatedName("ah") + protected static String field2189; + @ObfuscatedName("b") + public byte field2183; class193(byte var3) { - this.field2194 = var3; // L: 18 - } // L: 19 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field2194; // L: 23 - } + this.field2183 = var3; // L: 14 + } // L: 15 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SI)V", - garbageValue = "247092715" + descriptor = "(B)I", + garbageValue = "16" ) - public static void method3880(String[] var0, short[] var1) { - ServerPacket.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 - } // L: 10 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1325671888" - ) - static int method3879(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 1031 - var0 -= 1000; // L: 1032 - var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1033 - } else { - var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1035 - } - - String var4 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1036 - int[] var5 = null; // L: 1037 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1038 - int var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1039 - if (var6 > 0) { // L: 1040 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]) { // L: 1041 1042 - } - } - - var4 = var4.substring(0, var4.length() - 1); // L: 1044 - } - - Object[] var8 = new Object[var4.length() + 1]; // L: 1046 - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1047 - if (var4.charAt(var7 - 1) == 's') { // L: 1048 - var8[var7] = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1049 - } - } - - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1051 - if (var7 != -1) { // L: 1052 - var8[0] = new Integer(var7); - } else { - var8 = null; // L: 1053 - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 1054 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1055 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1056 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1057 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1058 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1059 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1060 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1061 - var3.onVarTransmit = var8; // L: 1062 - var3.varTransmitTriggers = var5; // L: 1063 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1065 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1066 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1067 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1068 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1069 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1070 - var3.onInvTransmit = var8; // L: 1071 - var3.invTransmitTriggers = var5; // L: 1072 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1074 - var3.onStatTransmit = var8; // L: 1075 - var3.statTransmitTriggers = var5; // L: 1076 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; // L: 1078 - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1079 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1080 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1081 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1082 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1083 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1084 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1085 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1086 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1087 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1088 - var3.field3468 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1089 - var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1090 - var3.field3395 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1091 - var3.field3461 = var8; - } else if (var0 == 1430) { // L: 1092 - var3.field3457 = var8; - } else if (var0 == 1431) { // L: 1093 - var3.field3458 = var8; - } else { - if (var0 != 1434) { // L: 1094 - return 2; // L: 1095 - } - - var3.field3408 = var8; - } - - var3.hasListener = true; // L: 1096 - return 1; // L: 1097 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field2183; // L: 18 } - @ObfuscatedName("ja") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-251675528" + descriptor = "(Lpi;I)Ljava/lang/String;", + garbageValue = "562183385" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class268.scrollBarSprites[0].drawAt(var0, var1); // L: 10252 - class268.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10253 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field619); // L: 10254 - int var5 = var3 * (var3 - 32) / var4; // L: 10255 - if (var5 < 8) { // L: 10256 - var5 = 8; - } + public static String method3883(Buffer var0) { + return WorldMapIcon_1.method3933(var0, 32767); // L: 60 + } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10257 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field684); // L: 10258 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field514); // L: 10259 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field514); // L: 10260 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field514); // L: 10261 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field514); // L: 10262 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field554); // L: 10263 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field554); // L: 10264 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field554); // L: 10265 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field554); // L: 10266 - } // L: 10267 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1188814406" + ) + public static void method3884() { + KitDefinition.KitDefinition_cached.clear(); // L: 130 + } // L: 131 } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 6191557e0f..709e130cc4 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,53 +1,27 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("go") public class class194 { - @ObfuscatedName("h") + @ObfuscatedName("i") @Export("directions") - static int[][] directions; - @ObfuscatedName("g") - @Export("distances") - static int[][] distances; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1600759589 - ) - static int field2202; + public static int[][] directions; @ObfuscatedName("f") + @Export("distances") + public static int[][] distances; + @ObfuscatedName("l") @Export("bufferX") - static int[] bufferX; - @ObfuscatedName("u") + public static int[] bufferX; + @ObfuscatedName("q") @Export("bufferY") - static int[] bufferY; - @ObfuscatedName("p") + public static int[] bufferY; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "[Lpz;" + descriptor = "Lpi;" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("db") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; static { directions = new int[128][128]; // L: 6 @@ -56,1011 +30,12 @@ public class class194 { bufferY = new int[4096]; // L: 12 } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Law;Lmr;I)V", - garbageValue = "847036111" + descriptor = "(IIS)I", + garbageValue = "-32639" ) - static void method3894(GameEngine var0, Font var1) { - if (Login.worldSelectOpen) { // L: 329 - MouseHandler.method621(var0); // L: 330 - } else { - int var4; - if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 333 - Interpreter.clientPreferences.method2258(!Interpreter.clientPreferences.method2259()); // L: 334 - if (!Interpreter.clientPreferences.method2259()) { // L: 335 - Archive var2 = ArchiveLoader.archive6; // L: 336 - int var3 = var2.getGroupId("scape main"); // L: 338 - var4 = var2.getFileId(var3, ""); // L: 339 - WorldMapSection2.method4561(var2, var3, var4, 255, false); // L: 340 - } else { - WorldMapEvent.midiPcmStream.clear(); // L: 344 - class273.musicPlayerStatus = 1; // L: 345 - class147.musicTrackArchive = null; // L: 346 - } - } - - if (Client.gameState != 5) { // L: 349 - if (-1L == Login.field911) { // L: 350 - Login.field911 = WorldMapSprite.method4989() + 1000L; // L: 351 - } - - long var21 = WorldMapSprite.method4989(); // L: 353 - if (class149.method3079() && Login.field912 == -1L) { // L: 354 355 - Login.field912 = var21; // L: 356 - if (Login.field912 > Login.field911) { // L: 357 - Login.field911 = Login.field912; // L: 358 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 362 - if (Language.Language_EN == FriendSystem.clientLanguage) { // L: 363 - if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 364 - var4 = Login.xPadding + 5; // L: 365 - short var5 = 463; // L: 366 - byte var6 = 100; // L: 367 - byte var7 = 35; // L: 368 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 369 - FloorUnderlayDefinition.method3548(); // L: 370 - return; // L: 371 - } - } - - if (class345.World_request != null) { // L: 374 - FloorUnderlayDefinition.method3548(); - } - } - - var4 = MouseHandler.MouseHandler_lastButton; // L: 376 - int var51 = MouseHandler.MouseHandler_lastPressedX; // L: 377 - int var52 = MouseHandler.MouseHandler_lastPressedY; // L: 378 - if (var4 == 0) { // L: 379 - var51 = MouseHandler.MouseHandler_x; // L: 380 - var52 = MouseHandler.MouseHandler_y; // L: 381 - } - - if (!UserComparator5.mouseCam && var4 == 4) { // L: 383 - var4 = 1; - } - - int var55; - short var56; - if (Login.loginIndex == 0) { // L: 384 - boolean var68 = false; // L: 385 - - while (class16.isKeyDown()) { // L: 386 - if (class241.field2833 == 84) { // L: 387 - var68 = true; // L: 388 - } - } - - var55 = class134.loginBoxCenter - 80; // L: 391 - var56 = 291; // L: 392 - if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 393 - class11.openURL(class129.method2849("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 394 - } - - var55 = class134.loginBoxCenter + 80; // L: 396 - if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20 || var68) { // L: 397 - if ((Client.worldProperties & 33554432) != 0) { // L: 398 - Login.Login_response0 = ""; // L: 399 - Login.Login_response1 = "This is a Beta world."; // L: 400 - Login.Login_response2 = "Your normal account will not be affected."; // L: 401 - Login.Login_response3 = ""; // L: 402 - class150.method3089(1); // L: 403 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 405 - Login.currentLoginField = 1; // L: 406 - } else { - Login.currentLoginField = 0; // L: 409 - } - } else if ((Client.worldProperties & 4) != 0) { // L: 413 - if ((Client.worldProperties & 1024) != 0) { // L: 414 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 415 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 416 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 417 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 420 - Login.Login_response2 = "Players can attack each other"; // L: 421 - Login.Login_response3 = "almost everywhere."; // L: 422 - } - - Login.Login_response0 = "Warning!"; // L: 424 - class150.method3089(1); // L: 425 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 427 - Login.currentLoginField = 1; // L: 428 - } else { - Login.currentLoginField = 0; // L: 431 - } - } else if ((Client.worldProperties & 1024) != 0) { // L: 435 - Login.Login_response1 = "This is a High Risk world."; // L: 436 - Login.Login_response2 = "The Protect Item prayer will"; // L: 437 - Login.Login_response3 = "not work on this world."; // L: 438 - Login.Login_response0 = "Warning!"; // L: 439 - class150.method3089(1); // L: 440 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 442 - Login.currentLoginField = 1; // L: 443 - } else { - Login.currentLoginField = 0; // L: 446 - } - } else { - class127.Login_promptCredentials(false); // L: 451 - } - } - } else { - short var8; - int var53; - if (Login.loginIndex == 1) { // L: 455 - while (true) { - if (!class16.isKeyDown()) { // L: 456 - var53 = class134.loginBoxCenter - 80; // L: 464 - var8 = 321; // L: 465 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 466 - class127.Login_promptCredentials(false); // L: 467 - } - - var53 = class134.loginBoxCenter + 80; // L: 469 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 470 - class150.method3089(0); // L: 471 - } - break; - } - - if (class241.field2833 == 84) { // L: 457 - class127.Login_promptCredentials(false); // L: 458 - } else if (class241.field2833 == 13) { // L: 460 - class150.method3089(0); // L: 461 - } - } - } else { - int var11; - int var12; - int var19; - int var27; - short var54; - boolean var58; - if (Login.loginIndex == 2) { // L: 474 - var54 = 201; // L: 475 - var53 = var54 + 52; // L: 476 - if (var4 == 1 && var52 >= var53 - 12 && var52 < var53 + 2) { // L: 477 - Login.currentLoginField = 0; - } - - var53 += 15; // L: 478 - if (var4 == 1 && var52 >= var53 - 12 && var52 < var53 + 2) { // L: 479 - Login.currentLoginField = 1; - } - - var53 += 15; // L: 480 - var54 = 361; // L: 481 - if (DynamicObject.field973 != null) { // L: 482 - var55 = DynamicObject.field973.highX / 2; // L: 483 - if (var4 == 1 && var51 >= DynamicObject.field973.lowX - var55 && var51 <= var55 + DynamicObject.field973.lowX && var52 >= var54 - 15 && var52 < var54) { // L: 484 - switch(Login.field897) { // L: 485 - case 1: - GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 488 - class150.method3089(5); // L: 489 - return; // L: 490 - case 2: - class11.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 494 - } - } - } - - var55 = class134.loginBoxCenter - 80; // L: 500 - var56 = 321; // L: 501 - if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 502 - Login.Login_username = Login.Login_username.trim(); // L: 503 - if (Login.Login_username.length() == 0) { // L: 504 - GrandExchangeEvent.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 505 - return; // L: 506 - } - - if (Login.Login_password.length() == 0) { // L: 508 - GrandExchangeEvent.setLoginResponseString("", "Please enter your password.", ""); // L: 509 - return; // L: 510 - } - - GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 512 - Varcs.method2462(false); // L: 513 - InterfaceParent.updateGameState(20); // L: 514 - return; // L: 515 - } - - var55 = Login.loginBoxX + 180 + 80; // L: 517 - if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 518 - class150.method3089(0); // L: 519 - Login.Login_username = ""; // L: 520 - Login.Login_password = ""; // L: 521 - UrlRequest.field1346 = 0; // L: 522 - class452.otp = ""; // L: 523 - Login.field903 = true; // L: 524 - } - - var55 = class134.loginBoxCenter + -117; // L: 526 - var56 = 277; // L: 527 - Login.field901 = var51 >= var55 && var51 < var55 + Message.field458 && var52 >= var56 && var52 < var56 + KeyHandler.field140; // L: 528 - if (var4 == 1 && Login.field901) { // L: 529 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 530 - if (!Client.Login_isUsernameRemembered && Interpreter.clientPreferences.method2273() != null) { // L: 531 - Interpreter.clientPreferences.method2316((String)null); // L: 532 - } - } - - var55 = class134.loginBoxCenter + 24; // L: 535 - var56 = 277; // L: 536 - Login.field902 = var51 >= var55 && var51 < var55 + Message.field458 && var52 >= var56 && var52 < var56 + KeyHandler.field140; // L: 537 - if (var4 == 1 && Login.field902) { // L: 538 - Interpreter.clientPreferences.method2256(!Interpreter.clientPreferences.method2257()); // L: 539 - if (!Interpreter.clientPreferences.method2257()) { // L: 540 - Login.Login_username = ""; // L: 541 - Interpreter.clientPreferences.method2316((String)null); // L: 542 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 544 - Login.currentLoginField = 1; // L: 545 - } else { - Login.currentLoginField = 0; // L: 548 - } - } - } - - label1490: - while (true) { - Transferable var75; - do { - while (true) { - label1404: - do { - while (true) { - while (class16.isKeyDown()) { // L: 553 - if (class241.field2833 != 13) { // L: 554 - if (Login.currentLoginField != 0) { // L: 563 - continue label1404; - } - - char var59 = class1.field3; // L: 564 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var59 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 566 567 - } - - if (class241.field2833 == 85 && Login.Login_username.length() > 0) { // L: 570 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class241.field2833 == 84 || class241.field2833 == 80) { // L: 571 - Login.currentLoginField = 1; - } - - char var61 = class1.field3; // L: 573 - boolean var65 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var61) != -1; // L: 575 - if (var65 && Login.Login_username.length() < 320) { // L: 577 - Login.Login_username = Login.Login_username + class1.field3; - } - } else { - class150.method3089(0); // L: 555 - Login.Login_username = ""; // L: 556 - Login.Login_password = ""; // L: 557 - UrlRequest.field1346 = 0; // L: 558 - class452.otp = ""; // L: 559 - Login.field903 = true; // L: 560 - } - } - - return; // L: 1243 - } - } while(Login.currentLoginField != 1); // L: 579 - - if (class241.field2833 == 85 && Login.Login_password.length() > 0) { // L: 580 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 581 - } else if (class241.field2833 == 84 || class241.field2833 == 80) { // L: 583 - Login.currentLoginField = 0; // L: 584 - if (class241.field2833 == 84) { // L: 585 - Login.Login_username = Login.Login_username.trim(); // L: 586 - if (Login.Login_username.length() == 0) { // L: 587 - GrandExchangeEvent.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 588 - return; // L: 589 - } - - if (Login.Login_password.length() == 0) { // L: 591 - GrandExchangeEvent.setLoginResponseString("", "Please enter your password.", ""); // L: 592 - return; // L: 593 - } - - GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 595 - Varcs.method2462(false); // L: 596 - InterfaceParent.updateGameState(20); // L: 597 - return; // L: 598 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class241.field2833 == 67) { // L: 601 - Clipboard var74 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 602 - var75 = var74.getContents(UserComparator10.client); // L: 603 - var12 = 20 - Login.Login_password.length(); // L: 604 - break; - } - - char var66 = class1.field3; // L: 654 - if (var66 >= ' ' && var66 < 127 || var66 > 127 && var66 < 160 || var66 > 160 && var66 <= 255) { // L: 656 - var58 = true; // L: 657 - } else { - label1661: { - if (var66 != 0) { // L: 660 - char[] var77 = class345.cp1252AsciiExtension; // L: 662 - - for (var27 = 0; var27 < var77.length; ++var27) { // L: 663 - char var14 = var77[var27]; // L: 664 - if (var66 == var14) { // L: 666 - var58 = true; // L: 667 - break label1661; // L: 668 - } - } - } - - var58 = false; // L: 674 - } - } - - if (var58) { // L: 676 - char var86 = class1.field3; // L: 678 - boolean var63 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var86) != -1; // L: 680 - if (var63 && Login.Login_password.length() < 20) { // L: 682 683 - Login.Login_password = Login.Login_password + class1.field3; // L: 684 - } - } - } - } while(var12 <= 0); // L: 605 - - try { - String var62 = (String)var75.getTransferData(DataFlavor.stringFlavor); // L: 607 - int var64 = Math.min(var12, var62.length()); // L: 608 - int var67 = 0; - - while (true) { - if (var67 >= var64) { - Login.Login_password = Login.Login_password + var62.substring(0, var64); // L: 646 - continue label1490; - } - - char var70 = var62.charAt(var67); // L: 612 - boolean var16; - if (var70 >= ' ' && var70 < 127 || var70 > 127 && var70 < 160 || var70 > 160 && var70 <= 255) { // L: 614 - var16 = true; // L: 615 - } else { - label1662: { - if (var70 != 0) { // L: 618 - char[] var72 = class345.cp1252AsciiExtension; // L: 620 - - for (var19 = 0; var19 < var72.length; ++var19) { // L: 621 - char var20 = var72[var19]; // L: 622 - if (var70 == var20) { // L: 624 - var16 = true; // L: 625 - break label1662; // L: 626 - } - } - } - - var16 = false; // L: 632 - } - } - - if (!var16) { // L: 634 - break; - } - - char var73 = var62.charAt(var67); // L: 636 - boolean var25 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var73) != -1; // L: 638 - if (!var25) { // L: 640 - break; - } - - ++var67; // L: 609 - } - - class150.method3089(3); // L: 642 - return; // L: 643 - } catch (UnsupportedFlavorException var49) { // L: 648 - } catch (IOException var50) { // L: 649 - } - } - } else if (Login.loginIndex == 3) { // L: 693 - var53 = Login.loginBoxX + 180; // L: 694 - var8 = 276; // L: 695 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 696 - class230.method4894(false); // L: 697 - } - - var53 = Login.loginBoxX + 180; // L: 699 - var8 = 326; // L: 700 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 701 - GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 702 - class150.method3089(5); // L: 703 - return; // L: 704 - } - } else { - int var10; - if (Login.loginIndex == 4) { // L: 707 - var53 = Login.loginBoxX + 180 - 80; // L: 708 - var8 = 321; // L: 709 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 710 - class452.otp.trim(); // L: 711 - if (class452.otp.length() != 6) { // L: 712 - GrandExchangeEvent.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 713 - return; // L: 714 - } - - UrlRequest.field1346 = Integer.parseInt(class452.otp); // L: 716 - class452.otp = ""; // L: 717 - Varcs.method2462(true); // L: 718 - GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 719 - InterfaceParent.updateGameState(20); // L: 720 - return; // L: 721 - } - - if (var4 == 1 && var51 >= Login.loginBoxX + 180 - 9 && var51 <= Login.loginBoxX + 180 + 130 && var52 >= 263 && var52 <= 296) { // L: 723 - Login.field903 = !Login.field903; // L: 724 - } - - if (var4 == 1 && var51 >= Login.loginBoxX + 180 - 34 && var51 <= Login.loginBoxX + 34 + 180 && var52 >= 351 && var52 <= 363) { // L: 726 - class11.openURL(class129.method2849("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 727 - } - - var53 = Login.loginBoxX + 180 + 80; // L: 729 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 730 - class150.method3089(0); // L: 731 - Login.Login_username = ""; // L: 732 - Login.Login_password = ""; // L: 733 - UrlRequest.field1346 = 0; // L: 734 - class452.otp = ""; // L: 735 - } - - while (class16.isKeyDown()) { // L: 737 - boolean var9 = false; // L: 738 - - for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 739 - if (class1.field3 == "1234567890".charAt(var10)) { // L: 740 - var9 = true; // L: 741 - break; // L: 742 - } - } - - if (class241.field2833 == 13) { // L: 745 - class150.method3089(0); // L: 746 - Login.Login_username = ""; // L: 747 - Login.Login_password = ""; // L: 748 - UrlRequest.field1346 = 0; // L: 749 - class452.otp = ""; // L: 750 - } else { - if (class241.field2833 == 85 && class452.otp.length() > 0) { // L: 753 - class452.otp = class452.otp.substring(0, class452.otp.length() - 1); - } - - if (class241.field2833 == 84) { // L: 754 - class452.otp.trim(); // L: 755 - if (class452.otp.length() != 6) { // L: 756 - GrandExchangeEvent.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 757 - return; // L: 758 - } - - UrlRequest.field1346 = Integer.parseInt(class452.otp); // L: 760 - class452.otp = ""; // L: 761 - Varcs.method2462(true); // L: 762 - GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 763 - InterfaceParent.updateGameState(20); // L: 764 - return; // L: 765 - } - - if (var9 && class452.otp.length() < 6) { // L: 767 - class452.otp = class452.otp + class1.field3; - } - } - } - } else if (Login.loginIndex == 5) { // L: 771 - var53 = Login.loginBoxX + 180 - 80; // L: 772 - var8 = 321; // L: 773 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 774 - Login.Login_username = Login.Login_username.trim(); // L: 776 - if (Login.Login_username.length() == 0) { // L: 777 - GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 778 - } else { - long var31; - try { - URL var26 = new URL(class129.method2849("services", false) + "m=accountappeal/login.ws"); // L: 785 - URLConnection var13 = var26.openConnection(); // L: 786 - var13.setRequestProperty("connection", "close"); // L: 787 - var13.setDoInput(true); // L: 788 - var13.setDoOutput(true); // L: 789 - var13.setConnectTimeout(5000); // L: 790 - OutputStreamWriter var79 = new OutputStreamWriter(var13.getOutputStream()); // L: 791 - var79.write("data1=req"); // L: 792 - var79.flush(); // L: 793 - InputStream var81 = var13.getInputStream(); // L: 794 - Buffer var83 = new Buffer(new byte[1000]); // L: 795 - - while (true) { - int var17 = var81.read(var83.array, var83.offset, 1000 - var83.offset); // L: 797 - if (var17 == -1) { // L: 798 - var83.offset = 0; // L: 805 - long var33 = var83.readLong(); // L: 806 - var31 = var33; // L: 807 - break; - } - - var83.offset += var17; // L: 799 - if (var83.offset >= 1000) { // L: 800 - var31 = 0L; // L: 801 - break; - } - } - } catch (Exception var45) { // L: 809 - var31 = 0L; // L: 810 - } - - int var57; - if (0L == var31) { // L: 814 - var57 = 5; - } else { - var57 = class141.method2990(var31, Login.Login_username); // L: 815 - } - - switch(var57) { // L: 816 - case 2: - GrandExchangeEvent.setLoginResponseString(Strings.field3645, Strings.field3870, Strings.field3871); // L: 824 - class150.method3089(6); // L: 825 - break; // L: 826 - case 3: - GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 831 - break; // L: 832 - case 4: - GrandExchangeEvent.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 834 - break; - case 5: - GrandExchangeEvent.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 818 - break; // L: 819 - case 6: - GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 821 - break; // L: 822 - case 7: - GrandExchangeEvent.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 828 - } - } - - return; // L: 838 - } - - var53 = Login.loginBoxX + 180 + 80; // L: 840 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 841 - class127.Login_promptCredentials(true); // L: 842 - } - - var56 = 361; // L: 844 - if (Projectile.field946 != null) { // L: 845 - var10 = Projectile.field946.highX / 2; // L: 846 - if (var4 == 1 && var51 >= Projectile.field946.lowX - var10 && var51 <= var10 + Projectile.field946.lowX && var52 >= var56 - 15 && var52 < var56) { // L: 847 - class11.openURL(class129.method2849("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 848 - } - } - - while (class16.isKeyDown()) { // L: 851 - var58 = false; // L: 852 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 853 - if (class1.field3 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 854 - var58 = true; // L: 855 - break; // L: 856 - } - } - - if (class241.field2833 == 13) { // L: 859 - class127.Login_promptCredentials(true); // L: 860 - } else { - if (class241.field2833 == 85 && Login.Login_username.length() > 0) { // L: 863 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class241.field2833 == 84) { // L: 864 - Login.Login_username = Login.Login_username.trim(); // L: 866 - if (Login.Login_username.length() == 0) { // L: 867 - GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 868 - } else { - long var35; - try { - URL var28 = new URL(class129.method2849("services", false) + "m=accountappeal/login.ws"); // L: 875 - URLConnection var29 = var28.openConnection(); // L: 876 - var29.setRequestProperty("connection", "close"); // L: 877 - var29.setDoInput(true); // L: 878 - var29.setDoOutput(true); // L: 879 - var29.setConnectTimeout(5000); // L: 880 - OutputStreamWriter var30 = new OutputStreamWriter(var29.getOutputStream()); // L: 881 - var30.write("data1=req"); // L: 882 - var30.flush(); // L: 883 - InputStream var37 = var29.getInputStream(); // L: 884 - Buffer var18 = new Buffer(new byte[1000]); // L: 885 - - while (true) { - var19 = var37.read(var18.array, var18.offset, 1000 - var18.offset); // L: 887 - if (var19 == -1) { // L: 888 - var18.offset = 0; // L: 895 - long var38 = var18.readLong(); // L: 896 - var35 = var38; // L: 897 - break; - } - - var18.offset += var19; // L: 889 - if (var18.offset >= 1000) { // L: 890 - var35 = 0L; // L: 891 - break; - } - } - } catch (Exception var46) { // L: 899 - var35 = 0L; // L: 900 - } - - if (0L == var35) { // L: 904 - var11 = 5; - } else { - var11 = class141.method2990(var35, Login.Login_username); // L: 905 - } - - switch(var11) { // L: 906 - case 2: - GrandExchangeEvent.setLoginResponseString(Strings.field3645, Strings.field3870, Strings.field3871); // L: 914 - class150.method3089(6); // L: 915 - break; // L: 916 - case 3: - GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 911 - break; // L: 912 - case 4: - GrandExchangeEvent.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 924 - break; - case 5: - GrandExchangeEvent.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 921 - break; // L: 922 - case 6: - GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 908 - break; // L: 909 - case 7: - GrandExchangeEvent.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 918 - } - } - - return; // L: 928 - } - - if (var58 && Login.Login_username.length() < 320) { // L: 930 - Login.Login_username = Login.Login_username + class1.field3; - } - } - } - } else if (Login.loginIndex != 6) { // L: 934 - if (Login.loginIndex == 7) { // L: 945 - if (class260.field2888 && !Client.onMobile) { // L: 946 - var53 = class134.loginBoxCenter - 150; // L: 947 - var55 = var53 + 40 + 240 + 25; // L: 948 - var56 = 231; // L: 949 - var10 = var56 + 40; // L: 950 - if (var4 == 1 && var51 >= var53 && var51 <= var55 && var52 >= var56 && var52 <= var10) { // L: 951 - var12 = var53; // L: 953 - var27 = 0; - - while (true) { - if (var27 >= 8) { - var11 = 0; // L: 963 - break; - } - - if (var51 <= var12 + 30) { // L: 956 - var11 = var27; // L: 957 - break; // L: 958 - } - - var12 += 30; // L: 960 - var12 += var27 != 1 && var27 != 3 ? 5 : 20; // L: 961 - ++var27; // L: 955 - } - - Login.field899 = var11; // L: 965 - } - - var11 = Login.loginBoxX + 180 - 80; // L: 967 - short var60 = 321; // L: 968 - boolean var15; - String var42; - boolean var69; - String[] var71; - boolean var78; - Date var80; - Date var82; - SimpleDateFormat var84; - java.util.Calendar var85; - StringBuilder var87; - Date var88; - if (var4 == 1 && var51 >= var11 - 75 && var51 <= var11 + 75 && var52 >= var60 - 20 && var52 <= var60 + 20) { // L: 969 - label1256: { - try { - var84 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 976 - var84.setLenient(false); // L: 977 - var87 = new StringBuilder(); // L: 978 - var71 = Login.field900; // L: 980 - var19 = 0; - - while (true) { - if (var19 < var71.length) { - var42 = var71[var19]; // L: 982 - if (var42 != null) { // L: 984 - var87.append(var42); // L: 989 - ++var19; // L: 981 - continue; - } - - class150.method3092("Date not valid.", "Please ensure all characters are populated.", ""); // L: 985 - var82 = null; // L: 986 - } else { - var87.append("12"); // L: 993 - var82 = var84.parse(var87.toString()); // L: 994 - } - - var80 = var82; // L: 996 - break; - } - } catch (ParseException var48) { // L: 998 - class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 999 - var78 = false; // L: 1000 - break label1256; // L: 1001 - } - - if (var80 == null) { // L: 1003 - var78 = false; // L: 1004 - } else { - var85 = java.util.Calendar.getInstance(); // L: 1009 - var85.set(1, var85.get(1) - 13); // L: 1010 - var88 = var85.getTime(); // L: 1011 - var15 = var80.before(var88); // L: 1012 - var69 = GraphicsObject.method1864(var80); // L: 1015 - if (!var69) { // L: 1016 - class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1017 - var78 = false; // L: 1018 - } else { - if (!var15) { // L: 1021 - class9.field35 = 8388607; // L: 1022 - } else { - class9.field35 = (int)(var80.getTime() / 86400000L - 11745L); // L: 1025 - } - - var78 = true; // L: 1027 - } - } - } - - if (var78) { // L: 1030 - InterfaceParent.updateGameState(50); // L: 1031 - return; // L: 1032 - } - } - - var11 = Login.loginBoxX + 180 + 80; // L: 1035 - if (var4 == 1 && var51 >= var11 - 75 && var51 <= var11 + 75 && var52 >= var60 - 20 && var52 <= var60 + 20) { // L: 1036 - Login.field900 = new String[8]; // L: 1037 - class127.Login_promptCredentials(true); // L: 1038 - } - - while (class16.isKeyDown()) { // L: 1040 - if (class241.field2833 == 101) { // L: 1041 - Login.field900[Login.field899] = null; // L: 1042 - } - - if (class241.field2833 == 85) { // L: 1044 - if (Login.field900[Login.field899] == null && Login.field899 > 0) { // L: 1045 - --Login.field899; // L: 1046 - } - - Login.field900[Login.field899] = null; // L: 1048 - } - - if (class1.field3 >= '0' && class1.field3 <= '9') { // L: 1050 - Login.field900[Login.field899] = "" + class1.field3; // L: 1051 - if (Login.field899 < 7) { // L: 1052 - ++Login.field899; // L: 1053 - } - } - - if (class241.field2833 == 84) { // L: 1056 - label1185: { - try { - var84 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1063 - var84.setLenient(false); // L: 1064 - var87 = new StringBuilder(); // L: 1065 - var71 = Login.field900; // L: 1067 - var19 = 0; - - while (true) { - if (var19 >= var71.length) { - var87.append("12"); // L: 1080 - var82 = var84.parse(var87.toString()); // L: 1081 - break; - } - - var42 = var71[var19]; // L: 1069 - if (var42 == null) { // L: 1071 - class150.method3092("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1072 - var82 = null; // L: 1073 - break; // L: 1074 - } - - var87.append(var42); // L: 1076 - ++var19; // L: 1068 - } - - var80 = var82; // L: 1083 - } catch (ParseException var47) { // L: 1085 - class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1086 - var78 = false; // L: 1087 - break label1185; // L: 1088 - } - - if (var80 == null) { // L: 1090 - var78 = false; // L: 1091 - } else { - var85 = java.util.Calendar.getInstance(); // L: 1096 - var85.set(1, var85.get(1) - 13); // L: 1097 - var88 = var85.getTime(); // L: 1098 - var15 = var80.before(var88); // L: 1099 - var69 = GraphicsObject.method1864(var80); // L: 1102 - if (!var69) { // L: 1103 - class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1104 - var78 = false; // L: 1105 - } else { - if (!var15) { // L: 1108 - class9.field35 = 8388607; // L: 1109 - } else { - class9.field35 = (int)(var80.getTime() / 86400000L - 11745L); // L: 1112 - } - - var78 = true; // L: 1114 - } - } - } - - if (var78) { // L: 1117 - InterfaceParent.updateGameState(50); // L: 1118 - } - - return; // L: 1120 - } - } - } else { - var53 = Login.loginBoxX + 180 - 80; // L: 1125 - var8 = 321; // L: 1126 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1127 - class11.openURL(class129.method2849("secure", true) + "m=dob/set_dob.ws", true, false); // L: 1128 - GrandExchangeEvent.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1129 - class150.method3089(6); // L: 1130 - return; // L: 1131 - } - - var53 = Login.loginBoxX + 180 + 80; // L: 1133 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1134 - class127.Login_promptCredentials(true); // L: 1135 - } - } - } else if (Login.loginIndex == 8) { // L: 1139 - var53 = Login.loginBoxX + 180 - 80; // L: 1140 - var8 = 321; // L: 1141 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1142 - class11.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1143 - GrandExchangeEvent.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1144 - class150.method3089(6); // L: 1145 - return; // L: 1146 - } - - var53 = Login.loginBoxX + 180 + 80; // L: 1148 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1149 - class127.Login_promptCredentials(true); // L: 1150 - } - } else if (Login.loginIndex == 9) { // L: 1153 - var53 = Login.loginBoxX + 180; // L: 1154 - var8 = 311; // L: 1155 - if (class241.field2833 == 84 || class241.field2833 == 13 || var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1156 - class230.method4894(false); // L: 1157 - } - } else if (Login.loginIndex == 10) { // L: 1160 - var53 = Login.loginBoxX + 180; // L: 1161 - var8 = 209; // L: 1162 - if (class241.field2833 == 84 || var4 == 1 && var51 >= var53 - 109 && var51 <= var53 + 109 && var52 >= var8 && var52 <= var8 + 68) { // L: 1163 - GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 1164 - Client.field517 = class441.field4667; // L: 1165 - Varcs.method2462(false); // L: 1166 - InterfaceParent.updateGameState(20); // L: 1167 - } - } else if (Login.loginIndex == 12) { // L: 1170 - var53 = class134.loginBoxCenter; // L: 1171 - var8 = 233; // L: 1172 - Bounds var43 = var1.method6432(0, 30, "terms of use, privacy policy, and end user licence", var53, var8); // L: 1173 - Bounds var23 = var1.method6432(32, 32, "terms of use, privacy policy, and end user licence", var53, var8); // L: 1174 - Bounds var24 = var1.method6432(70, 34, "terms of use, privacy policy, and end user licence", var53, var8); // L: 1175 - var55 = var8 + 17; // L: 1176 - Bounds var76 = var1.method6432(0, 34, "agreement (EULA).", var53, var55); // L: 1177 - if (var4 == 1) { // L: 1178 - if (var43.method6983(var51, var52)) { // L: 1179 - class11.openURL("https://www.jagex.com/terms", true, false); // L: 1180 - } else if (var23.method6983(var51, var52)) { // L: 1182 - class11.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1183 - } else if (var24.method6983(var51, var52) || var76.method6983(var51, var52)) { // L: 1185 - class11.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 1186 - } - } - - var53 = class134.loginBoxCenter - 80; // L: 1189 - var8 = 311; // L: 1190 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1191 - Interpreter.clientPreferences.method2274(Client.field484); // L: 1193 - class230.method4894(true); // L: 1195 - } - - var53 = class134.loginBoxCenter + 80; // L: 1197 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1198 - Login.loginIndex = 13; // L: 1199 - } - } else if (Login.loginIndex == 13) { // L: 1202 - var53 = class134.loginBoxCenter; // L: 1203 - var8 = 321; // L: 1204 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1205 - class230.method4894(true); // L: 1206 - } - } else if (Login.loginIndex == 14) { // L: 1209 - String var44 = ""; // L: 1210 - switch(Login.field892) { // L: 1211 - case 0: - var44 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1216 - break; // L: 1217 - case 1: - var44 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1219 - break; - default: - class127.Login_promptCredentials(false); // L: 1213 - } - - var55 = Login.loginBoxX + 180; // L: 1222 - var56 = 276; // L: 1223 - if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 1224 - class11.openURL(var44, true, false); // L: 1225 - GrandExchangeEvent.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1226 - class150.method3089(6); // L: 1227 - return; // L: 1228 - } - - var55 = Login.loginBoxX + 180; // L: 1230 - var56 = 326; // L: 1231 - if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 1232 - class127.Login_promptCredentials(false); // L: 1233 - } - } else if (Login.loginIndex == 24) { // L: 1236 - var53 = Login.loginBoxX + 180; // L: 1237 - var8 = 301; // L: 1238 - if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1239 - class230.method4894(false); // L: 1240 - } - } - } else { - while (true) { - do { - if (!class16.isKeyDown()) { // L: 935 - var54 = 321; // L: 940 - if (var4 == 1 && var52 >= var54 - 20 && var52 <= var54 + 20) { // L: 941 - class127.Login_promptCredentials(true); // L: 942 - } - - return; - } - } while(class241.field2833 != 84 && class241.field2833 != 13); // L: 936 - - class127.Login_promptCredentials(true); // L: 937 - } - } - } - } - } - - } - } - } - } // L: 331 + public static int method3890(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 24 + } } diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java new file mode 100644 index 0000000000..14ac967537 --- /dev/null +++ b/runescape-client/src/main/java/class196.java @@ -0,0 +1,152 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gx") +public class class196 { + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1925953895 + ) + static int field2204; + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Lpe;I)Ljava/lang/String;", + garbageValue = "1101478665" + ) + public static String method3900(CharSequence var0, LoginType var1) { + if (var0 == null) { // L: 48 + return null; + } else { + int var2 = 0; // L: 49 + + int var3; + boolean var4; + char var5; + for (var3 = var0.length(); var2 < var3; ++var2) { // L: 50 53 63 + var5 = var0.charAt(var2); // L: 55 + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 57 + if (!var4) { // L: 59 + break; + } + } + + while (var3 > var2) { // L: 67 + var5 = var0.charAt(var3 - 1); // L: 69 + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 71 + if (!var4) { // L: 73 + break; + } + + --var3; // L: 77 + } + + int var11 = var3 - var2; // L: 79 + if (var11 >= 1 && var11 <= class204.method4255(var1)) { // L: 80 + StringBuilder var10 = new StringBuilder(var11); // L: 81 + + for (int var6 = var2; var6 < var3; ++var6) { // L: 82 + char var7 = var0.charAt(var6); // L: 83 + if (NetSocket.method3309(var7)) { // L: 84 + char var8; + switch(var7) { // L: 87 + case ' ': + case '-': + case '_': + case ' ': + var8 = '_'; // L: 97 + break; // L: 98 + case '#': + case '[': + case ']': + var8 = var7; // L: 91 + break; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var8 = 'a'; // L: 113 + break; // L: 114 + case 'Ç': + case 'ç': + var8 = 'c'; // L: 117 + break; // L: 118 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var8 = 'e'; // L: 135 + break; // L: 136 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var8 = 'i'; // L: 125 + break; // L: 126 + case 'Ñ': + case 'ñ': + var8 = 'n'; // L: 167 + break; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var8 = 'o'; // L: 147 + break; // L: 148 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var8 = 'u'; // L: 157 + break; // L: 158 + case 'ß': + var8 = 'b'; // L: 160 + break; // L: 161 + case 'ÿ': + case 'Ÿ': + var8 = 'y'; // L: 101 + break; // L: 102 + default: + var8 = Character.toLowerCase(var7); // L: 163 + } + + if (var8 != 0) { // L: 172 + var10.append(var8); // L: 173 + } + } + } + + if (var10.length() == 0) { // L: 175 + return null; + } else { + return var10.toString(); // L: 176 + } + } else { + return null; + } + } + } +} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index c94e76a458..d3ef816257 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("h") +@ObfuscatedName("i") public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index 0e5f9afeb1..7f3001d6c6 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -1,194 +1,233 @@ import java.io.IOException; -import java.util.Iterator; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("a") public class class20 implements Callable { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - public static AbstractArchive field101; - @ObfuscatedName("r") - public static short[][] field102; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lk;" + descriptor = "Lr;" ) - final class10 field100; + final class10 field107; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lp;" + descriptor = "Ld;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lp;Lk;)V" + descriptor = "(Ld;Lr;)V" ) class20(class14 var1, class10 var2) { this.this$0 = var1; // L: 46 - this.field100 = var2; // L: 47 + this.field107 = var2; // L: 47 } // L: 48 public Object call() throws Exception { try { - while (this.field100.method105()) { // L: 53 - GrandExchangeOfferTotalQuantityComparator.method6007(10L); // L: 54 + while (this.field107.method86()) { // L: 52 + class93.method2384(10L); // L: 53 } - } catch (IOException var2) { - return new class21("Error servicing REST query: " + var2.getMessage()); + } catch (IOException var2) { // L: 56 + return new class21("Error servicing REST query: " + var2.getMessage()); // L: 57 } - return this.field100.method91(); + return this.field107.method81(); // L: 59 } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-28287593" + descriptor = "(Lpi;IIIIIIB)V", + garbageValue = "1" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return ClanChannelMember.method2850(var0, 10, true); // L: 35 - } + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 169 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 170 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "441133121" - ) - static void method327() { - if (Login.clearLoginScreen) { // L: 299 - AbstractByteArrayCopier.titleboxSprite = null; // L: 300 - class137.titlebuttonSprite = null; // L: 301 - class355.runesSprite = null; // L: 302 - Login.leftTitleSprite = null; // L: 303 - class162.rightTitleSprite = null; // L: 304 - HorizontalAlignment.logoSprite = null; // L: 305 - class114.title_muteSprite = null; // L: 306 - class160.options_buttons_0Sprite = null; // L: 307 - Skeleton.options_buttons_2Sprite = null; // L: 308 - class128.worldSelectBackSprites = null; // L: 309 - class162.worldSelectFlagSprites = null; // L: 310 - Client.worldSelectArrows = null; // L: 311 - class29.worldSelectStars = null; // L: 312 - class19.field96 = null; // L: 313 - Login.loginScreenRunesAnimation.method2230(); // L: 314 - class273.musicPlayerStatus = 1; // L: 316 - class147.musicTrackArchive = null; // L: 317 - ArchiveLoader.musicTrackGroupId = -1; // L: 318 - class273.musicTrackFileId = -1; // L: 319 - DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 320 - class260.musicTrackBoolean = false; // L: 321 - class273.pcmSampleLength = 2; // L: 322 - NPC.method2366(true); // L: 324 - Login.clearLoginScreen = false; // L: 325 + while (true) { + var7 = var0.readUnsignedByte(); // L: 172 + if (var7 == 0) { // L: 173 + if (var1 == 0) { // L: 174 + int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 175 + int var11 = var2 + var4 + 932731; // L: 178 + int var12 = var3 + var5 + 556238; // L: 179 + int var13 = UserComparator9.method2615(45365 + var11, var12 + 91923, 4) - 128 + (UserComparator9.method2615(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (UserComparator9.method2615(var11, var12, 1) - 128 >> 2); // L: 181 + var13 = (int)(0.3D * (double)var13) + 35; // L: 182 + if (var13 < 10) { // L: 183 + var13 = 10; + } else if (var13 > 60) { // L: 184 + var13 = 60; + } + + var14[var3] = -var13 * 8; // L: 187 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 189 + } + break; + } + + if (var7 == 1) { // L: 192 + int var8 = var0.readUnsignedByte(); // L: 193 + if (var8 == 1) { // L: 194 + var8 = 0; + } + + if (var1 == 0) { // L: 195 + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 196 + } + break; + } + + if (var7 <= 49) { // L: 199 + class14.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 200 + class147.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 201 + Tiles.field983[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 202 + } else if (var7 <= 81) { // L: 205 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 206 + } else { + Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 209 + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); // L: 214 + if (var7 == 0) { // L: 215 + break; + } + + if (var7 == 1) { // L: 216 + var0.readUnsignedByte(); // L: 217 + break; + } + + if (var7 <= 49) { // L: 220 + var0.readUnsignedByte(); + } + } } - } // L: 326 - @ObfuscatedName("d") + } // L: 223 + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(Lcz;IIII)V", + garbageValue = "1063086800" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (GrandExchangeEvents.localPlayer != var0) { // L: 10123 + if (Client.menuOptionsCount < 400) { // L: 10124 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 10126 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 10127 + var7 = var0.combatLevel; // L: 10129 + int var8 = GrandExchangeEvents.localPlayer.combatLevel; // L: 10130 + int var9 = var8 - var7; // L: 10132 + String var6; + if (var9 < -9) { // L: 10133 + var6 = UserComparator9.colorStartTag(16711680); // L: 10134 + } else if (var9 < -6) { // L: 10137 + var6 = UserComparator9.colorStartTag(16723968); // L: 10138 + } else if (var9 < -3) { // L: 10141 + var6 = UserComparator9.colorStartTag(16740352); // L: 10142 + } else if (var9 < 0) { // L: 10145 + var6 = UserComparator9.colorStartTag(16756736); // L: 10146 + } else if (var9 > 9) { // L: 10149 + var6 = UserComparator9.colorStartTag(65280); // L: 10150 + } else if (var9 > 6) { // L: 10153 + var6 = UserComparator9.colorStartTag(4259584); // L: 10154 + } else if (var9 > 3) { // L: 10157 + var6 = UserComparator9.colorStartTag(8453888); // L: 10158 + } else if (var9 > 0) { // L: 10161 + var6 = UserComparator9.colorStartTag(12648192); // L: 10162 + } else { + var6 = UserComparator9.colorStartTag(16776960); // L: 10165 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 10167 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10169 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 10170 + class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10171 + } else if (Client.isSpellSelected) { // L: 10174 + if ((class17.selectedSpellFlags & 8) == 8) { // L: 10175 + class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10176 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 10181 + if (Client.playerMenuActions[var10] != null) { // L: 10182 + short var11 = 0; // L: 10183 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 10184 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10185 + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > GrandExchangeEvents.localPlayer.combatLevel) { // L: 10186 + var11 = 2000; // L: 10187 + } + + if (GrandExchangeEvents.localPlayer.team != 0 && var0.team != 0) { // L: 10189 + if (var0.team == GrandExchangeEvents.localPlayer.team) { // L: 10190 + var11 = 2000; + } else { + var11 = 0; // L: 10191 + } + } else if (Client.playerAttackOption == AttackOption.field1263 && var0.isClanMember()) { // L: 10193 + var11 = 2000; // L: 10194 + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 10197 + var11 = 2000; + } + + boolean var12 = false; // L: 10198 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 10199 + class21.insertMenuItemNoShift(Client.playerMenuActions[var10], UserComparator9.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 10200 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 10205 + if (Client.menuOpcodes[var10] == 23) { // L: 10206 + Client.menuTargets[var10] = UserComparator9.colorStartTag(16777215) + var4; // L: 10207 + break; + } + } + + } + } + } // L: 10211 + + @ObfuscatedName("kt") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "19" + garbageValue = "-124" ) - static void method326() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + static final void method294() { + PacketBufferNode var0 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 12135 + Client.packetWriter.addNode(var0); // L: 12136 + Interpreter.field842 = true; // L: 12137 - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 58 - var1.clearIsFromFriend(); // L: 60 + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12138 + if (var1.type == 0 || var1.type == 3) { // L: 12139 + Script.closeInterface(var1, true); + } } - } // L: 63 - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "-43" - ) - static final void method324(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var8 = var6 - 334; // L: 5025 - if (var8 < 0) { // L: 5026 - var8 = 0; - } else if (var8 > 100) { // L: 5027 - var8 = 100; + if (Client.meslayerContinueWidget != null) { // L: 12141 + class346.invalidateWidget(Client.meslayerContinueWidget); // L: 12142 + Client.meslayerContinueWidget = null; // L: 12143 } - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5028 - int var7 = var5 * var9 / 256; // L: 5029 - var8 = 2048 - var3 & 2047; // L: 5032 - var9 = 2048 - var4 & 2047; // L: 5033 - int var10 = 0; // L: 5034 - int var11 = 0; // L: 5035 - int var12 = var7; // L: 5036 - int var13; - int var14; - int var15; - if (var8 != 0) { // L: 5037 - var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5038 - var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5039 - var15 = var14 * var11 - var13 * var7 >> 16; // L: 5040 - var12 = var7 * var14 + var13 * var11 >> 16; // L: 5041 - var11 = var15; // L: 5042 - } - - if (var9 != 0) { // L: 5044 - var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5045 - var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5046 - var15 = var14 * var10 + var12 * var13 >> 16; // L: 5047 - var12 = var12 * var14 - var13 * var10 >> 16; // L: 5048 - var10 = var15; // L: 5049 - } - - if (Client.isCameraLocked) { // L: 5051 - class175.field1883 = var0 - var10; // L: 5052 - ReflectionCheck.field250 = var1 - var11; // L: 5053 - ModeWhere.field4080 = var2 - var12; // L: 5054 - WorldMapRegion.field2706 = var3; // L: 5055 - class457.field4747 = var4; // L: 5056 - } else { - EnumComposition.cameraX = var0 - var10; // L: 5059 - FriendSystem.cameraY = var1 - var11; // L: 5060 - CollisionMap.cameraZ = var2 - var12; // L: 5061 - Language.cameraPitch = var3; // L: 5062 - MusicPatchNode2.cameraYaw = var4; // L: 5063 - } - - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (Messages.oculusOrbFocalPointX >> 7 != class19.localPlayer.x >> 7 || class115.oculusOrbFocalPointY >> 7 != class19.localPlayer.y >> 7)) { // L: 5065 5066 - var13 = class19.localPlayer.plane; // L: 5067 - var14 = (Messages.oculusOrbFocalPointX >> 7) + ApproximateRouteStrategy.baseX; // L: 5068 - var15 = (class115.oculusOrbFocalPointY >> 7) + class250.baseY; // L: 5069 - class392.method7191(var14, var15, var13, true); // L: 5070 - } - - } // L: 5073 - - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "(Lcy;ZI)V", - garbageValue = "-1005084582" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 11518 - int var3 = (int)var0.key; // L: 11519 - var0.remove(); // L: 11520 - if (var1) { // L: 11521 - WorldMapID.method5000(var2); - } - - class19.method318(var2); // L: 11522 - Widget var4 = HorizontalAlignment.getWidget(var3); // L: 11523 - if (var4 != null) { // L: 11524 - class290.invalidateWidget(var4); - } - - if (Client.rootInterface != -1) { // L: 11525 - MouseHandler.runIntfCloseListeners(Client.rootInterface, 1); - } - - } // L: 11526 + Interpreter.field842 = false; // L: 12145 + } // L: 12146 } diff --git a/runescape-client/src/main/java/class202.java b/runescape-client/src/main/java/class202.java deleted file mode 100644 index 899b58af6e..0000000000 --- a/runescape-client/src/main/java/class202.java +++ /dev/null @@ -1,204 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gl") -public class class202 { - @ObfuscatedName("ey") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "[Ldq;" - ) - class115[] field2350; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 166923325 - ) - int field2352; - - @ObfuscatedSignature( - descriptor = "(Lpd;I)V" - ) - class202(Buffer var1, int var2) { - this.field2350 = new class115[var2]; // L: 13 - this.field2352 = var1.readUnsignedByte(); // L: 14 - - for (int var3 = 0; var3 < this.field2350.length; ++var3) { // L: 15 - class115 var4 = new class115(this.field2352, var1, false); // L: 16 - this.field2350[var3] = var4; // L: 17 - } - - this.method4115(); // L: 19 - } // L: 20 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "245486778" - ) - void method4115() { - class115[] var1 = this.field2350; // L: 24 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 - class115 var3 = var1[var2]; // L: 26 - if (var3.field1410 >= 0) { // L: 28 - var3.field1404 = this.field2350[var3.field1410]; // L: 29 - } - } - - } // L: 34 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-60" - ) - public int method4098() { - return this.field2350.length; // L: 37 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)Ldq;", - garbageValue = "10" - ) - class115 method4099(int var1) { - return this.field2350[var1]; // L: 41 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)[Ldq;", - garbageValue = "-796000357" - ) - class115[] method4100() { - return this.field2350; // L: 45 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ldu;IB)V", - garbageValue = "-80" - ) - void method4106(class122 var1, int var2) { - this.method4116(var1, var2, (boolean[])null, false); // L: 49 - } // L: 50 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ldu;I[ZZI)V", - garbageValue = "-1805231033" - ) - void method4116(class122 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method2783(); // L: 53 - int var6 = 0; // L: 54 - class115[] var7 = this.method4100(); // L: 56 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 - class115 var9 = var7[var8]; // L: 58 - if (var3 == null || var4 == var3[var6]) { // L: 60 - var1.method2763(var2, var9, var6, var5); // L: 61 - } - - ++var6; // L: 63 - } - - } // L: 67 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ldi;FZI)F", - garbageValue = "-605399100" - ) - static float method4111(class117 var0, float var1, boolean var2) { - float var3 = 0.0F; // L: 197 - if (var0 != null && var0.method2706() != 0) { // L: 198 - float var4 = (float)var0.field1430[0].field1384; // L: 201 - float var5 = (float)var0.field1430[var0.method2706() - 1].field1384; // L: 202 - float var6 = var5 - var4; // L: 203 - if ((double)var6 == 0.0D) { // L: 204 - return var0.field1430[0].field1385; // L: 205 - } else { - float var7 = 0.0F; // L: 207 - if (var1 > var5) { // L: 208 - var7 = (var1 - var5) / var6; // L: 209 - } else { - var7 = (var1 - var4) / var6; // L: 212 - } - - double var8 = (double)((int)var7); // L: 214 - float var10 = Math.abs((float)((double)var7 - var8)); // L: 215 - float var11 = var6 * var10; // L: 216 - var8 = Math.abs(var8 + 1.0D); // L: 217 - double var12 = var8 / 2.0D; // L: 218 - double var14 = (double)((int)var12); // L: 219 - var10 = (float)(var12 - var14); // L: 220 - float var16; - float var17; - if (var2) { // L: 223 - if (var0.field1428 == class116.field1423) { // L: 224 - if (0.0D != (double)var10) { // L: 225 - var11 += var4; // L: 226 - } else { - var11 = var5 - var11; // L: 229 - } - } else if (var0.field1428 != class116.field1425 && var0.field1428 != class116.field1421) { // L: 232 - if (var0.field1428 == class116.field1419) { // L: 235 - var11 = var4 - var1; // L: 236 - var16 = var0.field1430[0].field1386; // L: 237 - var17 = var0.field1430[0].field1390; // L: 238 - var3 = var0.field1430[0].field1385; // L: 239 - if (0.0D != (double)var16) { // L: 240 - var3 -= var17 * var11 / var16; // L: 241 - } - - return var3; // L: 243 - } - } else { - var11 = var5 - var11; // L: 233 - } - } else if (var0.field1429 == class116.field1423) { // L: 247 - if ((double)var10 != 0.0D) { // L: 248 - var11 = var5 - var11; // L: 249 - } else { - var11 += var4; // L: 252 - } - } else if (var0.field1429 != class116.field1425 && var0.field1429 != class116.field1421) { // L: 255 - if (var0.field1429 == class116.field1419) { // L: 258 - var11 = var1 - var5; // L: 259 - var16 = var0.field1430[var0.method2706() - 1].field1388; // L: 260 - var17 = var0.field1430[var0.method2706() - 1].field1389; // L: 261 - var3 = var0.field1430[var0.method2706() - 1].field1385; // L: 262 - if (0.0D != (double)var16) { // L: 263 - var3 += var11 * var17 / var16; // L: 264 - } - - return var3; // L: 266 - } - } else { - var11 += var4; // L: 256 - } - - var3 = AttackOption.method2392(var0, var11); // L: 269 - float var18; - if (var2 && var0.field1428 == class116.field1421) { // L: 271 - var18 = var0.field1430[var0.method2706() - 1].field1385 - var0.field1430[0].field1385; // L: 272 - var3 = (float)((double)var3 - var8 * (double)var18); // L: 273 - } else if (!var2 && var0.field1429 == class116.field1421) { // L: 275 - var18 = var0.field1430[var0.method2706() - 1].field1385 - var0.field1430[0].field1385; // L: 276 - var3 = (float)((double)var3 + (double)var18 * var8); // L: 277 - } - - return var3; // L: 279 - } - } else { - return var3; // L: 199 - } - } -} diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java new file mode 100644 index 0000000000..fe18a52a4c --- /dev/null +++ b/runescape-client/src/main/java/class204.java @@ -0,0 +1,200 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gl") +public class class204 implements WorldMapSection { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 899584583 + ) + int field2294; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 891163721 + ) + int field2287; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -789708035 + ) + int field2288; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1083583131 + ) + int field2289; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1662345179 + ) + int field2290; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 2097442135 + ) + int field2291; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -165365561 + ) + int field2295; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1619929283 + ) + int field2293; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1300866769 + ) + int field2286; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1331564349 + ) + int field2292; + + class204() { + } // L: 18 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lgu;I)V", + garbageValue = "964088357" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2290) { + var1.regionLowX = this.field2290; + } + + if (var1.regionHighX < this.field2290) { + var1.regionHighX = this.field2290; // L: 22 + } + + if (var1.regionLowY > this.field2291) { + var1.regionLowY = this.field2291; + } + + if (var1.regionHighY < this.field2291) { // L: 24 + var1.regionHighY = this.field2291; + } + + } // L: 25 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-1337137401" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2294 && var1 < this.field2294 + this.field2287) { // L: 28 + return var2 >= (this.field2288 << 6) + (this.field2295 << 3) && var2 <= (this.field2288 << 6) + (this.field2295 << 3) + 7 && var3 >= (this.field2289 << 6) + (this.field2293 << 3) && var3 <= (this.field2289 << 6) + (this.field2293 << 3) + 7; // L: 31 + } else { + return false; // L: 29 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "1769831605" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2290 << 6) + (this.field2286 << 3) && var1 <= (this.field2290 << 6) + (this.field2286 << 3) + 7 && var2 >= (this.field2291 << 6) + (this.field2292 << 3) && var2 <= (this.field2291 << 6) + (this.field2292 << 3) + 7; // L: 35 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "1941144122" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; // L: 40 + } else { + int[] var4 = new int[]{var2 + (this.field2290 * 64 - this.field2288 * 64) + (this.field2286 * 8 - this.field2295 * 8), var3 + (this.field2291 * 64 - this.field2289 * 64) + (this.field2292 * 8 - this.field2293 * 8)}; // L: 42 43 44 + return var4; // L: 45 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)Lks;", + garbageValue = "-670243838" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 + } else { + int var3 = this.field2288 * 64 - this.field2290 * 64 + (this.field2295 * 8 - this.field2286 * 8) + var1; // L: 52 + int var4 = var2 + (this.field2289 * 64 - this.field2291 * 64) + (this.field2293 * 8 - this.field2292 * 8); // L: 53 + return new Coord(this.field2294, var3, var4); // L: 54 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lpi;I)V", + garbageValue = "-860121653" + ) + @Export("read") + public void read(Buffer var1) { + this.field2294 = var1.readUnsignedByte(); // L: 58 + this.field2287 = var1.readUnsignedByte(); // L: 59 + this.field2288 = var1.readUnsignedShort(); // L: 60 + this.field2295 = var1.readUnsignedByte(); // L: 61 + this.field2289 = var1.readUnsignedShort(); // L: 62 + this.field2293 = var1.readUnsignedByte(); // L: 63 + this.field2290 = var1.readUnsignedShort(); // L: 64 + this.field2286 = var1.readUnsignedByte(); // L: 65 + this.field2291 = var1.readUnsignedShort(); // L: 66 + this.field2292 = var1.readUnsignedByte(); // L: 67 + this.method4246(); // L: 68 + } // L: 69 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2032484679" + ) + void method4246() { + } // L: 71 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpe;B)I", + garbageValue = "-42" + ) + static final int method4255(LoginType var0) { + if (var0 == null) { // L: 16 + return 12; // L: 17 + } else { + switch(var0.field4557) { // L: 19 + case 1: + return 20; // L: 21 + default: + return 12; // L: 23 + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IZIZI)V", + garbageValue = "-1799343928" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (DevicePcmPlayerProvider.World_worlds != null) { // L: 171 + ObjectSound.doWorldSorting(0, DevicePcmPlayerProvider.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + } + + } // L: 174 +} diff --git a/runescape-client/src/main/java/class205.java b/runescape-client/src/main/java/class205.java new file mode 100644 index 0000000000..c6683dfe2c --- /dev/null +++ b/runescape-client/src/main/java/class205.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gz") +public class class205 { + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "9" + ) + public static void method4256() { + if (KeyHandler.KeyHandler_instance != null) { // L: 161 + synchronized(KeyHandler.KeyHandler_instance) { // L: 162 + KeyHandler.KeyHandler_instance = null; // L: 163 + } // L: 164 + } + + } // L: 166 +} diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index f44f9f07e6..5107fd2e08 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -10,30 +10,45 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("y") public class class21 { - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1307123935 + @ObfuscatedName("rp") + @ObfuscatedSignature( + descriptor = "Lea;" ) - static int field108; + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("ta") + @ObfuscatedGetter( + intValue = 1164104803 + ) + static int field116; + @ObfuscatedName("hi") + @Export("regions") + static int[] regions; + @ObfuscatedName("jc") + @ObfuscatedGetter( + intValue = 98002171 + ) + @Export("cameraYaw") + static int cameraYaw; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -300178005 + intValue = -824857787 ) - final int field103; - @ObfuscatedName("o") - final String field104; + final int field111; + @ObfuscatedName("c") + final String field109; class21(String var1) { - this.field103 = 400; // L: 32 - this.field104 = ""; // L: 33 + this.field111 = 400; // L: 32 + this.field109 = ""; // L: 33 } // L: 34 class21(HttpURLConnection var1) throws IOException { - this.field103 = var1.getResponseCode(); // L: 14 + this.field111 = var1.getResponseCode(); // L: 14 var1.getResponseMessage(); // L: 15 var1.getHeaderFields(); // L: 16 StringBuilder var2 = new StringBuilder(); // L: 17 - InputStream var3 = this.field103 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18 + InputStream var3 = this.field111 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18 if (var3 != null) { // L: 19 InputStreamReader var4 = new InputStreamReader(var3); // L: 20 BufferedReader var5 = new BufferedReader(var4); // L: 21 @@ -46,76 +61,53 @@ public class class21 { var3.close(); // L: 26 } - this.field104 = var2.toString(); // L: 28 + this.field109 = var2.toString(); // L: 28 } // L: 29 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "545491845" + garbageValue = "716414120" ) - public int method328() { - return this.field103; // L: 37 + public int method299() { + return this.field111; // L: 37 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-31" + garbageValue = "11" ) - public String method330() { - return this.field104; // L: 41 + public String method297() { + return this.field109; // L: 41 } - @ObfuscatedName("ix") + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1896526262" + descriptor = "(I)Lov;", + garbageValue = "2110304027" ) - @Export("incrementMenuEntries") - static final void incrementMenuEntries() { - boolean var0 = false; // L: 9181 + @Export("getWorldMap") + static WorldMap getWorldMap() { + return ScriptFrame.worldMap; // L: 664 + } - while (!var0) { // L: 9182 - var0 = true; // L: 9183 - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9184 - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9185 - String var2 = Client.menuTargets[var1]; // L: 9186 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9187 - Client.menuTargets[var1 + 1] = var2; // L: 9188 - String var3 = Client.menuActions[var1]; // L: 9189 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9190 - Client.menuActions[var1 + 1] = var3; // L: 9191 - int var4 = Client.menuOpcodes[var1]; // L: 9192 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9193 - Client.menuOpcodes[var1 + 1] = var4; // L: 9194 - var4 = Client.menuArguments1[var1]; // L: 9195 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9196 - Client.menuArguments1[var1 + 1] = var4; // L: 9197 - var4 = Client.menuArguments2[var1]; // L: 9198 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9199 - Client.menuArguments2[var1 + 1] = var4; // L: 9200 - var4 = Client.menuIdentifiers[var1]; // L: 9201 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9202 - Client.menuIdentifiers[var1 + 1] = var4; // L: 9203 - boolean var5 = Client.menuShiftClick[var1]; // L: 9204 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9205 - Client.menuShiftClick[var1 + 1] = var5; // L: 9206 - var0 = false; // L: 9207 - } - } - } - - } // L: 9211 - - @ObfuscatedName("kl") + @ObfuscatedName("in") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-1923971854" ) - static final void method334(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11387 - Interpreter.clientPreferences.method2270(var0); // L: 11388 - } // L: 11389 + static final boolean method303() { + return Client.isMenuOpen; // L: 8651 + } + + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "1636192715" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + class28.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9826 + } // L: 9827 } diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java new file mode 100644 index 0000000000..5dbd06fe0e --- /dev/null +++ b/runescape-client/src/main/java/class214.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hr") +public class class214 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhr;" + ) + static final class214 field2380; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhr;" + ) + static final class214 field2378; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1627101547 + ) + @Export("value") + final int value; + + static { + field2380 = new class214(0); // L: 4 + field2378 = new class214(1); // L: 5 + } + + class214(int var1) { + this.value = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpi;Lpt;I)Lpt;", + garbageValue = "-175600425" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = class67.method1909(var2); // L: 18 + var1 = new IterableNodeHashTable(var3); // L: 19 + } + + for (var3 = 0; var3 < var2; ++var3) { // L: 21 + boolean var4 = var0.readUnsignedByte() == 1; // L: 22 + int var5 = var0.readMedium(); // L: 23 + Object var6; + if (var4) { // L: 25 + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } + + var1.put((Node)var6, (long)var5); // L: 27 + } + + return var1; // L: 29 + } +} diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java new file mode 100644 index 0000000000..c2e5a4ad55 --- /dev/null +++ b/runescape-client/src/main/java/class216.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ht") +public class class216 { + @ObfuscatedName("t") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[Lkm;", + garbageValue = "620331303" + ) + static class302[] method4365() { + return new class302[]{class302.field3551, class302.field3549}; // L: 35 + } +} diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java deleted file mode 100644 index ffa923cf70..0000000000 --- a/runescape-client/src/main/java/class221.java +++ /dev/null @@ -1,323 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hi") -public class class221 { - @ObfuscatedName("hy") - @ObfuscatedGetter( - intValue = -1143760795 - ) - static int field2647; - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(Lji;I)V", - garbageValue = "1145478954" - ) - static final void method4531(class263 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7067 - 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 (class263.field3013 == var0) { // L: 7068 - var2 = var1.method7789() * 4; // L: 7069 - var3 = var1.method7935(); // L: 7070 - var4 = var1.method7802(); // L: 7071 - var5 = var1.method7790(); // L: 7072 - var6 = (var5 >> 4 & 7) + FriendSystem.field803; // L: 7073 - var7 = (var5 & 7) + class9.field34; // L: 7074 - var8 = var1.method7935(); // L: 7075 - byte var41 = var1.method7955(); // L: 7076 - var10 = var1.method7927(); // L: 7077 - byte var42 = var1.method7925(); // L: 7078 - var12 = var1.readUnsignedByte() * 4; // L: 7079 - var13 = var1.method7790(); // L: 7080 - var14 = var1.method7935(); // L: 7081 - var9 = var41 + var6; // L: 7082 - var11 = var42 + var7; // L: 7083 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var9 >= 0 && var11 >= 0 && var9 < 104 && var11 < 104 && var14 != 65535) { // L: 7084 - var6 = var6 * 128 + 64; // L: 7085 - var7 = var7 * 128 + 64; // L: 7086 - var9 = var9 * 128 + 64; // L: 7087 - var11 = var11 * 128 + 64; // L: 7088 - Projectile var36 = new Projectile(var14, class160.Client_plane, var6, var7, Archive.getTileHeight(var6, var7, class160.Client_plane) - var2, var3 + Client.cycle, var8 + Client.cycle, var10, var13, var4, var12); // L: 7089 - var36.setDestination(var9, var11, Archive.getTileHeight(var9, var11, class160.Client_plane) - var12, var3 + Client.cycle); // L: 7090 - Client.projectiles.addFirst(var36); // L: 7091 - } - - } else if (class263.field3011 == var0) { // L: 7095 - var2 = var1.method7927(); // L: 7096 - var3 = (var2 >> 4 & 7) + FriendSystem.field803; // L: 7097 - var4 = (var2 & 7) + class9.field34; // L: 7098 - var5 = var1.readUnsignedByte(); // L: 7099 - var6 = var5 >> 2; // L: 7100 - var7 = var5 & 3; // L: 7101 - var8 = Client.field711[var6]; // L: 7102 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7103 - class137.updatePendingSpawn(class160.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7104 - } - - } else if (class263.field3006 == var0) { // L: 7108 - var2 = var1.readUnsignedShort(); // L: 7109 - var3 = var1.readUnsignedByte(); // L: 7110 - var4 = (var3 >> 4 & 7) + FriendSystem.field803; // L: 7111 - var5 = (var3 & 7) + class9.field34; // L: 7112 - var6 = var1.method7798(); // L: 7113 - var7 = var1.method7798(); // L: 7114 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7115 - NodeDeque var43 = Client.groundItems[class160.Client_plane][var4][var5]; // L: 7116 - if (var43 != null) { // L: 7117 - for (TileItem var35 = (TileItem)var43.last(); var35 != null; var35 = (TileItem)var43.previous()) { // L: 7118 7119 7124 - if ((var2 & 32767) == var35.id && var6 == var35.quantity) { // L: 7120 - var35.quantity = var7; // L: 7121 - break; - } - } - - class162.updateItemPile(var4, var5); // L: 7126 - } - } - - } else if (class263.field3004 == var0) { // L: 7131 - var2 = var1.method7935(); // L: 7132 - var3 = var1.method7790(); // L: 7133 - var4 = var3 >> 2; // L: 7134 - var5 = var3 & 3; // L: 7135 - var6 = Client.field711[var4]; // L: 7136 - var7 = var1.method7789(); // L: 7137 - var8 = (var7 >> 4 & 7) + FriendSystem.field803; // L: 7138 - var9 = (var7 & 7) + class9.field34; // L: 7139 - if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7140 - if (var6 == 0) { // L: 7141 - BoundaryObject var34 = FriendSystem.scene.method4150(class160.Client_plane, var8, var9); // L: 7142 - if (var34 != null) { // L: 7143 - var11 = class121.Entity_unpackID(var34.tag); // L: 7144 - if (var4 == 2) { // L: 7145 - var34.renderable1 = new DynamicObject(var11, 2, var5 + 4, class160.Client_plane, var8, var9, var2, false, var34.renderable1); // L: 7146 - var34.renderable2 = new DynamicObject(var11, 2, var5 + 1 & 3, class160.Client_plane, var8, var9, var2, false, var34.renderable2); // L: 7147 - } else { - var34.renderable1 = new DynamicObject(var11, var4, var5, class160.Client_plane, var8, var9, var2, false, var34.renderable1); // L: 7149 - } - } - } - - if (var6 == 1) { // L: 7152 - WallDecoration var44 = FriendSystem.scene.method4224(class160.Client_plane, var8, var9); // L: 7153 - if (var44 != null) { // L: 7154 - var11 = class121.Entity_unpackID(var44.tag); // L: 7155 - if (var4 != 4 && var4 != 5) { // L: 7156 - if (var4 == 6) { // L: 7157 - var44.renderable1 = new DynamicObject(var11, 4, var5 + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable1); - } else if (var4 == 7) { // L: 7158 - var44.renderable1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable1); - } else if (var4 == 8) { // L: 7159 - var44.renderable1 = new DynamicObject(var11, 4, var5 + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable1); // L: 7160 - var44.renderable2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable2); // L: 7161 - } - } else { - var44.renderable1 = new DynamicObject(var11, 4, var5, class160.Client_plane, var8, var9, var2, false, var44.renderable1); - } - } - } - - if (var6 == 2) { // L: 7165 - GameObject var45 = FriendSystem.scene.getGameObject(class160.Client_plane, var8, var9); // L: 7166 - if (var4 == 11) { // L: 7167 - var4 = 10; - } - - if (var45 != null) { - var45.renderable = new DynamicObject(class121.Entity_unpackID(var45.tag), var4, var5, class160.Client_plane, var8, var9, var2, false, var45.renderable); // L: 7168 - } - } - - if (var6 == 3) { // L: 7170 - FloorDecoration var46 = FriendSystem.scene.getFloorDecoration(class160.Client_plane, var8, var9); // L: 7171 - if (var46 != null) { // L: 7172 - var46.renderable = new DynamicObject(class121.Entity_unpackID(var46.tag), 22, var5, class160.Client_plane, var8, var9, var2, false, var46.renderable); - } - } - } - - } else { - if (class263.field3010 == var0) { // L: 7177 - var2 = var1.method7927(); // L: 7178 - var3 = var1.method7789(); // L: 7179 - var4 = (var3 >> 4 & 7) + FriendSystem.field803; // L: 7180 - var5 = (var3 & 7) + class9.field34; // L: 7181 - var6 = var1.method7927(); // L: 7182 - var7 = var6 >> 4 & 15; // L: 7183 - var8 = var6 & 7; // L: 7184 - var9 = var1.method7798(); // L: 7185 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7186 - var10 = var7 + 1; // L: 7187 - if (class19.localPlayer.pathX[0] >= var4 - var10 && class19.localPlayer.pathX[0] <= var10 + var4 && class19.localPlayer.pathY[0] >= var5 - var10 && class19.localPlayer.pathY[0] <= var10 + var5 && Interpreter.clientPreferences.method2286() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7188 7189 - Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7190 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7191 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7192 - Client.soundEffects[Client.soundEffectCount] = null; // L: 7193 - Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7194 - ++Client.soundEffectCount; // L: 7195 - } - } - } - - TileItem var32; - if (class263.field3007 == var0) { // L: 7200 - var2 = var1.method7935(); // L: 7201 - var3 = var1.readUnsignedByte(); // L: 7202 - var4 = (var3 >> 4 & 7) + FriendSystem.field803; // L: 7203 - var5 = (var3 & 7) + class9.field34; // L: 7204 - var6 = var1.method7935(); // L: 7205 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7206 - var32 = new TileItem(); // L: 7207 - var32.id = var2; // L: 7208 - var32.quantity = var6; // L: 7209 - if (Client.groundItems[class160.Client_plane][var4][var5] == null) { // L: 7210 - Client.groundItems[class160.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[class160.Client_plane][var4][var5].addFirst(var32); // L: 7211 - class162.updateItemPile(var4, var5); // L: 7212 - } - - } else { - if (class263.field3009 == var0) { // L: 7216 - byte var37 = var1.readByte(); // L: 7217 - var3 = var1.readUnsignedShort(); // L: 7218 - byte var38 = var1.method7792(); // L: 7219 - byte var39 = var1.readByte(); // L: 7220 - var6 = var1.method7971(); // L: 7221 - byte var40 = var1.method7792(); // L: 7222 - var8 = var1.method7935(); // L: 7223 - var9 = var1.method7790(); // L: 7224 - var10 = var9 >> 2; // L: 7225 - var11 = var9 & 3; // L: 7226 - var12 = Client.field711[var10]; // L: 7227 - var13 = var1.method7790(); // L: 7228 - var14 = (var13 >> 4 & 7) + FriendSystem.field803; // L: 7229 - int var15 = (var13 & 7) + class9.field34; // L: 7230 - int var16 = var1.method7935(); // L: 7231 - Player var17; - if (var3 == Client.localPlayerIndex) { // L: 7233 - var17 = class19.localPlayer; - } else { - var17 = Client.players[var3]; // L: 7234 - } - - if (var17 != null) { // L: 7235 - ObjectComposition var18 = class116.getObjectDefinition(var8); // L: 7236 - int var19; - int var20; - if (var11 != 1 && var11 != 3) { // L: 7239 - var19 = var18.sizeX; // L: 7244 - var20 = var18.sizeY; // L: 7245 - } else { - var19 = var18.sizeY; // L: 7240 - var20 = var18.sizeX; // L: 7241 - } - - int var21 = var14 + (var19 >> 1); // L: 7247 - int var22 = var14 + (var19 + 1 >> 1); // L: 7248 - int var23 = var15 + (var20 >> 1); // L: 7249 - int var24 = var15 + (var20 + 1 >> 1); // L: 7250 - int[][] var25 = Tiles.Tiles_heights[class160.Client_plane]; // L: 7251 - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 7252 - int var27 = (var14 << 7) + (var19 << 6); // L: 7253 - int var28 = (var15 << 7) + (var20 << 6); // L: 7254 - Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7255 - if (var29 != null) { // L: 7256 - class137.updatePendingSpawn(class160.Client_plane, var14, var15, var12, -1, 0, 0, var16 + 1, var6 + 1); // L: 7257 - var17.animationCycleStart = var16 + Client.cycle; // L: 7258 - var17.animationCycleEnd = var6 + Client.cycle; // L: 7259 - var17.model0 = var29; // L: 7260 - var17.field1084 = var19 * 64 + var14 * 128; // L: 7261 - var17.field1095 = var20 * 64 + var15 * 128; // L: 7262 - var17.tileHeight2 = var26; // L: 7263 - byte var30; - if (var38 > var40) { // L: 7264 - var30 = var38; // L: 7265 - var38 = var40; // L: 7266 - var40 = var30; // L: 7267 - } - - if (var39 > var37) { // L: 7269 - var30 = var39; // L: 7270 - var39 = var37; // L: 7271 - var37 = var30; // L: 7272 - } - - var17.minX = var14 + var38; // L: 7274 - var17.maxX = var14 + var40; // L: 7275 - var17.minY = var39 + var15; // L: 7276 - var17.maxY = var15 + var37; // L: 7277 - } - } - } - - if (class263.field3005 == var0) { // L: 7281 - var2 = var1.method7790(); // L: 7282 - var3 = var1.readUnsignedShort(); // L: 7283 - var4 = var1.method7971(); // L: 7284 - var5 = var1.method7789(); // L: 7285 - var6 = (var5 >> 4 & 7) + FriendSystem.field803; // L: 7286 - var7 = (var5 & 7) + class9.field34; // L: 7287 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7288 - var6 = var6 * 128 + 64; // L: 7289 - var7 = var7 * 128 + 64; // L: 7290 - GraphicsObject var33 = new GraphicsObject(var3, class160.Client_plane, var6, var7, Archive.getTileHeight(var6, var7, class160.Client_plane) - var2, var4, Client.cycle); // L: 7291 - Client.graphicsObjects.addFirst(var33); // L: 7292 - } - - } else if (class263.field3012 == var0) { // L: 7296 - var2 = var1.method7927(); // L: 7297 - var3 = (var2 >> 4 & 7) + FriendSystem.field803; // L: 7298 - var4 = (var2 & 7) + class9.field34; // L: 7299 - var5 = var1.method7927(); // L: 7300 - var6 = var5 >> 2; // L: 7301 - var7 = var5 & 3; // L: 7302 - var8 = Client.field711[var6]; // L: 7303 - var9 = var1.method7935(); // L: 7304 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7305 - class137.updatePendingSpawn(class160.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7306 - } - - } else if (class263.field3008 == var0) { // L: 7310 - var2 = var1.method7789(); // L: 7311 - var3 = (var2 >> 4 & 7) + FriendSystem.field803; // L: 7312 - var4 = (var2 & 7) + class9.field34; // L: 7313 - var5 = var1.method7935(); // L: 7314 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7315 - NodeDeque var31 = Client.groundItems[class160.Client_plane][var3][var4]; // L: 7316 - if (var31 != null) { // L: 7317 - for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7318 7319 7324 - if ((var5 & 32767) == var32.id) { // L: 7320 - var32.remove(); // L: 7321 - break; - } - } - - if (var31.last() == null) { // L: 7326 - Client.groundItems[class160.Client_plane][var3][var4] = null; - } - - class162.updateItemPile(var3, var4); // L: 7327 - } - } - - } - } - } - } // L: 7093 7106 7129 7175 7214 7294 7308 7330 7332 -} diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java deleted file mode 100644 index 154f38bdfe..0000000000 --- a/runescape-client/src/main/java/class229.java +++ /dev/null @@ -1,169 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ho") -public class class229 implements WorldMapSection { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -948885225 - ) - int field2736; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -593318449 - ) - int field2734; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2083366699 - ) - int field2733; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -187959117 - ) - int field2738; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -196184405 - ) - int field2737; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 726632117 - ) - int field2743; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1653715279 - ) - int field2739; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -759700891 - ) - int field2740; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1488339787 - ) - int field2741; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1323722061 - ) - int field2742; - - class229() { - } // L: 18 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lhw;I)V", - garbageValue = "-1521793701" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2737) { // L: 22 - var1.regionLowX = this.field2737; - } - - if (var1.regionHighX < this.field2737) { - var1.regionHighX = this.field2737; // L: 23 - } - - if (var1.regionLowY > this.field2743) { // L: 24 - var1.regionLowY = this.field2743; - } - - if (var1.regionHighY < this.field2743) { // L: 25 - var1.regionHighY = this.field2743; - } - - } // L: 26 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2091891709" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2736 && var1 < this.field2734 + this.field2736) { // L: 30 - return var2 >= (this.field2733 << 6) + (this.field2739 << 3) && var2 <= (this.field2733 << 6) + (this.field2739 << 3) + 7 && var3 >= (this.field2738 << 6) + (this.field2740 << 3) && var3 <= (this.field2738 << 6) + (this.field2740 << 3) + 7; // L: 33 - } else { - return false; // L: 31 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-59" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2737 << 6) + (this.field2741 << 3) && var1 <= (this.field2737 << 6) + (this.field2741 << 3) + 7 && var2 >= (this.field2743 << 6) + (this.field2742 << 3) && var2 <= (this.field2743 << 6) + (this.field2742 << 3) + 7; // L: 38 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-604533765" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 43 - return null; // L: 44 - } else { - int[] var4 = new int[]{var2 + (this.field2737 * 64 - this.field2733 * 64) + (this.field2741 * 8 - this.field2739 * 8), var3 + (this.field2743 * 64 - this.field2738 * 64) + (this.field2742 * 8 - this.field2740 * 8)}; // L: 46 47 48 - return var4; // L: 49 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)Lko;", - garbageValue = "-41254697" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 54 - return null; // L: 55 - } else { - int var3 = this.field2733 * 64 - this.field2737 * 64 + (this.field2739 * 8 - this.field2741 * 8) + var1; // L: 57 - int var4 = var2 + (this.field2738 * 64 - this.field2743 * 64) + (this.field2740 * 8 - this.field2742 * 8); // L: 58 - return new Coord(this.field2736, var3, var4); // L: 59 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lpd;B)V", - garbageValue = "119" - ) - @Export("read") - public void read(Buffer var1) { - this.field2736 = var1.readUnsignedByte(); // L: 64 - this.field2734 = var1.readUnsignedByte(); // L: 65 - this.field2733 = var1.readUnsignedShort(); // L: 66 - this.field2739 = var1.readUnsignedByte(); // L: 67 - this.field2738 = var1.readUnsignedShort(); // L: 68 - this.field2740 = var1.readUnsignedByte(); // L: 69 - this.field2737 = var1.readUnsignedShort(); // L: 70 - this.field2741 = var1.readUnsignedByte(); // L: 71 - this.field2743 = var1.readUnsignedShort(); // L: 72 - this.field2742 = var1.readUnsignedByte(); // L: 73 - this.method4870(); // L: 74 - } // L: 75 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "48" - ) - void method4870() { - } // L: 77 -} diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java deleted file mode 100644 index 3c755598ec..0000000000 --- a/runescape-client/src/main/java/class230.java +++ /dev/null @@ -1,74 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hq") -public class class230 { - @ObfuscatedName("ra") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("z") - @Export("userHomeDirectory") - public static String userHomeDirectory; - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Ljd;", - garbageValue = "-327946270" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field3127, ServerPacket.field3025, ServerPacket.field3026, ServerPacket.field3078, ServerPacket.field3028, ServerPacket.field3029, ServerPacket.field3060, ServerPacket.field3031, ServerPacket.field3058, ServerPacket.field3033, ServerPacket.field3034, ServerPacket.field3129, ServerPacket.field3036, ServerPacket.field3037, ServerPacket.field3038, ServerPacket.field3039, ServerPacket.field3040, ServerPacket.field3082, ServerPacket.field3042, ServerPacket.field3043, ServerPacket.field3044, ServerPacket.field3080, ServerPacket.field3046, ServerPacket.field3052, ServerPacket.field3104, ServerPacket.field3049, ServerPacket.field3050, ServerPacket.field3122, ServerPacket.field3102, ServerPacket.field3053, ServerPacket.field3054, ServerPacket.field3055, ServerPacket.field3041, ServerPacket.field3057, ServerPacket.field3110, ServerPacket.field3089, ServerPacket.field3093, ServerPacket.field3061, ServerPacket.field3062, ServerPacket.field3032, ServerPacket.field3064, ServerPacket.field3065, ServerPacket.field3066, ServerPacket.field3067, ServerPacket.field3068, ServerPacket.field3069, ServerPacket.field3098, ServerPacket.field3071, ServerPacket.field3072, ServerPacket.field3073, ServerPacket.field3074, ServerPacket.field3075, ServerPacket.field3076, ServerPacket.field3077, ServerPacket.field3116, ServerPacket.field3079, ServerPacket.field3047, ServerPacket.field3081, ServerPacket.field3024, ServerPacket.field3083, ServerPacket.field3084, ServerPacket.field3085, ServerPacket.field3051, ServerPacket.field3087, ServerPacket.field3088, ServerPacket.field3070, ServerPacket.field3117, ServerPacket.field3091, ServerPacket.field3092, ServerPacket.field3048, ServerPacket.field3094, ServerPacket.field3095, ServerPacket.field3096, ServerPacket.field3035, ServerPacket.field3114, ServerPacket.field3099, ServerPacket.field3030, ServerPacket.field3101, ServerPacket.field3124, ServerPacket.field3103, ServerPacket.field3126, ServerPacket.field3105, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3027, ServerPacket.field3045, ServerPacket.field3111, ServerPacket.field3112, ServerPacket.field3113, ServerPacket.field3125, ServerPacket.field3115, ServerPacket.field3100, ServerPacket.field3097, ServerPacket.field3118, ServerPacket.field3119, ServerPacket.field3120, ServerPacket.field3121, ServerPacket.field3059, ServerPacket.field3123, ServerPacket.field3086, ServerPacket.field3063, ServerPacket.field3109, ServerPacket.field3090}; // L: 113 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "82" - ) - static void method4894(boolean var0) { - byte var1 = 0; // L: 1288 - boolean var2 = Interpreter.clientPreferences.method2268() >= Client.field484; // L: 1291 - if (!var2) { // L: 1293 - var1 = 12; // L: 1294 - } else if (UserComparator10.client.method1138() || UserComparator10.client.method1139()) { // L: 1296 - var1 = 10; // L: 1297 - } - - class150.method3089(var1); // L: 1299 - if (var0) { // L: 1300 - Login.Login_username = ""; // L: 1301 - Login.Login_password = ""; // L: 1302 - UrlRequest.field1346 = 0; // L: 1303 - class452.otp = ""; // L: 1304 - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1307 - if (Interpreter.clientPreferences.method2273() != null) { // L: 1308 - Login.Login_username = Interpreter.clientPreferences.method2273(); // L: 1309 - Client.Login_isUsernameRemembered = true; // L: 1310 - } else { - Client.Login_isUsernameRemembered = false; // L: 1312 - } - } - - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1315 - Login.currentLoginField = 1; // L: 1316 - } else { - Login.currentLoginField = 0; // L: 1319 - } - - } // L: 1322 - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1546407580" - ) - static final boolean method4890() { - return Client.isMenuOpen; // L: 8028 - } -} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java new file mode 100644 index 0000000000..c717d4c49d --- /dev/null +++ b/runescape-client/src/main/java/class231.java @@ -0,0 +1,150 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hk") +public class class231 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "[Lda;" + ) + class115[] field2578; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 230124275 + ) + int field2577; + + @ObfuscatedSignature( + descriptor = "(Lpi;I)V" + ) + class231(Buffer var1, int var2) { + this.field2578 = new class115[var2]; // L: 13 + this.field2577 = var1.readUnsignedByte(); // L: 14 + + for (int var3 = 0; var3 < this.field2578.length; ++var3) { // L: 15 + class115 var4 = new class115(this.field2577, var1, false); // L: 16 + this.field2578[var3] = var4; // L: 17 + } + + this.method4697(); // L: 19 + } // L: 20 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-459048653" + ) + void method4697() { + class115[] var1 = this.field2578; // L: 24 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 + class115 var3 = var1[var2]; // L: 26 + if (var3.field1395 >= 0) { // L: 28 + var3.field1388 = this.field2578[var3.field1395]; // L: 29 + } + } + + } // L: 34 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "139338744" + ) + public int method4698() { + return this.field2578.length; // L: 37 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Lda;", + garbageValue = "-1090806170" + ) + class115 method4718(int var1) { + return this.field2578[var1]; // L: 41 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lda;", + garbageValue = "856290899" + ) + class115[] method4700() { + return this.field2578; // L: 45 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ldo;II)V", + garbageValue = "-821248386" + ) + void method4717(class122 var1, int var2) { + this.method4701(var1, var2, (boolean[])null, false); // L: 49 + } // L: 50 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ldo;I[ZZI)V", + garbageValue = "-1783408058" + ) + void method4701(class122 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method2766(); // L: 53 + int var6 = 0; // L: 54 + class115[] var7 = this.method4700(); // L: 56 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 + class115 var9 = var7[var8]; // L: 58 + if (var3 == null || var4 == var3[var6]) { // L: 60 + var1.method2796(var2, var9, var6, var5); // L: 61 + } + + ++var6; // L: 63 + } + + } // L: 67 + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(Lky;I)V", + garbageValue = "640671653" + ) + static final void method4712(Widget var0) { + int var1 = var0.contentType; // L: 12098 + if (var1 == 324) { // L: 12099 + if (Client.field561 == -1) { // L: 12100 + Client.field561 = var0.spriteId2; // L: 12101 + Client.field775 = var0.spriteId; // L: 12102 + } + + if (Client.playerAppearance.isFemale) { // L: 12104 + var0.spriteId2 = Client.field561; + } else { + var0.spriteId2 = Client.field775; // L: 12105 + } + + } else if (var1 == 325) { // L: 12108 + if (Client.field561 == -1) { // L: 12109 + Client.field561 = var0.spriteId2; // L: 12110 + Client.field775 = var0.spriteId; // L: 12111 + } + + if (Client.playerAppearance.isFemale) { // L: 12113 + var0.spriteId2 = Client.field775; + } else { + var0.spriteId2 = Client.field561; // L: 12114 + } + + } else if (var1 == 327) { // L: 12117 + var0.modelAngleX = 150; // L: 12118 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12119 + var0.modelType = 5; // L: 12120 + var0.modelId = 0; // L: 12121 + } else if (var1 == 328) { // L: 12124 + var0.modelAngleX = 150; // L: 12125 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12126 + var0.modelType = 5; // L: 12127 + var0.modelId = 1; // L: 12128 + } + } // L: 12106 12115 12122 12129 12131 +} diff --git a/runescape-client/src/main/java/class239.java b/runescape-client/src/main/java/class239.java deleted file mode 100644 index 0b61b09a25..0000000000 --- a/runescape-client/src/main/java/class239.java +++ /dev/null @@ -1,94 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ia") -public class class239 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lia;" - ) - static final class239 field2823; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lia;" - ) - static final class239 field2819; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lmr;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1289934013 - ) - @Export("value") - final int value; - - static { - field2823 = new class239(0); // L: 4 - field2819 = new class239(1); // L: 5 - } - - class239(int var1) { - this.value = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1230087081" - ) - public static boolean method4998(int var0) { - return (var0 >> 29 & 1) != 0; // L: 33 - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1849384967" - ) - static int method4999(int var0, Script var1, boolean var2) { - if (var0 == 7100) { // L: 4592 - ++class295.Interpreter_intStackSize; // L: 4593 - return 1; // L: 4594 - } else if (var0 == 7101) { // L: 4596 - ChatChannel.Interpreter_stringStackSize += 2; // L: 4597 - return 1; // L: 4598 - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4600 - if (var0 == 7106) { // L: 4604 - ++class295.Interpreter_intStackSize; // L: 4605 - return 1; // L: 4606 - } else if (var0 == 7107) { // L: 4608 - ++class295.Interpreter_intStackSize; // L: 4609 - return 1; // L: 4610 - } else if (var0 == 7108) { // L: 4612 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.method4890() ? 1 : 0; // L: 4613 - return 1; // L: 4614 - } else if (var0 == 7110) { // L: 4616 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4617 - return 1; // L: 4618 - } else if (var0 == 7120) { // L: 4620 - --class295.Interpreter_intStackSize; // L: 4621 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4622 - return 1; // L: 4623 - } else if (var0 == 7121) { // L: 4625 - class295.Interpreter_intStackSize -= 2; // L: 4626 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4627 - return 1; // L: 4628 - } else if (var0 == 7122) { // L: 4630 - class295.Interpreter_intStackSize -= 2; // L: 4631 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4632 - return 1; // L: 4633 - } else { - return 2; // L: 4635 - } - } else { - ++class295.Interpreter_intStackSize; // L: 4601 - return 1; // L: 4602 - } - } -} diff --git a/runescape-client/src/main/java/class241.java b/runescape-client/src/main/java/class241.java deleted file mode 100644 index 8d0fc8de4a..0000000000 --- a/runescape-client/src/main/java/class241.java +++ /dev/null @@ -1,42 +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; - -@ObfuscatedName("im") -public class class241 { - @ObfuscatedName("at") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("cx") - @ObfuscatedGetter( - intValue = -1201083065 - ) - public static int field2833; - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1771880111" - ) - static final void method5001(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); // L: 114 - Login.addGameMessage(30, "", var1); // L: 116 - } // L: 118 - - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "(Lgg;IIIB)V", - garbageValue = "-2" - ) - static void method5002(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Interpreter.clientPreferences.method2286() != 0) { // L: 3309 - if (var0.field2170 != null && var0.field2170.containsKey(var1)) { // L: 3310 - HealthBarUpdate.method2210((Integer)var0.field2170.get(var1), var2, var3); // L: 3311 - } - } - } // L: 3312 -} diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index c5edfbcaec..7069773125 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iy") +@ObfuscatedName("ib") public interface class249 extends class251 { } diff --git a/runescape-client/src/main/java/class250.java b/runescape-client/src/main/java/class250.java index ef4fc3742a..63e67ba456 100644 --- a/runescape-client/src/main/java/class250.java +++ b/runescape-client/src/main/java/class250.java @@ -1,40 +1,30 @@ -import java.util.Date; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("ir") public abstract class class250 implements class252 { - @ObfuscatedName("hf") - @ObfuscatedGetter( - intValue = 416925267 - ) - @Export("baseY") - static int baseY; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 309984325 + intValue = 65197793 ) protected int field2872; @ObfuscatedSignature( - descriptor = "(Lkh;Llp;I)V" + descriptor = "(Lkt;Llo;I)V" ) protected class250(StudioGame var1, Language var2, int var3) { this.field2872 = var3; // L: 10 } // L: 11 - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/Date;", - garbageValue = "1347336152" + descriptor = "(IB)V", + garbageValue = "-86" ) - static Date method5137() { - java.util.Calendar var0 = java.util.Calendar.getInstance(); // L: 1251 - var0.set(2, 0); // L: 1252 - var0.set(5, 1); // L: 1253 - var0.set(1, 1900); // L: 1254 - return var0.getTime(); // L: 1255 - } + static void method5112(int var0) { + class356.field4185 = var0; // L: 21 + class387.field4346 = new class387[var0]; // L: 22 + class387.field4347 = 0; // L: 23 + } // L: 24 } diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java index c7905433b7..7d9edbd278 100644 --- a/runescape-client/src/main/java/class251.java +++ b/runescape-client/src/main/java/class251.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ip") +@ObfuscatedName("iu") public interface class251 { } diff --git a/runescape-client/src/main/java/class252.java b/runescape-client/src/main/java/class252.java index f77d07a1ca..5f96ae2b0e 100644 --- a/runescape-client/src/main/java/class252.java +++ b/runescape-client/src/main/java/class252.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("if") +@ObfuscatedName("is") public interface class252 extends Iterable { } diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java index 95d67a9de8..109277d78a 100644 --- a/runescape-client/src/main/java/class253.java +++ b/runescape-client/src/main/java/class253.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ih") +@ObfuscatedName("ii") public interface class253 { @ObfuscatedName("v") - void method5139(Object var1); + void method5114(Object var1); } diff --git a/runescape-client/src/main/java/class259.java b/runescape-client/src/main/java/class259.java new file mode 100644 index 0000000000..2d596b67c7 --- /dev/null +++ b/runescape-client/src/main/java/class259.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ih") +public class class259 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + static IndexedSprite field2887; +} diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index 303da9b0f9..0c7aea7137 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,25 +1,50 @@ -import java.security.SecureRandom; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jc") public class class260 { - @ObfuscatedName("k") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("cs") - static boolean field2888; - @ObfuscatedName("fp") - @Export("secureRandom") - static SecureRandom secureRandom; - - @ObfuscatedName("o") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-537168296" + descriptor = "Lnm;" ) - public static int method5203(int var0) { - return class271.field3160[var0]; // L: 35 - } + static Bounds field2892; + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lln;II)V", + garbageValue = "-921893463" + ) + static void method5174(AbstractArchive var0, int var1) { + if ((var1 & 536870912) != 0) { // L: 288 + Decimator.logoSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 289 + } else if ((var1 & 1073741824) != 0) { // L: 291 + Decimator.logoSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 292 + } else { + Decimator.logoSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 295 + } + + } // L: 297 + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1779965800" + ) + static final void method5173() { + Client.field618 = 0; // L: 5389 + int var0 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 5390 + int var1 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 5391 + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5392 + Client.field618 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5393 + Client.field618 = 1; + } + + if (Client.field618 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5394 + Client.field618 = 0; + } + + } // L: 5395 } diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java index 0b071d2913..3f378c0c7b 100644 --- a/runescape-client/src/main/java/class261.java +++ b/runescape-client/src/main/java/class261.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("jq") +@ObfuscatedName("jm") public interface class261 { } diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java index 2346c7c6ec..26b4a0c81b 100644 --- a/runescape-client/src/main/java/class263.java +++ b/runescape-client/src/main/java/class263.java @@ -2,70 +2,76 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jp") public class class263 { + @ObfuscatedName("ut") + @ObfuscatedSignature( + descriptor = "Loj;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lji;" - ) - public static final class263 field3010; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - public static final class263 field3004; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - public static final class263 field3005; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) public static final class263 field3006; - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) - public static final class263 field3007; - @ObfuscatedName("n") + public static final class263 field3005; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) - public static final class263 field3008; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - public static final class263 field3009; + public static final class263 field3015; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) - public static final class263 field3013; - @ObfuscatedName("u") + public static final class263 field3007; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" + ) + public static final class263 field3008; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + public static final class263 field3009; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + public static final class263 field3004; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ljp;" ) public static final class263 field3011; - @ObfuscatedName("r") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) public static final class263 field3012; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + public static final class263 field3013; static { - field3010 = new class263(5); // L: 5 - field3004 = new class263(4); // L: 6 - field3005 = new class263(6); // L: 7 - field3006 = new class263(7); // L: 8 - field3007 = new class263(5); // L: 9 - field3008 = new class263(3); // L: 10 - field3009 = new class263(14); // L: 11 - field3013 = new class263(15); // L: 12 - field3011 = new class263(2); // L: 13 - field3012 = new class263(4); // L: 14 + field3006 = new class263(5); // L: 5 + field3005 = new class263(4); // L: 6 + field3015 = new class263(6); // L: 7 + field3007 = new class263(7); // L: 8 + field3008 = new class263(5); // L: 9 + field3009 = new class263(3); // L: 10 + field3004 = new class263(14); // L: 11 + field3011 = new class263(15); // L: 12 + field3012 = new class263(2); // L: 13 + field3013 = new class263(4); // L: 14 } @ObfuscatedSignature( @@ -75,41 +81,68 @@ public class class263 { class263(int var1) { } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-374274388" + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "-1248696661" ) - public static int method5208(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 39 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 40 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 41 - var0 += var0 >>> 8; // L: 42 - var0 += var0 >>> 16; // L: 43 - return var0 & 255; // L: 44 - } + static int method5178(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 75 + boolean var3 = false; // L: 76 + boolean var4 = false; // L: 77 + int var5 = 0; // L: 78 + int var6 = var0.length(); // L: 79 - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(ILko;ZI)V", - garbageValue = "-28231882" - ) - static void method5204(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = StudioGame.getWorldMap().getMapArea(var0); // L: 4737 - int var4 = class19.localPlayer.plane; // L: 4738 - int var5 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 4739 - int var6 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 4740 - Coord var7 = new Coord(var4, var5, var6); // L: 4741 - StudioGame.getWorldMap().method7319(var3, var7, var1, var2); // L: 4742 - } // L: 4743 + for (int var7 = 0; var7 < var6; ++var7) { // L: 80 + char var8 = var0.charAt(var7); // L: 81 + if (var7 == 0) { // L: 82 + if (var8 == '-') { // L: 83 + var3 = true; // L: 84 + continue; + } - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "(Lkn;I)Z", - garbageValue = "314452552" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 11803 + if (var8 == '+') { // L: 87 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 89 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 90 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 91 + throw new NumberFormatException(); // L: 92 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 93 + throw new NumberFormatException(); + } + + if (var3) { // L: 94 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 95 + if (var9 / var1 != var5) { // L: 96 + throw new NumberFormatException(); + } + + var5 = var9; // L: 97 + var4 = true; // L: 98 + } + + if (!var4) { // L: 100 + throw new NumberFormatException(); + } else { + return var5; // L: 101 + } + } else { + throw new IllegalArgumentException("" + var1); + } } } diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java index 94b555eb80..14ef4b2c08 100644 --- a/runescape-client/src/main/java/class267.java +++ b/runescape-client/src/main/java/class267.java @@ -1,13 +1,15 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jo") public class class267 { - @ObfuscatedName("gh") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "(II)V", + garbageValue = "1622399610" ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; + static void method5196(int var0) { + Ignored.method6828(14); // L: 1839 + Login.field901 = var0; // L: 1840 + } // L: 1841 } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index ba19344147..539dc432a2 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,300 +1,688 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("jj") +@ObfuscatedName("jr") public final class class268 { - @ObfuscatedName("h") - static final HashMap field3146; - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "[Lqx;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("i") + static final HashMap field3142; static { - field3146 = new HashMap(); // L: 11 - TimeZone var0; - synchronized(field3146) { - TimeZone var2 = (TimeZone)field3146.get("Europe/London"); // L: 17 - if (var2 == null) { // L: 18 - var2 = TimeZone.getTimeZone("Europe/London"); // L: 19 - field3146.put("Europe/London", var2); // L: 20 - } - - var0 = var2; // L: 22 - } - - java.util.Calendar.getInstance(var0); - } + field3142 = new HashMap(); // L: 10 + java.util.Calendar.getInstance(method5197("Europe/London")); // L: 13 + } // L: 14 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;I)V", - garbageValue = "2063025013" + descriptor = "(Ljava/lang/String;I)Ljava/util/TimeZone;", + garbageValue = "-1547649433" ) - public static void method5226(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; // L: 15 - } // L: 16 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lfh;", - garbageValue = "-1220321256" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = JagexCache.EnumDefinition_archive.takeFile(8, var0); // L: 27 - var1 = new EnumComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); + static TimeZone method5197(String var0) { + synchronized(field3142) { // L: 21 + TimeZone var2 = (TimeZone)field3142.get(var0); // L: 22 + if (var2 == null) { // L: 23 + var2 = TimeZone.getTimeZone(var0); // L: 24 + field3142.put(var0, var2); // L: 25 } - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 - return var1; // L: 31 + return var2; // L: 27 } } - @ObfuscatedName("o") + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "(Lpd;II)V", - garbageValue = "628991025" + descriptor = "(III)V", + garbageValue = "1355418320" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 123 - var2.size = var0.readUnsignedByte(); // L: 124 - var2.id = var0.readInt(); // L: 125 - var2.operations = new int[var2.size]; // L: 126 - var2.creationErrors = new int[var2.size]; // L: 127 - var2.fields = new Field[var2.size]; // L: 128 - var2.intReplaceValues = new int[var2.size]; // L: 129 - var2.methods = new Method[var2.size]; // L: 130 - var2.arguments = new byte[var2.size][][]; // L: 131 + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2952, Client.packetWriter.isaacCipher); // L: 9681 + var2.packetBuffer.writeIntME(var0); // L: 9682 + var2.packetBuffer.method7710(var1); // L: 9683 + Client.packetWriter.addNode(var2); // L: 9684 + } // L: 9685 - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 132 - try { - int var4 = var0.readUnsignedByte(); // L: 134 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 135 - if (var4 == 3 || var4 == 4) { // L: 145 - var5 = var0.readStringCp1252NullTerminated(); // L: 146 - var6 = var0.readStringCp1252NullTerminated(); // L: 147 - var7 = var0.readUnsignedByte(); // L: 148 - String[] var8 = new String[var7]; // L: 149 + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "([Lky;IIIIIIIIB)V", + garbageValue = "-98" + ) + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10231 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10232 - for (int var9 = 0; var9 < var7; ++var9) { // L: 150 - var8[var9] = var0.readStringCp1252NullTerminated(); + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10233 + Widget var10 = var0[var9]; // L: 10234 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10235 10236 + int var11; + if (var8 == -1) { // L: 10238 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10239 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10240 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10241 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10242 + var11 = ++Client.rootWidgetCount - 1; // L: 10243 + } else { + var11 = var8; // L: 10245 + } + + var10.rootIndex = var11; // L: 10246 + var10.cycle = Client.cycle; // L: 10247 + if (!var10.isIf3 || !class1.isComponentHidden(var10)) { // L: 10248 + if (var10.contentType > 0) { // L: 10249 + class231.method4712(var10); + } + + int var12 = var10.x + var6; // L: 10250 + int var13 = var7 + var10.y; // L: 10251 + int var14 = var10.transparencyTop; // L: 10252 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 10253 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10254 + class307.field3585 = var0; // L: 10255 + class93.field1252 = var6; // L: 10256 + ItemContainer.field1013 = var7; // L: 10257 + continue; // L: 10258 } - String var20 = var0.readStringCp1252NullTerminated(); // L: 151 - byte[][] var10 = new byte[var7][]; // L: 152 - int var12; - if (var4 == 3) { // L: 153 - for (int var11 = 0; var11 < var7; ++var11) { // L: 154 - var12 = var0.readInt(); // L: 155 - var10[var11] = new byte[var12]; // L: 156 - var0.readBytes(var10[var11], 0, var12); // L: 157 + if (Client.isDraggingWidget && Client.field696) { // L: 10260 + var15 = MouseHandler.MouseHandler_x; // L: 10261 + var16 = MouseHandler.MouseHandler_y; // L: 10262 + var15 -= Client.widgetClickX; // L: 10263 + var16 -= Client.widgetClickY; // L: 10264 + if (var15 < Client.field773) { // L: 10265 + var15 = Client.field773; + } + + if (var15 + var10.width > Client.field773 + Client.clickedWidgetParent.width) { // L: 10266 + var15 = Client.field773 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field686) { // L: 10267 + var16 = Client.field686; + } + + if (var16 + var10.height > Client.field686 + Client.clickedWidgetParent.height) { // L: 10268 + var16 = Client.field686 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 10269 + var13 = var16; // L: 10270 + } + + if (!var10.isScrollBar) { // L: 10272 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 10278 + var15 = var2; // L: 10279 + var16 = var3; // L: 10280 + var17 = var4; // L: 10281 + var18 = var5; // L: 10282 + } else if (var10.type == 9) { // L: 10284 + var19 = var12; // L: 10285 + var20 = var13; // L: 10286 + var21 = var12 + var10.width; // L: 10287 + var22 = var13 + var10.height; // L: 10288 + if (var21 < var12) { // L: 10289 + var19 = var21; // L: 10291 + var21 = var12; // L: 10292 + } + + if (var22 < var13) { // L: 10294 + var20 = var22; // L: 10296 + var22 = var13; // L: 10297 + } + + ++var21; // L: 10299 + ++var22; // L: 10300 + var15 = var19 > var2 ? var19 : var2; // L: 10301 + var16 = var20 > var3 ? var20 : var3; // L: 10302 + var17 = var21 < var4 ? var21 : var4; // L: 10303 + var18 = var22 < var5 ? var22 : var5; // L: 10304 + } else { + var19 = var12 + var10.width; // L: 10307 + var20 = var13 + var10.height; // L: 10308 + var15 = var12 > var2 ? var12 : var2; // L: 10309 + var16 = var13 > var3 ? var13 : var3; // L: 10310 + var17 = var19 < var4 ? var19 : var4; // L: 10311 + var18 = var20 < var5 ? var20 : var5; // L: 10312 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10314 + if (var10.contentType != 0) { // L: 10315 + if (var10.contentType == 1336) { // L: 10316 + if (class131.clientPreferences.method2236()) { // L: 10317 + var13 += 15; // L: 10318 + class13.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10319 + var13 += 15; // L: 10320 + Runtime var42 = Runtime.getRuntime(); // L: 10321 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10322 + var21 = 16776960; // L: 10323 + if (var20 > 327680 && !Client.isLowDetail) { // L: 10324 + var21 = 16711680; + } + + class13.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10325 + var13 += 15; // L: 10326 + } + continue; + } + + if (var10.contentType == 1337) { // L: 10330 + Client.viewportX = var12; // L: 10331 + Client.viewportY = var13; // L: 10332 + SequenceDefinition.drawEntities(var12, var13, var10.width, var10.height); // L: 10333 + Client.field715[var10.rootIndex] = true; // L: 10334 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10335 + continue; // L: 10336 + } + + if (var10.contentType == 1338) { // L: 10338 + ArchiveDiskActionHandler.drawMinimap(var10, var12, var13, var11); // L: 10339 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10340 + continue; // L: 10341 + } + + if (var10.contentType == 1339) { // L: 10343 + PacketWriter.drawCompass(var10, var12, var13, var11); // L: 10344 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10345 + continue; // L: 10346 + } + + if (var10.contentType == 1400) { // L: 10348 + ScriptFrame.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10349 + } + + if (var10.contentType == 1401) { // L: 10351 + ScriptFrame.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10352 + } + + if (var10.contentType == 1402) { // L: 10354 + class341.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10355 } } - var2.operations[var3] = var4; // L: 160 - Class[] var21 = new Class[var7]; // L: 161 + if (var10.type == 0) { // L: 10358 + if (!var10.isIf3 && class1.isComponentHidden(var10) && var10 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 10359 + continue; + } - for (var12 = 0; var12 < var7; ++var12) { // L: 162 - var21[var12] = class359.loadClassFromDescriptor(var8[var12]); + if (!var10.isIf3) { // L: 10360 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10361 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 10362 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10364 + if (var10.children != null) { // L: 10365 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 10366 + if (var30 != null) { // L: 10367 + class131.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10368 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10370 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10371 + } else if (var10.type == 11) { // L: 10373 + if (class1.isComponentHidden(var10) && var10 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 10374 + continue; + } + + if (var10.children != null) { // L: 10375 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10376 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10377 } - Class var22 = class359.loadClassFromDescriptor(var20); // L: 163 - if (class359.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 164 - throw new SecurityException(); - } + if (Client.isResizable || Client.field717[var11] || Client.gameDrawingMode > 1) { // L: 10379 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10380 10381 + SoundSystem.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } - Method[] var13 = class359.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 165 - Method[] var14 = var13; // L: 167 + if (var10.type != 1) { // L: 10383 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 10386 + var19 = 0; // L: 10387 - for (int var15 = 0; var15 < var14.length; ++var15) { // L: 168 - Method var16 = var14[var15]; // L: 169 - if (Reflection.getMethodName(var16).equals(var6)) { // L: 171 - Class[] var17 = Reflection.getParameterTypes(var16); // L: 172 - if (var21.length == var17.length) { // L: 173 - boolean var18 = true; // L: 174 + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10388 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10389 + var22 = var21 * (var10.paddingX + 32) + var12; // L: 10390 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 10391 + if (var19 < 20) { // L: 10392 + var22 += var10.inventoryXOffsets[var19]; // L: 10393 + var23 += var10.inventoryYOffsets[var19]; // L: 10394 + } - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 175 - if (var21[var19] != var17[var19]) { // L: 176 - var18 = false; // L: 177 - break; // L: 178 + if (var10.itemIds[var19] <= 0) { // L: 10396 + if (var10.inventorySprites != null && var19 < 20) { // L: 10441 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 10442 + if (var46 != null) { // L: 10443 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field3411) { // L: 10444 + class346.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 10397 + boolean var38 = false; // L: 10398 + var26 = var10.itemIds[var19] - 1; // L: 10399 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class142.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10400 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == class432.selectedItemSlot && var10.id == TaskHandler.selectedItemWidget) { // L: 10402 + var35 = class135.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = class135.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10403 + } + + if (var35 != null) { // L: 10404 + if (var10 == class142.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10405 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10406 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10407 + if (var24 < 5 && var24 > -5) { // L: 10408 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 10409 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 10410 + var24 = 0; // L: 10411 + var25 = 0; // L: 10412 + } + + var35.drawTransAt(var24 + var22, var23 + var25, 128); // L: 10414 + if (var1 != -1) { // L: 10415 + Widget var28 = var0[var1 & 65535]; // L: 10416 + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10417 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field556 / 3; // L: 10418 + if (var29 > Client.field556 * 10) { // L: 10419 + var29 = Client.field556 * 10; + } + + if (var29 > var28.scrollY) { // L: 10420 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 10421 + Client.draggedWidgetY += var29; // L: 10422 + class346.invalidateWidget(var28); // L: 10423 + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10425 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field556 / 3; // L: 10426 + if (var29 > Client.field556 * 10) { // L: 10427 + var29 = Client.field556 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10428 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 10429 + Client.draggedWidgetY -= var29; // L: 10430 + class346.invalidateWidget(var28); // L: 10431 + } + } + } else if (var10 == GrandExchangeOfferAgeComparator.field4011 && var19 == Client.field611) { // L: 10435 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 10436 + } + } else { + class346.invalidateWidget(var10); // L: 10438 + } + } + } + + ++var19; // L: 10446 + } + } + } else if (var10.type == 3) { // L: 10451 + if (Skills.runCs1(var10)) { // L: 10453 + var19 = var10.color2; // L: 10454 + if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10455 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 10458 + if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10459 + var19 = var10.mouseOverColor; } } - if (var18 && var22 == var16.getReturnType()) { // L: 181 - var2.methods[var3] = var16; // L: 182 + if (var10.fill) { // L: 10461 + switch(var10.fillMode.field4699) { // L: 10462 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10471 + break; // L: 10472 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10464 + break; // L: 10465 + default: + if (var14 == 0) { // L: 10467 + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10468 + } + } + } else if (var14 == 0) { // L: 10476 + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10477 + } + } else { + Font var39; + if (var10.type == 4) { // L: 10481 + var39 = var10.getFont(); // L: 10482 + if (var39 == null) { // L: 10483 + if (Widget.field3411) { // L: 10484 + class346.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 10488 + if (Skills.runCs1(var10)) { // L: 10489 + var20 = var10.color2; // L: 10490 + if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10491 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 10492 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 10495 + if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10496 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 10498 + ItemComposition var45 = class19.ItemDefinition_get(var10.itemId); // L: 10499 + var44 = var45.name; // L: 10500 + if (var44 == null) { // L: 10501 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10502 + var44 = UserComparator9.colorStartTag(16748608) + var44 + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 10504 + var44 = "Please wait..."; // L: 10505 + var20 = var10.color; // L: 10506 + } + + if (!var10.isIf3) { // L: 10508 + var44 = class431.method7592(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10509 + } + } else if (var10.type == 5) { // L: 10512 + SpritePixels var40; + if (!var10.isIf3) { // L: 10513 + var40 = var10.getSprite(Skills.runCs1(var10), VerticalAlignment.urlRequester); // L: 10514 + if (var40 != null) { // L: 10515 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field3411) { // L: 10516 + class346.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 10520 + var40 = class135.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false, VerticalAlignment.urlRequester); // L: 10521 + } + + if (var40 == null) { // L: 10522 + if (Widget.field3411) { // L: 10546 + class346.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 10523 + var21 = var40.height; // L: 10524 + if (!var10.spriteTiling) { // L: 10525 + var22 = var10.width * 4096 / var20; // L: 10539 + if (var10.spriteAngle != 0) { // L: 10540 + var40.method8106(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 10541 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 10542 + var40.drawTransBgAt(var12, var13); // L: 10543 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10526 + var22 = (var20 - 1 + var10.width) / var20; // L: 10527 + var23 = (var21 - 1 + var10.height) / var21; // L: 10528 + + for (var24 = 0; var24 < var22; ++var24) { // L: 10529 + for (var25 = 0; var25 < var23; ++var25) { // L: 10530 + if (var10.spriteAngle != 0) { // L: 10531 + var40.method8106(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 10532 + var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); // L: 10533 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10536 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 10550 + boolean var36 = Skills.runCs1(var10); // L: 10551 + if (var36) { // L: 10553 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 10554 + } + + Model var41 = null; // L: 10555 + var22 = 0; // L: 10556 + if (var10.itemId != -1) { // L: 10557 + var33 = class19.ItemDefinition_get(var10.itemId); // L: 10558 + if (var33 != null) { // L: 10559 + var33 = var33.getCountObj(var10.itemQuantity); // L: 10560 + var41 = var33.getModel(1); // L: 10561 + if (var41 != null) { // L: 10562 + var41.calculateBoundsCylinder(); // L: 10563 + var22 = var41.height / 2; // L: 10564 + } else { + class346.invalidateWidget(var10); // L: 10566 + } + } + } else if (var10.modelType == 5) { // L: 10569 + if (var10.modelId == 0) { // L: 10570 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = GrandExchangeEvents.localPlayer.getModel(); // L: 10571 + } + } else if (var20 == -1) { // L: 10573 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, GrandExchangeEvents.localPlayer.appearance); // L: 10574 + if (var41 == null && Widget.field3411) { // L: 10575 + class346.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = class163.SequenceDefinition_get(var20); // L: 10578 + var41 = var10.getModel(var47, var10.modelFrame, var36, GrandExchangeEvents.localPlayer.appearance); // L: 10579 + if (var41 == null && Widget.field3411) { // L: 10580 + class346.invalidateWidget(var10); + } + } + + Rasterizer3D.method4631(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10582 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10583 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10584 + if (var41 != null) { // L: 10585 + if (!var10.isIf3) { // L: 10586 + var41.method5003(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 10588 + if (var10.modelOrthog) { // L: 10589 + var41.method5050(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method5003(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10590 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 10593 + } else { + if (var10.type == 7) { // L: 10596 + var39 = var10.getFont(); // L: 10597 + if (var39 == null) { // L: 10598 + if (Widget.field3411) { // L: 10599 + class346.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 10602 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10603 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10604 + if (var10.itemIds[var20] > 0) { // L: 10605 + var33 = class19.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10606 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10608 + var34 = UserComparator9.colorStartTag(16748608) + var33.name + ""; // L: 10609 + } else { + var34 = UserComparator9.colorStartTag(16748608) + var33.name + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var22 * (var10.paddingX + 115) + var12; // L: 10610 + var26 = var21 * (var10.paddingY + 12) + var13; // L: 10611 + if (var10.textXAlignment == 0) { // L: 10612 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 10613 + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 10614 + } + } + + ++var20; // L: 10616 + } + } + } + + if (var10.type == 8 && var10 == GrandExchangeOfferOwnWorldComparator.field486 && Client.field657 == Client.field656) { // L: 10620 10621 + var19 = 0; // L: 10622 + var20 = 0; // L: 10623 + Font var31 = class13.fontPlain12; // L: 10624 + String var32 = var10.text; // L: 10625 + + String var43; + for (var32 = class431.method7592(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10627 10628 10640 + var24 = var32.indexOf("
"); // L: 10629 + if (var24 != -1) { // L: 10630 + var43 = var32.substring(0, var24); // L: 10631 + var32 = var32.substring(var24 + 4); // L: 10632 + } else { + var43 = var32; // L: 10635 + var32 = ""; // L: 10636 + } + + var25 = var31.stringWidth(var43); // L: 10638 + if (var25 > var19) { // L: 10639 + var19 = var25; + } + } + + var19 += 6; // L: 10642 + var20 += 7; // L: 10643 + var24 = var12 + var10.width - 5 - var19; // L: 10644 + var25 = var13 + var10.height + 5; // L: 10645 + if (var24 < var12 + 5) { // L: 10646 + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { // L: 10647 + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { // L: 10648 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10649 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10650 + var32 = var10.text; // L: 10651 + var26 = var25 + var31.ascent + 2; // L: 10652 + + for (var32 = class431.method7592(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10653 10654 10665 + int var27 = var32.indexOf("
"); // L: 10655 + if (var27 != -1) { // L: 10656 + var43 = var32.substring(0, var27); // L: 10657 + var32 = var32.substring(var27 + 4); // L: 10658 + } else { + var43 = var32; // L: 10661 + var32 = ""; // L: 10662 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10664 + } + } + + if (var10.type == 9) { // L: 10669 + if (var10.field3369) { // L: 10674 + var19 = var12; // L: 10675 + var20 = var13 + var10.height; // L: 10676 + var21 = var12 + var10.width; // L: 10677 + var22 = var13; // L: 10678 + } else { + var19 = var12; // L: 10681 + var20 = var13; // L: 10682 + var21 = var12 + var10.width; // L: 10683 + var22 = var13 + var10.height; // L: 10684 + } + + if (var10.lineWid == 1) { // L: 10686 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10687 + } else { + class9.method74(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10690 + } + } + } } } } } - - var2.arguments[var3] = var10; // L: 189 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 136 - var6 = var0.readStringCp1252NullTerminated(); // L: 137 - var7 = 0; // L: 138 - if (var4 == 1) { // L: 139 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 140 - var2.intReplaceValues[var3] = var7; // L: 141 - if (class359.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 142 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class359.loadClassFromDescriptor(var5), var6); // L: 143 - } - } catch (ClassNotFoundException var24) { // L: 192 - var2.creationErrors[var3] = -1; // L: 193 - } catch (SecurityException var25) { // L: 195 - var2.creationErrors[var3] = -2; // L: 196 - } catch (NullPointerException var26) { // L: 198 - var2.creationErrors[var3] = -3; // L: 199 - } catch (Exception var27) { // L: 201 - var2.creationErrors[var3] = -4; // L: 202 - } catch (Throwable var28) { // L: 204 - var2.creationErrors[var3] = -5; // L: 205 - } - } - - class33.reflectionChecks.addFirst(var2); // L: 208 - } // L: 209 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1384641723" - ) - static void method5232(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 67 - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 68 - int var5 = 0; // L: 69 - if (var1 > var4.maxX) { // L: 70 - var5 += var1 - var4.maxX; - } else if (var1 < var4.x) { // L: 71 - var5 += var4.x - var1; - } - - if (var2 > var4.maxY) { // L: 72 - var5 += var2 - var4.maxY; - } else if (var2 < var4.y) { // L: 73 - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field813 && Interpreter.clientPreferences.method2286() != 0 && var0 == var4.plane) { // L: 74 - var5 -= 64; // L: 85 - if (var5 < 0) { // L: 86 - var5 = 0; - } - - int var6 = (var4.field813 - var5) * Interpreter.clientPreferences.method2286() / var4.field813; // L: 87 - if (var4.stream1 == null) { // L: 88 - if (var4.soundEffectId >= 0) { // L: 89 - SoundEffect var7 = SoundEffect.readSoundEffect(MouseHandler.archive4, var4.soundEffectId, 0); // L: 90 - if (var7 != null) { // L: 91 - RawSound var8 = var7.toRawSound().resample(LoginScreenAnimation.decimator); // L: 92 - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 93 - var9.setNumLoops(-1); // L: 94 - WorldMapIcon_1.pcmStreamMixer.addSubStream(var9); // L: 95 - var4.stream1 = var9; // L: 96 - } - } - } else { - var4.stream1.method818(var6); // L: 100 - } - - if (var4.stream2 == null) { // L: 101 - if (var4.soundEffectIds != null && (var4.field821 -= var3) <= 0) { // L: 102 - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 103 - SoundEffect var12 = SoundEffect.readSoundEffect(MouseHandler.archive4, var4.soundEffectIds[var11], 0); // L: 104 - if (var12 != null) { // L: 105 - RawSound var13 = var12.toRawSound().resample(LoginScreenAnimation.decimator); // L: 106 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 107 - var10.setNumLoops(0); // L: 108 - WorldMapIcon_1.pcmStreamMixer.addSubStream(var10); // L: 109 - var4.stream2 = var10; // L: 110 - var4.field821 = var4.field809 + (int)(Math.random() * (double)(var4.field819 - var4.field809)); // L: 111 - } - } - } else { - var4.stream2.method818(var6); // L: 116 - if (!var4.stream2.hasNext()) { // L: 117 - var4.stream2 = null; // L: 118 - } - } - } else { - if (var4.stream1 != null) { // L: 75 - WorldMapIcon_1.pcmStreamMixer.removeSubStream(var4.stream1); // L: 76 - var4.stream1 = null; // L: 77 - } - - if (var4.stream2 != null) { // L: 79 - WorldMapIcon_1.pcmStreamMixer.removeSubStream(var4.stream2); // L: 80 - var4.stream2 = null; // L: 81 } } } } - } // L: 122 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-597064413" - ) - public static boolean method5227(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field121[var0] : false; // L: 225 226 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lkn;IIII)V", - garbageValue = "1150273936" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3424 == null) { // L: 1012 - throw new RuntimeException(); // L: 1013 - } else { - var0.field3424[var1] = var2; // L: 1015 - var0.field3425[var1] = var3; // L: 1016 - } - } // L: 1017 - - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-112" - ) - static void method5228() { - Client.menuOptionsCount = 0; // L: 8014 - Client.isMenuOpen = false; // L: 8015 - } // L: 8016 + } // L: 10695 } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java index 22dc27b267..193a279275 100644 --- a/runescape-client/src/main/java/class269.java +++ b/runescape-client/src/main/java/class269.java @@ -1,16 +1,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("jg") +@ObfuscatedName("jz") public final class class269 { @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 212091698585310863L + longValue = 99828989158930681L ) - static long field3153; - @ObfuscatedName("o") + static long field3149; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 1432513117854904977L + longValue = -6438905473157114757L ) - static long field3154; + static long field3147; } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 89cb20abd0..cb86dec848 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -3,23 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("ax") +@ObfuscatedName("aq") public class class27 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1181474421" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", + garbageValue = "353327457" ) - public static void method416(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); // L: 13 - } // L: 14 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1991172823" - ) - public static Object method412(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); // L: 17 + public static Object method383(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 13 } } diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java index 62784abd7e..9fc4ea9376 100644 --- a/runescape-client/src/main/java/class270.java +++ b/runescape-client/src/main/java/class270.java @@ -1,14 +1,44 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("jf") public class class270 { - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "799160649" + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "-20" ) - public static int method5241(int var0) { - return var0 >> 17 & 7; // L: 21 + public static String method5206(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); + } else { + byte var5 = class327.charToByteCp1252(var4); // L: 18 + var2.append('%'); // L: 19 + int var6 = var5 >> 4 & 15; // L: 20 + if (var6 >= 10) { // L: 21 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 22 + } + + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); // L: 25 + } + } + + return var2.toString(); // L: 28 } } diff --git a/runescape-client/src/main/java/class271.java b/runescape-client/src/main/java/class271.java index a365466c91..fa6caf22ec 100644 --- a/runescape-client/src/main/java/class271.java +++ b/runescape-client/src/main/java/class271.java @@ -1,394 +1,115 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ja") +@ObfuscatedName("jw") public class class271 { @ObfuscatedName("v") - static int[] field3160; + static int[] field3155; + @ObfuscatedName("b") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; static { new Object(); - field3160 = new int[33]; // L: 8 - field3160[0] = 0; // L: 11 + field3155 = new int[33]; // L: 8 + field3155[0] = 0; // L: 11 int var0 = 2; // L: 12 for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field3160[var1] = var0 - 1; // L: 14 + field3155[var1] = var0 - 1; // L: 14 var0 += var0; // L: 15 } } // L: 17 - @ObfuscatedName("n") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Llq;Ljava/lang/String;Ljava/lang/String;I)[Lqx;", - garbageValue = "925731085" + descriptor = "(ILbd;ZB)I", + garbageValue = "27" ) - public static IndexedSprite[] method5255(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 76 - int var4 = var0.getFileId(var3, var2); // L: 77 - return WallDecoration.method4516(var0, var3, var4); // L: 78 + static int method5220(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1410 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1411 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1412 + return 1; // L: 1413 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1415 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1416 + if (var3.itemId != -1) { // L: 1417 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1418 + } + + return 1; // L: 1419 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1421 + int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1422 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1423 + if (var4 != null) { // L: 1424 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1425 + } + + return 1; // L: 1426 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1428 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1429 + return 1; // L: 1430 + } else if (var0 == 1707) { // L: 1432 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1433 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method5690() ? 1 : 0; // L: 1434 + return 1; // L: 1435 + } else if (var0 == 1708) { // L: 1437 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1438 + return UserComparator9.method2617(var3); // L: 1439 + } else if (var0 == 1708) { // L: 1441 + var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1442 + return class305.method5782(var3); // L: 1443 + } else { + return 2; // L: 1445 + } } - @ObfuscatedName("ay") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-1269940605" + descriptor = "(ILbd;ZI)I", + garbageValue = "1452863306" ) - static int method5256(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341 - if (class155.friendSystem.field801 == 0) { // L: 2342 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -2; - } else if (class155.friendSystem.field801 == 1) { // L: 2343 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; + static int method5221(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4484 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4489 + if (var0 == 6750) { // L: 4493 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4494 + return 1; // L: 4495 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4497 + if (var0 == 6754) { // L: 4501 + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4502 + NPCComposition var4 = KeyHandler.getNpcDefinition(var3); // L: 4503 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4504 + return 1; // L: 4505 + } else { + return 2; // L: 4507 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4498 + return 1; // L: 4499 + } } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.friendsList.getSize(); // L: 2344 + --Interpreter.Interpreter_intStackSize; // L: 4490 + return 1; // L: 4491 } - - return 1; // L: 2345 } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2348 - if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.friendsList.getSize()) { // L: 2349 - Friend var8 = (Friend)class155.friendSystem.friendsList.get(var3); // L: 2350 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2355 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2356 - } - - return 1; // L: 2358 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2361 - if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.friendsList.getSize()) { // L: 2362 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class155.friendSystem.friendsList.get(var3)).world; // L: 2363 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2365 - } - - return 1; // L: 2366 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2369 - if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.friendsList.getSize()) { // L: 2370 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class155.friendSystem.friendsList.get(var3)).rank; // L: 2371 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2373 - } - - return 1; // L: 2374 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2377 - int var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2378 - DynamicObject.method1985(var5, var6); // L: 2379 - return 1; // L: 2380 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2383 - class155.friendSystem.addFriend(var5); // L: 2384 - return 1; // L: 2385 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2388 - class155.friendSystem.removeFriend(var5); // L: 2389 - return 1; // L: 2390 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2393 - class155.friendSystem.addIgnore(var5); // L: 2394 - return 1; // L: 2395 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2398 - class155.friendSystem.removeIgnore(var5); // L: 2399 - return 1; // L: 2400 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2403 - var5 = ObjectSound.method1734(var5); // L: 2404 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.isFriended(new Username(var5, class83.loginType), false) ? 1 : 0; // L: 2405 - return 1; // L: 2406 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (class230.friendsChat != null) { // L: 2409 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class230.friendsChat.name; // L: 2410 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2412 - } - - return 1; // L: 2413 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (class230.friendsChat != null) { // L: 2416 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.friendsChat.getSize(); // L: 2417 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2419 - } - - return 1; // L: 2420 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2423 - if (class230.friendsChat != null && var3 < class230.friendsChat.getSize()) { // L: 2424 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class230.friendsChat.get(var3).getUsername().getName(); // L: 2425 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2427 - } - - return 1; // L: 2428 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2431 - if (class230.friendsChat != null && var3 < class230.friendsChat.getSize()) { // L: 2432 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class230.friendsChat.get(var3)).getWorld(); // L: 2433 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2435 - } - - return 1; // L: 2436 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2439 - if (class230.friendsChat != null && var3 < class230.friendsChat.getSize()) { // L: 2440 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class230.friendsChat.get(var3)).rank; // L: 2441 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2443 - } - - return 1; // L: 2444 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.friendsChat != null ? class230.friendsChat.minKick : 0; // L: 2447 - return 1; // L: 2448 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2451 - class10.clanKickUser(var5); // L: 2452 - return 1; // L: 2453 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.friendsChat != null ? class230.friendsChat.rank * 1904728549 * -272778259 : 0; // L: 2456 - return 1; // L: 2457 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2460 - class16.Clan_joinChat(var5); // L: 2461 - return 1; // L: 2462 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - Message.Clan_leaveChat(); // L: 2465 - return 1; // L: 2466 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!class155.friendSystem.method1657()) { // L: 2469 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.ignoreList.getSize(); // L: 2470 - } - - return 1; // L: 2471 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2474 - if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.ignoreList.getSize()) { // L: 2475 - Ignored var4 = (Ignored)class155.friendSystem.ignoreList.get(var3); // L: 2476 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2481 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2482 - } - - return 1; // L: 2484 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2487 - var5 = ObjectSound.method1734(var5); // L: 2488 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.isIgnored(new Username(var5, class83.loginType)) ? 1 : 0; // L: 2489 - return 1; // L: 2490 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2493 - if (class230.friendsChat != null && var3 < class230.friendsChat.getSize() && class230.friendsChat.get(var3).getUsername().equals(class19.localPlayer.username)) { // L: 2494 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2495 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2497 - } - - return 1; // L: 2498 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (class230.friendsChat != null && class230.friendsChat.owner != null) { // L: 2501 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class230.friendsChat.owner; // L: 2502 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2504 - } - - return 1; // L: 2505 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2508 - if (class230.friendsChat != null && var3 < class230.friendsChat.getSize() && ((ClanMate)class230.friendsChat.get(var3)).isFriend()) { // L: 2509 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2510 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2512 - } - - return 1; // L: 2513 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - class155.friendSystem.friendsList.removeComparator(); // L: 2524 - return 1; // L: 2525 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2528 - class155.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529 - return 1; // L: 2530 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2533 - class155.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534 - return 1; // L: 2535 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2538 - class155.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539 - return 1; // L: 2540 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2543 - class155.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544 - return 1; // L: 2545 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2548 - class155.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549 - return 1; // L: 2550 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2553 - class155.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554 - return 1; // L: 2555 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2558 - class155.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559 - return 1; // L: 2560 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2563 - class155.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564 - return 1; // L: 2565 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2568 - class155.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569 - return 1; // L: 2570 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2573 - class155.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574 - return 1; // L: 2575 - } else if (var0 == 3639) { - class155.friendSystem.friendsList.sort(); // L: 2578 - return 1; // L: 2579 - } else if (var0 == 3640) { - class155.friendSystem.ignoreList.removeComparator(); // L: 2582 - return 1; // L: 2583 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2586 - class155.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587 - return 1; // L: 2588 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2591 - class155.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592 - return 1; // L: 2593 - } else if (var0 == 3643) { - class155.friendSystem.ignoreList.sort(); // L: 2596 - return 1; // L: 2597 - } else if (var0 == 3644) { - if (class230.friendsChat != null) { // L: 2600 - class230.friendsChat.removeComparator(); // L: 2601 - } - - return 1; // L: 2603 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2606 - if (class230.friendsChat != null) { // L: 2607 - class230.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608 - } - - return 1; // L: 2610 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2613 - if (class230.friendsChat != null) { // L: 2614 - class230.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615 - } - - return 1; // L: 2617 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2620 - if (class230.friendsChat != null) { // L: 2621 - class230.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622 - } - - return 1; // L: 2624 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2627 - if (class230.friendsChat != null) { // L: 2628 - class230.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629 - } - - return 1; // L: 2631 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2634 - if (class230.friendsChat != null) { // L: 2635 - class230.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636 - } - - return 1; // L: 2638 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2641 - if (class230.friendsChat != null) { // L: 2642 - class230.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643 - } - - return 1; // L: 2645 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2648 - if (class230.friendsChat != null) { // L: 2649 - class230.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650 - } - - return 1; // L: 2652 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2655 - if (class230.friendsChat != null) { // L: 2656 - class230.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657 - } - - return 1; // L: 2659 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2662 - if (class230.friendsChat != null) { // L: 2663 - class230.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664 - } - - return 1; // L: 2666 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2669 - if (class230.friendsChat != null) { // L: 2670 - class230.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671 - } - - return 1; // L: 2673 - } else if (var0 == 3655) { - if (class230.friendsChat != null) { // L: 2676 - class230.friendsChat.sort(); // L: 2677 - } - - return 1; // L: 2679 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2682 - class155.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683 - return 1; // L: 2684 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2687 - if (class230.friendsChat != null) { // L: 2688 - class230.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689 - } - - return 1; // L: 2691 - } else { - return 2; // L: 2693 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2516 - if (class230.friendsChat != null && var3 < class230.friendsChat.getSize() && ((ClanMate)class230.friendsChat.get(var3)).isIgnored()) { // L: 2517 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2518 - } else { - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2520 - } - - return 1; // L: 2521 - } - } + Interpreter.Interpreter_intStackSize -= 2; // L: 4485 + --class122.Interpreter_stringStackSize; // L: 4486 + return 1; // L: 4487 } } } diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java index 8e66fe3ce6..ce64ff7971 100644 --- a/runescape-client/src/main/java/class273.java +++ b/runescape-client/src/main/java/class273.java @@ -3,112 +3,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jj") public class class273 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("musicSamplesArchive") public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("l") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1842086067 + intValue = -1398711083 ) @Export("musicPlayerStatus") public static int musicPlayerStatus; - @ObfuscatedName("f") + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1619549501 + intValue = -164167737 ) @Export("musicTrackFileId") public static int musicTrackFileId; - @ObfuscatedName("r") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 317324399 + intValue = -1426022031 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1631991279 ) @Export("pcmSampleLength") public static int pcmSampleLength; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("musicTrack") - static MusicTrack musicTrack; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lan;" - ) - @Export("soundCache") - static SoundCache soundCache; static { musicPlayerStatus = 0; // L: 11 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "2006366579" - ) - public static String method5271(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { // L: 12 - return ""; - } else if (var2 == 1) { // L: 13 - CharSequence var10 = var0[var1]; // L: 14 - return var10 == null ? "null" : var10.toString(); // L: 15 16 - } else { - int var3 = var2 + var1; // L: 18 - int var4 = 0; // L: 19 - - for (int var5 = var1; var5 < var3; ++var5) { // L: 20 - CharSequence var9 = var0[var5]; // L: 21 - if (var9 == null) { // L: 22 - var4 += 4; - } else { - var4 += var9.length(); // L: 23 - } - } - - StringBuilder var8 = new StringBuilder(var4); // L: 25 - - for (int var6 = var1; var6 < var3; ++var6) { // L: 26 - CharSequence var7 = var0[var6]; // L: 27 - if (var7 == null) { // L: 28 - var8.append("null"); - } else { - var8.append(var7); // L: 29 - } - } - - return var8.toString(); // L: 31 - } - } - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1687746978" - ) - static boolean method5267(int var0) { - for (int var1 = 0; var1 < Client.field713; ++var1) { // L: 11107 - if (Client.field568[var1] == var0) { // L: 11108 - return true; - } - } - - return false; // L: 11110 - } } diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index 4c63c84c66..55d3996f4d 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,29 +1,61 @@ +import java.io.File; import javax.imageio.ImageIO; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("aw") public class class28 { + @ObfuscatedName("f") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive15") + static Archive archive15; + static { ImageIO.setUseCache(false); // L: 12 } // L: 13 - @ObfuscatedName("o") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "(IIIB)Lql;", - garbageValue = "16" + descriptor = "(I)V", + garbageValue = "1511751941" ) - static SpritePixels method423(int var0, int var1, int var2) { - return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(class65.method1867(var0, var1, var2)); // L: 42 - } + static final void method390() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7719 7720 7726 + if (var0.hitpoints == -1) { // L: 7721 + var0.delay = 0; // L: 7722 + class163.method3315(var0); // L: 7723 + } else { + var0.remove(); // L: 7725 + } + } - @ObfuscatedName("ke") + } // L: 7728 + + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-229308626" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "157439460" ) - static final void method424(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11382 - Interpreter.clientPreferences.updateSoundEffectVolume(var0); // L: 11383 - } // L: 11384 + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9830 + if (Client.menuOptionsCount < 500) { // L: 9831 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9832 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9833 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9834 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9835 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9836 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9837 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9838 + ++Client.menuOptionsCount; // L: 9839 + } + + } + } // L: 9841 } diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java index 5c4d812d6b..e0cabf3cee 100644 --- a/runescape-client/src/main/java/class282.java +++ b/runescape-client/src/main/java/class282.java @@ -2,18 +2,95 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("jg") public class class282 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljx;" ) @Export("huffman") - static Huffman huffman; - @ObfuscatedName("o") + public static Huffman huffman; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) - @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; + static AbstractArchive field3261; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpi;Ljava/lang/String;I)I", + garbageValue = "-825643804" + ) + public static int method5489(Buffer var0, String var1) { + int var2 = var0.offset; // L: 14 + int var4 = var1.length(); // L: 17 + byte[] var5 = new byte[var4]; // L: 18 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 19 + char var7 = var1.charAt(var6); // L: 20 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 21 + var5[var6] = (byte)var7; + } else if (var7 == 8364) { // L: 22 + var5[var6] = -128; + } else if (var7 == 8218) { // L: 23 + var5[var6] = -126; + } else if (var7 == 402) { // L: 24 + var5[var6] = -125; + } else if (var7 == 8222) { // L: 25 + var5[var6] = -124; + } else if (var7 == 8230) { // L: 26 + var5[var6] = -123; + } else if (var7 == 8224) { // L: 27 + var5[var6] = -122; + } else if (var7 == 8225) { // L: 28 + var5[var6] = -121; + } else if (var7 == 710) { // L: 29 + var5[var6] = -120; + } else if (var7 == 8240) { // L: 30 + var5[var6] = -119; + } else if (var7 == 352) { // L: 31 + var5[var6] = -118; + } else if (var7 == 8249) { // L: 32 + var5[var6] = -117; + } else if (var7 == 338) { // L: 33 + var5[var6] = -116; + } else if (var7 == 381) { // L: 34 + var5[var6] = -114; + } else if (var7 == 8216) { // L: 35 + var5[var6] = -111; + } else if (var7 == 8217) { // L: 36 + var5[var6] = -110; + } else if (var7 == 8220) { // L: 37 + var5[var6] = -109; + } else if (var7 == 8221) { // L: 38 + var5[var6] = -108; + } else if (var7 == 8226) { // L: 39 + var5[var6] = -107; + } else if (var7 == 8211) { + var5[var6] = -106; // L: 40 + } else if (var7 == 8212) { // L: 41 + var5[var6] = -105; + } else if (var7 == 732) { // L: 42 + var5[var6] = -104; + } else if (var7 == 8482) { // L: 43 + var5[var6] = -103; + } else if (var7 == 353) { // L: 44 + var5[var6] = -102; + } else if (var7 == 8250) { // L: 45 + var5[var6] = -101; + } else if (var7 == 339) { // L: 46 + var5[var6] = -100; + } else if (var7 == 382) { // L: 47 + var5[var6] = -98; + } else if (var7 == 376) { // L: 48 + var5[var6] = -97; + } else { + var5[var6] = 63; // L: 49 + } + } + + var0.writeSmartByteShort(var5.length); // L: 54 + var0.offset += huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 55 + return var0.offset - var2; // L: 56 + } } diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index a922f21a57..64d349aa77 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -1,106 +1,11 @@ -import java.io.IOException; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("kn") public class class286 { - @ObfuscatedName("ak") - static String field3281; - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1152795" + @ObfuscatedName("sj") + @ObfuscatedGetter( + intValue = -604088997 ) - static final void method5548(boolean var0) { - MouseHandler.playPcmPlayers(); // L: 5254 - ++Client.packetWriter.pendingWrites; // L: 5255 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5256 - Client.packetWriter.pendingWrites = 0; // L: 5257 - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5258 - PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2950, Client.packetWriter.isaacCipher); // L: 5260 - Client.packetWriter.addNode(var1); // L: 5261 - - try { - Client.packetWriter.flush(); // L: 5263 - } catch (IOException var3) { // L: 5265 - Client.hadNetworkError = true; // L: 5266 - } - } - - } - } // L: 5269 - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - static final void method5549() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7393 7394 7437 - if (var0.hitpoints > 0) { // L: 7395 - --var0.hitpoints; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.hitpoints == 0) { // L: 7396 - if (var0.objectId >= 0) { // L: 7398 - var2 = var0.objectId; // L: 7400 - var3 = var0.field1119; // L: 7401 - var4 = class116.getObjectDefinition(var2); // L: 7403 - if (var3 == 11) { // L: 7404 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 7405 - var3 = 4; - } - - var1 = var4.method3651(var3); // L: 7406 - if (!var1) { // L: 7408 - continue; - } - } - - DirectByteArrayCopier.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1117, var0.field1119); // L: 7410 - var0.remove(); // L: 7411 - } else { - if (var0.delay > 0) { // L: 7415 - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7416 - if (var0.id >= 0) { // L: 7418 - var2 = var0.id; // L: 7420 - var3 = var0.field1122; // L: 7421 - var4 = class116.getObjectDefinition(var2); // L: 7423 - if (var3 == 11) { // L: 7424 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 7425 - var3 = 4; - } - - var1 = var4.method3651(var3); // L: 7426 - if (!var1) { // L: 7428 - continue; - } - } - - DirectByteArrayCopier.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1122); // L: 7430 - var0.delay = -1; // L: 7431 - if (var0.objectId == var0.id && var0.objectId == -1) { // L: 7432 - var0.remove(); - } else if (var0.objectId == var0.id && var0.orientation == var0.field1117 && var0.field1122 == var0.field1119) { // L: 7433 - var0.remove(); - } - } - } - } - - } // L: 7439 + static int field3274; } diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index 4c13715485..df16fcce1f 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -1,241 +1,171 @@ import java.applet.Applet; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("am") public class class29 { @ObfuscatedName("v") - public static Applet field168; - @ObfuscatedName("o") - public static String field169; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "[Lqx;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("ee") + static Applet field176; + @ObfuscatedName("c") + static String field175; + @ObfuscatedName("ha") @ObfuscatedGetter( - longValue = -3391706969016340745L + intValue = 1188608561 ) - static long field165; + static int field181; + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "[Lqq;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; static { - field168 = null; // L: 10 - field169 = ""; // L: 11 + field176 = null; // L: 10 + field175 = ""; // L: 11 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BS)Lql;", - garbageValue = "-13194" + descriptor = "(IILgt;Lgv;B)Z", + garbageValue = "0" ) - public static final SpritePixels method433(byte[] var0) { - BufferedImage var1 = null; // L: 20 + public static final boolean method404(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 19 + int var5 = var1; // L: 20 + byte var6 = 64; // L: 21 + byte var7 = 64; // L: 22 + int var8 = var0 - var6; // L: 23 + int var9 = var1 - var7; // L: 24 + class194.directions[var6][var7] = 99; // L: 25 + class194.distances[var6][var7] = 0; // L: 26 + byte var10 = 0; // L: 27 + int var11 = 0; // L: 28 + class194.bufferX[var10] = var0; // L: 29 + byte var10001 = var10; + int var18 = var10 + 1; + class194.bufferY[var10001] = var1; // L: 30 + int[][] var12 = var3.flags; // L: 31 - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 - int var2 = var1.getWidth(); // L: 23 - int var3 = var1.getHeight(); // L: 24 - int[] var4 = new int[var3 * var2]; // L: 25 - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 - var5.grabPixels(); // L: 27 - return new SpritePixels(var4, var2, var3); // L: 28 - } catch (IOException var7) { // L: 30 - } catch (InterruptedException var8) { // L: 31 + while (var18 != var11) { // L: 34 + var4 = class194.bufferX[var11]; // L: 35 + var5 = class194.bufferY[var11]; // L: 36 + var11 = var11 + 1 & 4095; // L: 37 + int var16 = var4 - var8; // L: 38 + int var17 = var5 - var9; // L: 39 + int var13 = var4 - var3.xInset; // L: 40 + int var14 = var5 - var3.yInset; // L: 41 + if (var2.hasArrived(1, var4, var5, var3)) { // L: 42 + HealthBarUpdate.field1189 = var4; // L: 43 + StructComposition.field1988 = var5; // L: 44 + return true; // L: 45 + } + + int var15 = class194.distances[var16][var17] + 1; // L: 47 + if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48 + class194.bufferX[var18] = var4 - 1; // L: 49 + class194.bufferY[var18] = var5; // L: 50 + var18 = var18 + 1 & 4095; // L: 51 + class194.directions[var16 - 1][var17] = 2; // L: 52 + class194.distances[var16 - 1][var17] = var15; // L: 53 + } + + if (var16 < 127 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55 + class194.bufferX[var18] = var4 + 1; // L: 56 + class194.bufferY[var18] = var5; // L: 57 + var18 = var18 + 1 & 4095; // L: 58 + class194.directions[var16 + 1][var17] = 8; // L: 59 + class194.distances[var16 + 1][var17] = var15; // L: 60 + } + + if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62 + class194.bufferX[var18] = var4; // L: 63 + class194.bufferY[var18] = var5 - 1; // L: 64 + var18 = var18 + 1 & 4095; // L: 65 + class194.directions[var16][var17 - 1] = 1; // L: 66 + class194.distances[var16][var17 - 1] = var15; // L: 67 + } + + if (var17 < 127 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69 + class194.bufferX[var18] = var4; // L: 70 + class194.bufferY[var18] = var5 + 1; // L: 71 + var18 = var18 + 1 & 4095; // L: 72 + class194.directions[var16][var17 + 1] = 4; // L: 73 + class194.distances[var16][var17 + 1] = var15; // L: 74 + } + + if (var16 > 0 && var17 > 0 && class194.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) { // L: 76 + class194.bufferX[var18] = var4 - 1; // L: 77 + class194.bufferY[var18] = var5 - 1; // L: 78 + var18 = var18 + 1 & 4095; // L: 79 + class194.directions[var16 - 1][var17 - 1] = 3; // L: 80 + class194.distances[var16 - 1][var17 - 1] = var15; // L: 81 + } + + if (var16 < 127 && var17 > 0 && class194.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) { // L: 83 + class194.bufferX[var18] = var4 + 1; // L: 84 + class194.bufferY[var18] = var5 - 1; // L: 85 + var18 = var18 + 1 & 4095; // L: 86 + class194.directions[var16 + 1][var17 - 1] = 9; // L: 87 + class194.distances[var16 + 1][var17 - 1] = var15; // L: 88 + } + + if (var16 > 0 && var17 < 127 && class194.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) { // L: 90 + class194.bufferX[var18] = var4 - 1; // L: 91 + class194.bufferY[var18] = var5 + 1; // L: 92 + var18 = var18 + 1 & 4095; // L: 93 + class194.directions[var16 - 1][var17 + 1] = 6; // L: 94 + class194.distances[var16 - 1][var17 + 1] = var15; // L: 95 + } + + if (var16 < 127 && var17 < 127 && class194.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) { // L: 97 + class194.bufferX[var18] = var4 + 1; // L: 98 + class194.bufferY[var18] = var5 + 1; // L: 99 + var18 = var18 + 1 & 4095; // L: 100 + class194.directions[var16 + 1][var17 + 1] = 12; // L: 101 + class194.distances[var16 + 1][var17 + 1] = var15; // L: 102 + } } - return new SpritePixels(0, 0); // L: 32 + HealthBarUpdate.field1189 = var4; // L: 105 + StructComposition.field1988 = var5; // L: 106 + return false; // L: 107 } - @ObfuscatedName("v") + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "717512947" + descriptor = "(IB)V", + garbageValue = "28" ) - public static File method431(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - AccessFile.JagexCache_locationFile = new File(class230.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; // L: 43 - boolean var6 = false; - File var22; - if (AccessFile.JagexCache_locationFile.exists()) { - try { - AccessFile var7 = new AccessFile(AccessFile.JagexCache_locationFile, "rw", 10000L); + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (class155.loadInterface(var0)) { // L: 11925 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11926 - Buffer var8; - int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 50 - 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); // L: 57 - } - - int var10 = 0; - if (var9 > 1) { - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { - var4 = var8.readStringCp1252NullCircumfixed(); - if (var10 == 1) { - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESU8(); - if (var10 == 1) { - var5 = var8.readCESU8(); - } - } - - var7.close(); - } catch (IOException var20) { - var20.printStackTrace(); // L: 71 - } - - if (var4 != null) { // L: 73 - var22 = new File(var4); - if (!var22.exists()) { // L: 75 - var4 = null; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11927 + Widget var3 = var1[var2]; // L: 11928 + if (var3 != null) { // L: 11929 + var3.modelFrame = 0; // L: 11930 + var3.modelFrameCycle = 0; // L: 11931 } } - if (var4 != null) { // L: 79 - var22 = new File(var4, "test.dat"); // L: 80 - if (!SecureRandomCallable.method2069(var22, true)) { // L: 81 - var4 = null; // L: 82 - } - } } + } // L: 11933 - if (var4 == null && var2 == 0) { // L: 86 - label125: - for (int var15 = 0; var15 < WorldMapSection1.cacheSubPaths.length; ++var15) { // L: 87 - for (int var16 = 0; var16 < PendingSpawn.cacheParentPaths.length; ++var16) { // L: 88 - File var17 = new File(PendingSpawn.cacheParentPaths[var16] + WorldMapSection1.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 89 - if (var17.exists() && SecureRandomCallable.method2069(new File(var17, "test.dat"), true)) { // L: 90 91 - var4 = var17.toString(); // L: 92 - var6 = true; // L: 93 - break label125; // L: 94 - } - } - } - } - - if (var4 == null) { // L: 100 - var4 = class230.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 101 - var6 = true; // L: 102 - } - - if (var5 != null) { // L: 104 - File var21 = new File(var5); // L: 105 - var22 = new File(var4); // L: 106 - - try { - File[] var23 = var21.listFiles(); // L: 108 - File[] var18 = var23; // L: 110 - - for (int var11 = 0; var11 < var18.length; ++var11) { // L: 111 - File var12 = var18[var11]; // L: 112 - File var13 = new File(var22, var12.getName()); // L: 114 - boolean var14 = var12.renameTo(var13); // L: 115 - if (!var14) { // L: 116 - throw new IOException(); - } - } - } catch (Exception var19) { // L: 121 - var19.printStackTrace(); // L: 122 - } - - var6 = true; // L: 124 - } - - if (var6) { // L: 126 - ViewportMouse.method4493(new File(var4), (File)null); - } - - return new File(var4); // L: 127 - } - - @ObfuscatedName("v") + @ObfuscatedName("lc") @ObfuscatedSignature( - descriptor = "([BI)Ljava/lang/String;", - garbageValue = "2046831505" + descriptor = "(II)V", + garbageValue = "-1249255220" ) - public static String method425(byte[] var0) { - int var2 = var0.length; - StringBuilder var3 = new StringBuilder(); // L: 61 - - for (int var4 = 0; var4 < var2 + 0; var4 += 3) { // L: 62 - int var5 = var0[var4] & 255; // L: 63 - var3.append(class346.field4147[var5 >>> 2]); // L: 64 - if (var4 < var2 - 1) { // L: 65 - int var6 = var0[var4 + 1] & 255; // L: 66 - var3.append(class346.field4147[(var5 & 3) << 4 | var6 >>> 4]); // L: 67 - if (var4 < var2 - 2) { // L: 68 - int var7 = var0[var4 + 2] & 255; // L: 69 - var3.append(class346.field4147[(var6 & 15) << 2 | var7 >>> 6]).append(class346.field4147[var7 & 63]); // L: 70 - } else { - var3.append(class346.field4147[(var6 & 15) << 2]).append("="); // L: 72 - } - } else { - var3.append(class346.field4147[(var5 & 3) << 4]).append("=="); // L: 74 + static void method403(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 12449 + if ((long)var0 == (var1.key >> 48 & 65535L)) { // L: 12450 + var1.remove(); // L: 12451 } } - String var1 = var3.toString(); // L: 76 - return var1; // L: 78 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1353852155" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 - if (var4 == null) { // L: 40 - var4 = new ItemContainer(); // L: 41 - ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 - } - - if (var4.ids.length <= var1) { // L: 44 - int[] var5 = new int[var1 + 1]; // L: 45 - int[] var6 = new int[var1 + 1]; // L: 46 - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 - var5[var7] = var4.ids[var7]; // L: 48 - var6[var7] = var4.quantities[var7]; // L: 49 - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 - var5[var7] = -1; // L: 52 - var6[var7] = 0; // L: 53 - } - - var4.ids = var5; // L: 55 - var4.quantities = var6; // L: 56 - } - - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + } // L: 12454 } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java index f321def9d0..b5d0a5ea44 100644 --- a/runescape-client/src/main/java/class290.java +++ b/runescape-client/src/main/java/class290.java @@ -1,240 +1,47 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("kj") public class class290 { - @ObfuscatedName("sx") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lao;" + descriptor = "(Ljava/lang/Float;Ljava/lang/Float;B)V", + garbageValue = "-14" ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; + static void method5558(Float var0, Float var1) { + var1 = 1.0F - var1; // L: 311 + if (var0 < 0.0F) { // L: 312 + var0 = 0.0F; + } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIILge;Lgf;I)Z", - garbageValue = "-1850220919" - ) - static final boolean method5577(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; // L: 315 - int var6 = var1; // L: 316 - byte var7 = 64; // L: 317 - byte var8 = 64; // L: 318 - int var9 = var0 - var7; // L: 319 - int var10 = var1 - var8; // L: 320 - class194.directions[var7][var8] = 99; // L: 321 - class194.distances[var7][var8] = 0; // L: 322 - byte var11 = 0; // L: 323 - int var12 = 0; // L: 324 - class194.bufferX[var11] = var0; // L: 325 - int var20 = var11 + 1; - class194.bufferY[var11] = var1; // L: 326 - int[][] var13 = var4.flags; // L: 327 + if (var1 < 0.0F) { // L: 313 + var1 = 0.0F; + } - while (true) { - label311: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label288: - do { - if (var12 == var20) { // L: 328 - VarpDefinition.field1819 = var5; // L: 447 - class194.field2202 = var6; // L: 448 - return false; // L: 449 - } - - var5 = class194.bufferX[var12]; // L: 329 - var6 = class194.bufferY[var12]; // L: 330 - var12 = var12 + 1 & 4095; // L: 331 - var18 = var5 - var9; // L: 332 - var19 = var6 - var10; // L: 333 - var14 = var5 - var4.xInset; // L: 334 - var15 = var6 - var4.yInset; // L: 335 - if (var3.hasArrived(var2, var5, var6, var4)) { // L: 336 - VarpDefinition.field1819 = var5; // L: 337 - class194.field2202 = var6; // L: 338 - return true; // L: 339 - } - - var16 = class194.distances[var18][var19] + 1; // L: 341 - if (var18 > 0 && class194.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 342 343 344 345 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class194.bufferX[var20] = var5 - 1; // L: 349 - class194.bufferY[var20] = var6; // L: 350 - var20 = var20 + 1 & 4095; // L: 351 - class194.directions[var18 - 1][var19] = 2; // L: 352 - class194.distances[var18 - 1][var19] = var16; // L: 353 - break; - } - - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 347 - break; - } - - ++var17; // L: 346 - } - } - - if (var18 < 128 - var2 && class194.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 355 356 357 358 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class194.bufferX[var20] = var5 + 1; // L: 362 - class194.bufferY[var20] = var6; // L: 363 - var20 = var20 + 1 & 4095; // L: 364 - class194.directions[var18 + 1][var19] = 8; // L: 365 - class194.distances[var18 + 1][var19] = var16; // L: 366 - break; - } - - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 360 - break; - } - - ++var17; // L: 359 - } - } - - if (var19 > 0 && class194.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 368 369 370 371 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class194.bufferX[var20] = var5; // L: 375 - class194.bufferY[var20] = var6 - 1; // L: 376 - var20 = var20 + 1 & 4095; // L: 377 - class194.directions[var18][var19 - 1] = 1; // L: 378 - class194.distances[var18][var19 - 1] = var16; // L: 379 - break; - } - - if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 373 - break; - } - - ++var17; // L: 372 - } - } - - if (var19 < 128 - var2 && class194.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 381 382 383 384 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class194.bufferX[var20] = var5; // L: 388 - class194.bufferY[var20] = var6 + 1; // L: 389 - var20 = var20 + 1 & 4095; // L: 390 - class194.directions[var18][var19 + 1] = 4; // L: 391 - class194.distances[var18][var19 + 1] = var16; // L: 392 - break; - } - - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { // L: 386 - break; - } - - ++var17; // L: 385 - } - } - - if (var18 > 0 && var19 > 0 && class194.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 394 395 396 - var17 = 1; - - while (true) { - if (var17 >= var2) { - class194.bufferX[var20] = var5 - 1; // L: 401 - class194.bufferY[var20] = var6 - 1; // L: 402 - var20 = var20 + 1 & 4095; // L: 403 - class194.directions[var18 - 1][var19 - 1] = 3; // L: 404 - class194.distances[var18 - 1][var19 - 1] = var16; // L: 405 - break; - } - - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 398 399 - break; - } - - ++var17; // L: 397 - } - } - - if (var18 < 128 - var2 && var19 > 0 && class194.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 407 408 409 - var17 = 1; - - while (true) { - if (var17 >= var2) { - class194.bufferX[var20] = var5 + 1; // L: 414 - class194.bufferY[var20] = var6 - 1; // L: 415 - var20 = var20 + 1 & 4095; // L: 416 - class194.directions[var18 + 1][var19 - 1] = 9; // L: 417 - class194.distances[var18 + 1][var19 - 1] = var16; // L: 418 - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 411 412 - break; - } - - ++var17; // L: 410 - } - } - - if (var18 > 0 && var19 < 128 - var2 && class194.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 420 421 422 - for (var17 = 1; var17 < var2; ++var17) { // L: 423 - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 424 425 - continue label288; - } - } - - class194.bufferX[var20] = var5 - 1; // L: 427 - class194.bufferY[var20] = var6 + 1; // L: 428 - var20 = var20 + 1 & 4095; // L: 429 - class194.directions[var18 - 1][var19 + 1] = 6; // L: 430 - class194.distances[var18 - 1][var19 + 1] = var16; // L: 431 - } - } while(var18 >= 128 - var2); // L: 433 - } while(var19 >= 128 - var2); - } while(class194.directions[var18 + 1][var19 + 1] != 0); // L: 434 - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 435 - - for (var17 = 1; var17 < var2; ++var17) { // L: 436 - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 437 438 - continue label311; + if (var0 > 1.0F || var1 > 1.0F) { // L: 314 + float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); // L: 315 + if (class114.field1382 + var2 > 0.0F) { // L: 316 + Float var4; + if (var0 + class114.field1382 < 1.3333334F) { // L: 320 + float var5 = var0 - 2.0F; // L: 321 + float var6 = var0 - 1.0F; // L: 322 + float var7 = (float)Math.sqrt((double)(var5 * var5 - var6 * 4.0F * var6)); // L: 323 + float var8 = (var7 + -var5) * 0.5F; // L: 324 + if (var1 + class114.field1382 > var8) { // L: 325 + var4 = var8 - class114.field1382; // L: 326 + } else { + var8 = (-var5 - var7) * 0.5F; // L: 329 + if (var1 < var8 + class114.field1382) { // L: 330 + var4 = var8 + class114.field1382; // L: 331 + } } + } else { + Float var3 = 1.3333334F - class114.field1382; // L: 336 + var4 = 0.33333334F - class114.field1382; // L: 337 } - - class194.bufferX[var20] = var5 + 1; // L: 440 - class194.bufferY[var20] = var6 + 1; // L: 441 - var20 = var20 + 1 & 4095; // L: 442 - class194.directions[var18 + 1][var19 + 1] = 12; // L: 443 - class194.distances[var18 + 1][var19 + 1] = var16; // L: 444 } } - } - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1527097157" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field698) { // L: 11244 - Client.field564[var0.rootIndex] = true; // L: 11245 - } - - } // L: 11247 + var1 = 1.0F - var1; // L: 342 + } // L: 343 } diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java index 85708046d7..154394822d 100644 --- a/runescape-client/src/main/java/class291.java +++ b/runescape-client/src/main/java/class291.java @@ -6,100 +6,165 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kf") public class class291 { - @ObfuscatedName("s") + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Llx;" ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; + @Export("archive14") + static Archive archive14; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lct;" + descriptor = "Lcw;" ) - UrlRequest field3302; - @ObfuscatedName("o") + UrlRequest field3295; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lql;" + descriptor = "Lqi;" ) - SpritePixels field3305; + SpritePixels field3293; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lci;)V" + descriptor = "(Ljava/lang/String;Lck;)V" ) class291(String var1, UrlRequester var2) { try { - this.field3302 = var2.request(new URL(var1)); // L: 16 + this.field3295 = var2.request(new URL(var1)); // L: 16 } catch (MalformedURLException var4) { // L: 18 - this.field3302 = null; // L: 19 + this.field3295 = null; // L: 19 } } // L: 21 @ObfuscatedSignature( - descriptor = "(Lct;)V" + descriptor = "(Lcw;)V" ) class291(UrlRequest var1) { - this.field3302 = var1; // L: 24 + this.field3295 = var1; // L: 24 } // L: 25 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Lql;", - garbageValue = "-22" + descriptor = "(I)Lqi;", + garbageValue = "-159877432" ) - SpritePixels method5586() { - if (this.field3305 == null && this.field3302 != null && this.field3302.isDone()) { // L: 28 - if (this.field3302.getResponse() != null) { // L: 29 - this.field3305 = class29.method433(this.field3302.getResponse()); // L: 30 + SpritePixels method5563() { + if (this.field3293 == null && this.field3295 != null && this.field3295.isDone()) { // L: 28 + if (this.field3295.getResponse() != null) { // L: 29 + this.field3293 = Interpreter.method1889(this.field3295.getResponse()); // L: 30 } - this.field3302 = null; // L: 32 + this.field3295 = null; // L: 32 } - return this.field3305; // L: 34 + return this.field3293; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "4" + descriptor = "(CLlo;B)C", + garbageValue = "20" ) - static final boolean method5588(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 36 - } + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 117 + if (var0 >= 192 && var0 <= 198) { // L: 118 + return 'A'; + } - @ObfuscatedName("gd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-521131129" - ) - static final void method5587() { - class428.method7654(class175.field1883, ReflectionCheck.field250, ModeWhere.field4080); // L: 3481 - class132.method2864(WorldMapRegion.field2706, class457.field4747); // L: 3482 - if (EnumComposition.cameraX == class175.field1883 && ReflectionCheck.field250 == FriendSystem.cameraY && CollisionMap.cameraZ == ModeWhere.field4080 && Language.cameraPitch == WorldMapRegion.field2706 && MusicPatchNode2.cameraYaw == class457.field4747) { // L: 3483 - Client.field739 = false; // L: 3484 - Client.isCameraLocked = false; // L: 3485 - class12.field62 = 0; // L: 3486 - WorldMapSectionType.field2778 = 0; // L: 3487 - class351.field4157 = 0; // L: 3488 - ClanChannel.field1660 = 0; // L: 3489 - JagexCache.field1737 = 0; // L: 3490 - class33.field231 = 0; // L: 3491 - Tiles.field996 = 0; // L: 3492 - PcmPlayer.field302 = 0; // L: 3493 - DevicePcmPlayerProvider.field146 = 0; // L: 3494 - ClanSettings.field1608 = 0; // L: 3495 + if (var0 == 199) { // L: 119 + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { // L: 120 + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { // L: 121 + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { // L: 122 + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { // L: 123 + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { // L: 124 + return 'U'; + } + + if (var0 == 221) { // L: 125 + return 'Y'; + } + + if (var0 == 223) { // L: 126 + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { // L: 127 + return 'a'; + } + + if (var0 == 231) { // L: 128 + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { // L: 129 + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { // L: 130 + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { // L: 131 + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { // L: 132 + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { // L: 133 + return 'u'; + } + + if (var0 == 253 || var0 == 255) { // L: 134 + return 'y'; + } } - } // L: 3498 + if (var0 == 338) { // L: 136 + return 'O'; + } else if (var0 == 339) { // L: 137 + return 'o'; + } else if (var0 == 376) { // L: 138 + return 'Y'; + } else { + return var0; // L: 139 + } + } - @ObfuscatedName("lw") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-35" + descriptor = "(IIS)Lbe;", + garbageValue = "-15672" ) - static void method5589() { - Client.packetWriter.addNode(ItemContainer.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher)); // L: 11906 - Client.oculusOrbState = 0; // L: 11907 - } // L: 11908 + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 + return var2.getMessage(var1); // L: 36 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lqe;", + garbageValue = "-868128197" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4694, FillMode.field4695, FillMode.SOLID}; // L: 15 + } } diff --git a/runescape-client/src/main/java/class293.java b/runescape-client/src/main/java/class293.java index cf70de10fe..93b5a07614 100644 --- a/runescape-client/src/main/java/class293.java +++ b/runescape-client/src/main/java/class293.java @@ -1,28 +1,70 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("kk") public class class293 { @ObfuscatedName("v") - public static final short[] field3323; - @ObfuscatedName("o") - public static final short[][] field3321; - @ObfuscatedName("h") - public static final short[] field3320; - @ObfuscatedName("g") - public static final short[][] field3326; + public static final short[] field3308; + @ObfuscatedName("c") + public static final short[][] field3309; + @ObfuscatedName("i") + public static final short[] field3310; + @ObfuscatedName("f") + public static final short[][] field3312; @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lit;" + @ObfuscatedGetter( + intValue = 763909349 ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lcw;" + ) + @Export("World_request") + static UrlRequest World_request; static { - field3323 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field3321 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5 - field3320 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field3326 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 + field3308 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field3309 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5 + field3310 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field3312 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(BB)C", + garbageValue = "105" + ) + public static char method5600(byte var0) { + int var1 = var0 & 255; // L: 84 + if (var1 == 0) { // L: 85 + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { // L: 86 + char var2 = class345.cp1252AsciiExtension[var1 - 128]; // L: 87 + if (var2 == 0) { // L: 88 + var2 = '?'; + } + + var1 = var2; // L: 89 + } + + return (char)var1; // L: 91 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-102" + ) + static final int method5599(int var0, int var1) { + int var2 = class12.method117(var0 - 1, var1 - 1) + class12.method117(var0 + 1, var1 - 1) + class12.method117(var0 - 1, 1 + var1) + class12.method117(1 + var0, 1 + var1); // L: 920 + int var3 = class12.method117(var0 - 1, var1) + class12.method117(1 + var0, var1) + class12.method117(var0, var1 - 1) + class12.method117(var0, var1 + 1); // L: 921 + int var4 = class12.method117(var0, var1); // L: 922 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 923 } } diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java index 596ec7aeec..d507f92903 100644 --- a/runescape-client/src/main/java/class295.java +++ b/runescape-client/src/main/java/class295.java @@ -1,13 +1,32 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kc") public class class295 { - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1289438305 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lfg;", + garbageValue = "1171437373" ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; + static VerticalAlignment[] method5745() { + return new VerticalAlignment[]{VerticalAlignment.field1932, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1935}; // L: 14 + } + + @ObfuscatedName("lg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "176339284" + ) + static final void method5732() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12343 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12344 + var1.clearIsFriend(); // L: 12345 + } + + ObjectComposition.method3674(); // L: 12347 + if (ClientPacket.friendsChat != null) { // L: 12348 + ClientPacket.friendsChat.clearFriends(); // L: 12349 + } + + } // L: 12351 } diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index e2b46d08ad..81b3409987 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -2,52 +2,106 @@ 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("ke") +@ObfuscatedName("kw") public enum class296 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkw;" ) - field3507(0), - @ObfuscatedName("o") + field3493(0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkw;" ) - field3503(1), - @ObfuscatedName("h") + field3491(1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkw;" ) - field3505(2), - @ObfuscatedName("g") + field3490(2), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkw;" ) - field3502(3), - @ObfuscatedName("l") + field3492(3), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkw;" ) - field3504(4); + field3494(4); + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + static IndexedSprite field3496; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -641219841 + intValue = -1277728875 ) - final int field3506; + final int field3495; class296(int var3) { - this.field3506 = var3; // L: 14 + this.field3495 = var3; // L: 14 } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3506; // L: 19 + return this.field3495; // L: 18 } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1938318651" + ) + static int method5749(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1101 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1103 + return 1; // L: 1104 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1107 + return 1; // L: 1108 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1111 + return 1; // L: 1112 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1115 + return 1; // L: 1116 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119 + return 1; // L: 1120 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123 + return 1; // L: 1124 + } else { + return 2; // L: 1126 + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Laf;I)V", + garbageValue = "1364149382" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 266 + if (var0.sound != null) { // L: 267 + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 268 + } + + } // L: 269 } diff --git a/runescape-client/src/main/java/class299.java b/runescape-client/src/main/java/class299.java deleted file mode 100644 index cc91f08cb0..0000000000 --- a/runescape-client/src/main/java/class299.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kr") -public class class299 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)V", - garbageValue = "-1240441597" - ) - public static void method5766(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; // L: 57 - NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 - } // L: 59 - - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-467208096" - ) - static final void method5767() { - Scene.Scene_isLowDetail = false; // L: 877 - Client.isLowDetail = false; // L: 878 - } // L: 879 -} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 5beb10c9f5..e3c43f26ec 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("g") +@ObfuscatedName("f") public interface class3 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;)Lpd;" + descriptor = "(Lpi;)Lpi;" ) - Buffer vmethod11(Buffer var1); + Buffer vmethod12(Buffer var1); } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index 283c539d1f..ecf9c1f1f5 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -2,25 +2,15 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("ku") public final class class300 { @ObfuscatedName("c") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - - @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "71" + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "1395576392" ) - public static int method5768(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 47 - - for (int var4 = var1; var4 < var2; ++var4) { // L: 48 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 - } - - var3 = ~var3; // L: 51 - return var3; // L: 52 + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return TextureProvider.method4963(var0, 10, true); // L: 34 } } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java index 77746c21db..c73be01157 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class301.java @@ -1,106 +1,35 @@ -import java.io.BufferedReader; -import java.io.DataInputStream; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kx") public class class301 { + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + static GameBuild field3545; + static { Math.sqrt(8192.0D); // L: 9 } // L: 10 - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-605295311" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1793224392" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; // L: 33 - if (var1 != null) { // L: 34 - Throwable var4 = var1; // L: 36 - String var5; - if (var1 instanceof RunException) { // L: 39 - RunException var6 = (RunException)var1; // L: 40 - var5 = var6.message + " | "; // L: 41 - var4 = var6.throwable; // L: 42 - } else { - var5 = ""; // L: 44 - } - - StringWriter var18 = new StringWriter(); // L: 45 - PrintWriter var7 = new PrintWriter(var18); // L: 46 - var4.printStackTrace(var7); // L: 47 - var7.close(); // L: 48 - String var8 = var18.toString(); // L: 49 - BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50 - String var10 = var9.readLine(); // L: 51 - - label64: - while (true) { - while (true) { - String var11 = var9.readLine(); // L: 53 - if (var11 == null) { // L: 54 - var5 = var5 + "| " + var10; // L: 72 - var2 = var5; // L: 75 - break label64; - } - - int var12 = var11.indexOf(40); // L: 55 - int var13 = var11.indexOf(41, var12 + 1); // L: 56 - if (var12 >= 0 && var13 >= 0) { // L: 57 - String var14 = var11.substring(var12 + 1, var13); // L: 58 - int var15 = var14.indexOf(".java:"); // L: 59 - if (var15 >= 0) { // L: 60 - var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61 - var5 = var5 + var14 + ' '; // L: 62 - continue; // L: 63 - } - - var11 = var11.substring(0, var12); // L: 65 - } - - var11 = var11.trim(); // L: 67 - var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68 - var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69 - var5 = var5 + var11 + ' '; // L: 70 - } - } - } - - if (var0 != null) { // L: 77 - if (var1 != null) { // L: 78 - var2 = var2 + " | "; - } - - var2 = var2 + var0; // L: 79 - } - - System.out.println("Error: " + var2); // L: 81 - var2 = var2.replace(':', '.'); // L: 82 - var2 = var2.replace('@', '_'); // L: 83 - var2 = var2.replace('&', '_'); // L: 84 - var2 = var2.replace('#', '_'); // L: 85 - if (RunException.RunException_applet == null) { // L: 86 - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + ChatChannel.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 87 - DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88 - var17.read(); // L: 89 - var17.close(); // L: 90 - } catch (Exception var16) { // L: 92 - } - + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 + if (var4 == null) { // L: 24 + var4 = new ChatChannel(); // L: 25 + Messages.Messages_channels.put(var0, var4); // L: 26 } - } // L: 93 + + Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 + Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 + Messages.Messages_queue.add(var5); // L: 30 + Client.chatCycle = Client.cycleCntr; // L: 31 + } // L: 32 } diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java index 5a65e6c145..00e896b4bd 100644 --- a/runescape-client/src/main/java/class302.java +++ b/runescape-client/src/main/java/class302.java @@ -1,61 +1,61 @@ -import net.runelite.mapping.Export; +import java.util.LinkedHashMap; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("km") public class class302 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkm;" ) - static final class302 field3557; - @ObfuscatedName("o") + static final class302 field3551; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkm;" ) - static final class302 field3555; - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("h") + static final class302 field3549; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1939248573 + intValue = -1906155943 ) - final int field3556; - @ObfuscatedName("g") + final int field3550; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -564188455 + intValue = -1137794979 ) - final int field3554; + final int field3548; static { - field3557 = new class302(51, 27, 800, 0, 16, 16); // L: 29 - field3555 = new class302(25, 28, 800, 656, 40, 40); // L: 30 + field3551 = new class302(51, 27, 800, 0, 16, 16); // L: 29 + field3549 = new class302(25, 28, 800, 656, 40, 40); // L: 30 } class302(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3556 = var5; // L: 39 - this.field3554 = var6; // L: 40 + this.field3550 = var5; // L: 39 + this.field3548 = var6; // L: 40 } // L: 41 - @ObfuscatedName("s") + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "(Lkn;B)I", - garbageValue = "0" + descriptor = "(ZB)V", + garbageValue = "15" ) - static int method5773(Widget var0) { - if (var0.type != 11) { // L: 1227 - --ChatChannel.Interpreter_stringStackSize; // L: 1228 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 1229 - return 1; // L: 1230 + static final void method5766(boolean var0) { + if (var0) { // L: 2978 + Client.field531 = Login.field907 ? class124.field1498 : class124.field1496; // L: 2979 } else { - String var1 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1232 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var0.method5663(var1); // L: 1233 - return 1; // L: 1234 + LinkedHashMap var1 = class131.clientPreferences.parameters; // L: 2982 + String var3 = Login.Login_username; // L: 2984 + int var4 = var3.length(); // L: 2986 + int var5 = 0; // L: 2987 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 2988 + var5 = (var5 << 5) - var5 + var3.charAt(var6); + } + + Client.field531 = var1.containsKey(var5) ? class124.field1501 : class124.field1495; // L: 2991 } - } + + } // L: 2993 } diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java index 8b76f98bdf..127a9d4944 100644 --- a/runescape-client/src/main/java/class305.java +++ b/runescape-client/src/main/java/class305.java @@ -1,102 +1,79 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ki") +@ObfuscatedName("ke") public class class305 { - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-2007325270" + descriptor = "([BIIIIIII[Lgv;I)V", + garbageValue = "-2138515466" ) - static int method5787(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 561 - Widget var4; - if (var0 >= 2000) { // L: 563 - var0 -= 1000; // L: 564 - var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 565 - var4 = HorizontalAlignment.getWidget(var3); // L: 566 - } else { - var4 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 568 + static final void method5781(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { // L: 111 + for (var10 = 0; var10 < 8; ++var10) { // L: 112 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 113 + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var3 + var10] &= -16777217; + } + } } - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 569 - class295.Interpreter_intStackSize -= 4; // L: 570 - var4.rawX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 571 - var4.rawY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 572 - var4.xAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 573 - var4.yAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 574 - class290.invalidateWidget(var4); // L: 575 - UserComparator10.client.alignWidget(var4); // L: 576 - if (var3 != -1 && var4.type == 0) { // L: 577 - GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var3 >> 16], var4, false); - } + Buffer var21 = new Buffer(var0); // L: 116 - return 1; // L: 578 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 580 - class295.Interpreter_intStackSize -= 4; // L: 581 - var4.rawWidth = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 582 - var4.rawHeight = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 583 - var4.widthAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 584 - var4.heightAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 585 - class290.invalidateWidget(var4); // L: 586 - UserComparator10.client.alignWidget(var4); // L: 587 - if (var3 != -1 && var4.type == 0) { // L: 588 - GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var3 >> 16], var4, false); - } + for (var10 = 0; var10 < 4; ++var10) { // L: 117 + for (int var11 = 0; var11 < 64; ++var11) { // L: 118 + for (int var12 = 0; var12 < 64; ++var12) { // L: 119 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120 + int var15 = var2 + Script.method1996(var11 & 7, var12 & 7, var7); // L: 123 + int var18 = var11 & 7; // L: 126 + int var19 = var12 & 7; // L: 127 + int var20 = var7 & 3; // L: 130 + int var17; + if (var20 == 0) { // L: 131 + var17 = var19; // L: 132 + } else if (var20 == 1) { // L: 135 + var17 = 7 - var18; // L: 136 + } else if (var20 == 2) { // L: 139 + var17 = 7 - var19; // L: 140 + } else { + var17 = var18; // L: 143 + } - return 1; // L: 589 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 591 - boolean var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 592 - if (var5 != var4.isHidden) { // L: 593 - var4.isHidden = var5; // L: 594 - class290.invalidateWidget(var4); // L: 595 + class20.loadTerrain(var21, var1, var15, var17 + var3, 0, 0, var7); // L: 145 + } else { + class20.loadTerrain(var21, 0, -1, -1, 0, 0, 0); // L: 147 + } + } } - - return 1; // L: 597 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599 - var4.noClickThrough = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 600 - return 1; // L: 601 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 603 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 604 - return 1; // L: 605 - } else { - return 2; // L: 607 } + + } // L: 151 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Lbb;", + garbageValue = "1287117449" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? DevicePcmPlayerProvider.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILbo;ZI)I", - garbageValue = "-177083421" + descriptor = "(Lky;I)I", + garbageValue = "-1357521539" ) - static int method5786(int var0, Script var1, boolean var2) { - Widget var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1449 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1450 - Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var3)); // L: 1451 - return 1; // L: 1452 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1454 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1461 - if (var3.dataText == null) { // L: 1462 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1463 - } - - return 1; // L: 1464 - } else { - return 2; // L: 1466 - } + static int method5782(Widget var0) { + if (var0.type != 11) { // L: 1238 + Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize - 1] = ""; // L: 1239 + return 1; // L: 1240 } else { - int var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1455 - --var4; // L: 1456 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1457 - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1458 - } else { - Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1459 + String var1 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1242 + Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var0.method5624(var1); // L: 1243 + return 1; // L: 1244 } } } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index cf3747e149..4aac3c2efb 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -1,55 +1,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kd") public class class306 { - static { - int var0 = 0; // L: 9 - int var1 = 0; // L: 10 - class302[] var2 = class163.method3283(); // L: 12 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 - class302 var4 = var2[var3]; // L: 14 - if (var4.field3556 > var0) { - var0 = var4.field3556; - } - - if (var4.field3554 > var1) { - var1 = var4.field3554; - } - } - - } - - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)J", - garbageValue = "650376938" + descriptor = "([FIFI)F", + garbageValue = "-1652525463" ) - public static long method5788(CharSequence var0) { - long var1 = 0L; // L: 16 - int var3 = var0.length(); // L: 17 + static float method5786(float[] var0, int var1, float var2) { + float var3 = var0[var1]; // L: 108 - for (int var4 = 0; var4 < var3; ++var4) { // L: 18 - var1 *= 37L; // L: 19 - char var5 = var0.charAt(var4); // L: 20 - if (var5 >= 'A' && var5 <= 'Z') { // L: 21 - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { // L: 22 - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); // L: 23 - } - - if (var1 >= 177917621779460413L) { // L: 24 - break; - } + for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 + var3 = var0[var4] + var3 * var2; // L: 110 } - while (var1 % 37L == 0L && 0L != var1) { // L: 26 - var1 /= 37L; - } - - return var1; // L: 27 + return var3; // L: 112 } } diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index 5f3f9aa372..5dd0d3c383 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -1,44 +1,38 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kh") public class class307 { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1390768501 - ) - static int field3588; - @ObfuscatedName("mo") - @ObfuscatedGetter( - intValue = -1395433659 - ) - @Export("menuX") - static int menuX; - - @ObfuscatedName("g") + @ObfuscatedName("oj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "882175193" + descriptor = "[Lky;" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; // L: 134 + static Widget[] field3585; - try { - var0 = ReflectionCheck.getPreferencesFile("", Login.field917.name, true); // L: 136 - Buffer var1 = Interpreter.clientPreferences.toBuffer(); // L: 137 - var0.write(var1.array, 0, var1.offset); // L: 138 - } catch (Exception var3) { // L: 140 - } + static { + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class302[] var2 = class216.method4365(); // L: 12 - try { - if (var0 != null) { // L: 142 - var0.closeSync(true); // L: 143 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 + class302 var4 = var2[var3]; // L: 14 + if (var4.field3550 > var0) { + var0 = var4.field3550; // L: 16 + } + + if (var4.field3548 > var1) { // L: 17 + var1 = var4.field3548; } - } catch (Exception var2) { // L: 146 } - } // L: 147 + } // L: 21 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1276900291" + ) + public static boolean method5789() { + return class273.musicPlayerStatus != 0 ? true : class273.midiPcmStream.isReady(); // L: 70 71 + } } diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java index cbebeefbe0..09a9927a4b 100644 --- a/runescape-client/src/main/java/class309.java +++ b/runescape-client/src/main/java/class309.java @@ -3,64 +3,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("kr") public enum class309 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkr;" ) - field3918(-1), - @ObfuscatedName("o") + field3914(-1), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkr;" ) - field3910(0), - @ObfuscatedName("h") + field3911(0), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkr;" ) - field3912(1), - @ObfuscatedName("g") + field3915(1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkr;" ) - field3911(2); + field3913(2); - @ObfuscatedName("t") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2019650593 + intValue = -1882933983 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 608041089 - ) - final int field3914; + final int field3910; class309(int var3) { - this.field3914 = var3; // L: 15 - } // L: 16 + this.field3910 = var3; // L: 19 + } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3914; // L: 20 + return this.field3910; // L: 23 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "76" - ) - public static void method5804() { - if (NetCache.NetCache_socket != null) { // L: 264 - NetCache.NetCache_socket.close(); - } - - } // L: 265 } diff --git a/runescape-client/src/main/java/class321.java b/runescape-client/src/main/java/class321.java index 886e8c53cd..637b55e5e2 100644 --- a/runescape-client/src/main/java/class321.java +++ b/runescape-client/src/main/java/class321.java @@ -1,218 +1,35 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("ll") public class class321 { - @ObfuscatedName("ec") - @ObfuscatedSignature( - descriptor = "Llu;" + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1459846877 ) - @Export("archive1") - static Archive archive1; + @Export("canvasHeight") + public static int canvasHeight; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;ZIB)V", - garbageValue = "17" + descriptor = "(I)V", + garbageValue = "-884405686" ) - static void method6031(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { // L: 186 - if (var3 == 4) { // L: 187 - class150.method3089(4); // L: 188 - } - - } else { - if (var3 == 0) { // L: 192 - class230.method4894(var2); // L: 193 - } else { - class150.method3089(var3); // L: 196 - } - - Rasterizer2D.Rasterizer2D_clear(); // L: 198 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 199 - Login.leftTitleSprite = class29.method433(var4); // L: 200 - class162.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); // L: 201 - int var5 = Client.worldProperties; // L: 202 - if ((var5 & 536870912) != 0) { // L: 204 - HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 205 - } else if ((var5 & 1073741824) != 0) { // L: 207 - HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 208 - } else { - HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 211 - } - - AbstractByteArrayCopier.titleboxSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 214 - class137.titlebuttonSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 215 - Login.field882 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 216 - Login.field913 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 217 - NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 218 - class355.runesSprite = class271.method5255(var1, "runes", ""); // L: 219 - class114.title_muteSprite = class271.method5255(var1, "title_mute", ""); // L: 220 - class160.options_buttons_0Sprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 221 - InvDefinition.field1814 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 222 - Skeleton.options_buttons_2Sprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 223 - class143.field1639 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 224 - Message.field458 = class160.options_buttons_0Sprite.subWidth; // L: 225 - KeyHandler.field140 = class160.options_buttons_0Sprite.subHeight; // L: 226 - Login.loginScreenRunesAnimation = new LoginScreenAnimation(class355.runesSprite); // L: 227 - if (var2) { // L: 228 - Login.Login_username = ""; // L: 229 - Login.Login_password = ""; // L: 230 - Login.field900 = new String[8]; // L: 231 - Login.field899 = 0; // L: 232 - } - - UrlRequest.field1346 = 0; // L: 234 - class452.otp = ""; // L: 235 - Login.field903 = true; // L: 236 - Login.worldSelectOpen = false; // L: 237 - if (!Interpreter.clientPreferences.method2259()) { // L: 238 - Archive var6 = ArchiveLoader.archive6; // L: 239 - int var7 = var6.getGroupId("scape main"); // L: 241 - int var8 = var6.getFileId(var7, ""); // L: 242 - class273.musicPlayerStatus = 1; // L: 244 - class147.musicTrackArchive = var6; // L: 245 - ArchiveLoader.musicTrackGroupId = var7; // L: 246 - class273.musicTrackFileId = var8; // L: 247 - DevicePcmPlayerProvider.musicTrackVolume = 255; // L: 248 - class260.musicTrackBoolean = false; // L: 249 - class273.pcmSampleLength = 2; // L: 250 - } else { - class273.musicPlayerStatus = 1; // L: 255 - class147.musicTrackArchive = null; // L: 256 - ArchiveLoader.musicTrackGroupId = -1; // L: 257 - class273.musicTrackFileId = -1; // L: 258 - DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 259 - class260.musicTrackBoolean = false; // L: 260 - class273.pcmSampleLength = 2; // L: 261 - } - - NPC.method2366(false); // L: 263 - Login.clearLoginScreen = true; // L: 264 - Login.xPadding = (class4.canvasWidth - 765) / 2; // L: 265 - Login.loginBoxX = Login.xPadding + 202; // L: 266 - class134.loginBoxCenter = Login.loginBoxX + 180; // L: 267 - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 268 - class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 269 - HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 270 - } - } // L: 190 271 - - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "1974154557" - ) - static final void method6030(int var0, int var1, boolean var2) { - if (!var2 || var0 != class193.field2197 || class221.field2647 != var1) { // L: 5167 - class193.field2197 = var0; // L: 5170 - class221.field2647 = var1; // L: 5171 - InterfaceParent.updateGameState(25); // L: 5172 - class119.drawLoadingMessage("Loading - please wait.", true); // L: 5173 - int var3 = ApproximateRouteStrategy.baseX; // L: 5174 - int var4 = class250.baseY; // L: 5175 - ApproximateRouteStrategy.baseX = (var0 - 6) * 8; // L: 5176 - class250.baseY = (var1 - 6) * 8; // L: 5177 - int var5 = ApproximateRouteStrategy.baseX - var3; // L: 5178 - int var6 = class250.baseY - var4; // L: 5179 - var3 = ApproximateRouteStrategy.baseX; // L: 5180 - var4 = class250.baseY; // L: 5181 - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 5182 - NPC var19 = Client.npcs[var7]; // L: 5183 - if (var19 != null) { // L: 5184 - for (var9 = 0; var9 < 10; ++var9) { // L: 5185 - var10000 = var19.pathX; // L: 5186 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 5187 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 5189 - var19.y -= var6 * 128; // L: 5190 - } - } - - for (var7 = 0; var7 < 2048; ++var7) { // L: 5193 - Player var22 = Client.players[var7]; // L: 5194 - if (var22 != null) { // L: 5195 - for (var9 = 0; var9 < 10; ++var9) { // L: 5196 - var10000 = var22.pathX; // L: 5197 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 5198 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 5200 - var22.y -= var6 * 128; // L: 5201 - } - } - - byte var20 = 0; // L: 5204 - byte var8 = 104; // L: 5205 - byte var21 = 1; // L: 5206 - if (var5 < 0) { // L: 5207 - var20 = 103; // L: 5208 - var8 = -1; // L: 5209 - var21 = -1; // L: 5210 - } - - byte var10 = 0; // L: 5212 - byte var11 = 104; // L: 5213 - byte var12 = 1; // L: 5214 - if (var6 < 0) { // L: 5215 - var10 = 103; // L: 5216 - var11 = -1; // L: 5217 - var12 = -1; // L: 5218 - } - - int var14; - for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5220 - for (var14 = var10; var11 != var14; var14 += var12) { // L: 5221 - int var15 = var5 + var13; // L: 5222 - int var16 = var6 + var14; // L: 5223 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 5224 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { // L: 5225 - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; // L: 5226 - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5230 5231 5235 - var18.x -= var5; // L: 5232 - var18.y -= var6; // L: 5233 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5234 - var18.remove(); - } - } - - if (Client.destinationX != 0) { // L: 5237 - Client.destinationX -= var5; // L: 5238 - Client.destinationY -= var6; // L: 5239 - } - - Client.soundEffectCount = 0; // L: 5241 - Client.isCameraLocked = false; // L: 5242 - EnumComposition.cameraX -= var5 << 7; // L: 5243 - CollisionMap.cameraZ -= var6 << 7; // L: 5244 - Messages.oculusOrbFocalPointX -= var5 << 7; // L: 5245 - class115.oculusOrbFocalPointY -= var6 << 7; // L: 5246 - Client.field721 = -1; // L: 5247 - Client.graphicsObjects.clear(); // L: 5248 - Client.projectiles.clear(); // L: 5249 - - for (var14 = 0; var14 < 4; ++var14) { // L: 5250 - Client.collisionMaps[var14].clear(); - } - - } - } // L: 5168 5251 + static void method5996() { + Tiles.Tiles_minPlane = 99; // L: 48 + Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49 + class14.Tiles_overlays = new byte[4][104][104]; // L: 50 + class147.Tiles_shapes = new byte[4][104][104]; // L: 51 + Tiles.field983 = new byte[4][104][104]; // L: 52 + class420.field4545 = new int[4][105][105]; // L: 53 + class392.field4374 = new byte[4][105][105]; // L: 54 + Tiles.field998 = new int[105][105]; // L: 55 + BufferedNetSocket.Tiles_hue = new int[104]; // L: 56 + class116.Tiles_saturation = new int[104]; // L: 57 + Tiles.Tiles_lightness = new int[104]; // L: 58 + class357.Tiles_hueMultiplier = new int[104]; // L: 59 + class361.field4213 = new int[104]; // L: 60 + } // L: 61 } diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java index 2cad139994..57b55c31bc 100644 --- a/runescape-client/src/main/java/class326.java +++ b/runescape-client/src/main/java/class326.java @@ -4,214 +4,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("lf") public class class326 { + @ObfuscatedName("q") + static int[] field4041; @ObfuscatedName("v") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lnm;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("h") - int[] field4043; - @ObfuscatedName("g") - int[] field4044; - @ObfuscatedName("l") + @ObfuscatedName("i") + int[] field4034; + @ObfuscatedName("f") + int[] field4037; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1991693335 + intValue = -2113149807 ) - int field4045; + int field4038; public class326() { this.spriteMap = new HashMap(); // L: 10 this.bounds = new Bounds(0, 0); // L: 11 - this.field4043 = new int[2048]; // L: 12 - this.field4044 = new int[2048]; // L: 13 - this.field4045 = 0; // L: 14 - HealthBar.method2351(); // L: 21 + this.field4034 = new int[2048]; // L: 12 + this.field4037 = new int[2048]; // L: 13 + this.field4038 = 0; // L: 14 + WorldMapSection2.method3959(); // L: 21 } // L: 22 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "15" + descriptor = "(II)V", + garbageValue = "1093596616" ) - void method6107(int var1) { + void method6042(int var1) { int var2 = var1 * 2 + 1; // L: 46 - double[] var3 = Message.method1112(0.0D, (double)((float)var1 / 3.0F), var1); // L: 47 - double var4 = var3[var1] * var3[var1]; // L: 48 - int[] var6 = new int[var2 * var2]; // L: 49 - boolean var7 = false; // L: 50 + double var4 = (double)((float)var1 / 3.0F); // L: 48 + int var6 = var1 * 2 + 1; // L: 50 + double[] var7 = new double[var6]; // L: 51 + int var8 = -var1; - for (int var8 = 0; var8 < var2; ++var8) { // L: 51 - for (int var9 = 0; var9 < var2; ++var9) { // L: 52 - int var10 = var6[var9 + var8 * var2] = (int)(var3[var9] * var3[var8] / var4 * 256.0D); // L: 53 - if (!var7 && var10 > 0) { // L: 54 - var7 = true; // L: 55 + for (int var9 = 0; var8 <= var1; ++var9) { + var7[var9] = AbstractWorldMapIcon.method4415((double)var8, 0.0D, var4); // L: 53 + ++var8; // L: 52 + } + + double[] var14 = var7; // L: 57 + double var15 = var7[var1] * var7[var1]; // L: 58 + int[] var17 = new int[var2 * var2]; // L: 59 + boolean var10 = false; // L: 60 + + for (int var11 = 0; var11 < var2; ++var11) { // L: 61 + for (int var12 = 0; var12 < var2; ++var12) { // L: 62 + int var13 = var17[var12 + var2 * var11] = (int)(var14[var11] * var14[var12] / var15 * 256.0D); // L: 63 + if (!var10 && var13 > 0) { // L: 64 + var10 = true; // L: 65 } } } - SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 59 - this.spriteMap.put(var1, var11); // L: 60 - } // L: 61 + SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69 + this.spriteMap.put(var1, var18); // L: 70 + } // L: 71 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Lql;", - garbageValue = "3" + descriptor = "(IS)Lqi;", + garbageValue = "255" ) - SpritePixels method6084(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 64 - this.method6107(var1); // L: 65 + SpritePixels method6043(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 74 + this.method6042(var1); // L: 75 } - return (SpritePixels)this.spriteMap.get(var1); // L: 67 + return (SpritePixels)this.spriteMap.get(var1); // L: 77 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "-103" + garbageValue = "-73" ) - public final void method6091(int var1, int var2) { - if (this.field4045 < this.field4043.length) { - this.field4043[this.field4045] = var1; - this.field4044[this.field4045] = var2; - ++this.field4045; + public final void method6044(int var1, int var2) { + if (this.field4038 < this.field4034.length) { // L: 81 + this.field4034[this.field4038] = var1; // L: 82 + this.field4037[this.field4038] = var2; // L: 83 + ++this.field4038; // L: 84 } - } // L: 75 + } // L: 85 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-726081819" + garbageValue = "1343978449" ) - public final void method6086() { - this.field4045 = 0; - } // L: 79 + public final void method6057() { + this.field4038 = 0; // L: 88 + } // L: 89 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IILql;FI)V", - garbageValue = "-1878611374" + descriptor = "(IILqi;FI)V", + garbageValue = "1463676048" ) - public final void method6082(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); - SpritePixels var6 = this.method6084(var5); // L: 83 - 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); // L: 87 - System.nanoTime(); + public final void method6045(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); // L: 92 + SpritePixels var6 = this.method6043(var5); // L: 93 + int var7 = var5 * 2 + 1; // L: 94 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 95 + Bounds var9 = new Bounds(0, 0); // L: 96 + this.bounds.setHigh(var7, var7); // L: 97 + System.nanoTime(); // L: 98 int var10; int var11; int var12; - for (var10 = 0; var10 < this.field4045; ++var10) { - var11 = this.field4043[var10]; - var12 = this.field4044[var10]; // L: 91 - int var13 = (int)((float)(var11 - var1) * var4) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 93 - this.bounds.setLow(var13, var14); // L: 94 - this.bounds.method6985(var8, var9); // L: 95 - this.method6087(var6, var3, var9); // L: 96 + for (var10 = 0; var10 < this.field4038; ++var10) { // L: 99 + var11 = this.field4034[var10]; // L: 100 + var12 = this.field4037[var10]; // L: 101 + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 102 + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 103 + this.bounds.setLow(var13, var14); // L: 104 + this.bounds.method6945(var8, var9); // L: 105 + this.method6046(var6, var3, var9); // L: 106 } - System.nanoTime(); // L: 98 - System.nanoTime(); // L: 99 + System.nanoTime(); // L: 108 + System.nanoTime(); // L: 109 - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 100 - if (var3.pixels[var10] == 0) { // L: 101 - var3.pixels[var10] = -16777216; // L: 102 + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 110 + if (var3.pixels[var10] == 0) { // L: 111 + var3.pixels[var10] = -16777216; // L: 112 } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 105 - if (var11 <= 0) { // L: 106 - var3.pixels[var10] = -16777216; // L: 107 + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115 + if (var11 <= 0) { // L: 116 + var3.pixels[var10] = -16777216; // L: 117 } else { - if (var11 > class113.field1387.length) { // L: 110 - var11 = class113.field1387.length; + if (var11 > field4041.length) { // L: 120 + var11 = field4041.length; } - var12 = class113.field1387[var11 - 1]; // L: 111 - var3.pixels[var10] = -16777216 | var12; // L: 112 + var12 = field4041[var11 - 1]; // L: 121 + var3.pixels[var10] = -16777216 | var12; // L: 122 } } } - System.nanoTime(); // L: 114 - } // L: 115 + System.nanoTime(); // L: 124 + } // L: 125 - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lql;Lql;Lnm;I)V", - garbageValue = "-839631696" + descriptor = "(Lqi;Lqi;Lnm;I)V", + garbageValue = "-1856311554" ) - void method6087(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 118 - int var4 = 0; // L: 119 - int var5 = 0; // L: 120 - if (var3.lowX == 0) { // L: 121 + void method6046(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 128 + int var4 = 0; // L: 129 + int var5 = 0; // L: 130 + if (var3.lowX == 0) { // L: 131 var4 = var1.subWidth - var3.highX; } - if (var3.lowY == 0) { // L: 122 + if (var3.lowY == 0) { // L: 132 var5 = var1.subHeight - var3.highY; } - int var6 = var4 + var5 * var1.subWidth; // L: 123 - int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 124 + int var6 = var4 + var5 * var1.subWidth; // L: 133 + int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 134 - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 125 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 126 - int[] var10000 = var2.pixels; // L: 127 + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 135 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 136 + int[] var10000 = var2.pixels; // L: 137 int var10001 = var7++; var10000[var10001] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.highX; // L: 129 - var7 += var2.subWidth - var3.highX; // L: 130 + var6 += var1.subWidth - var3.highX; // L: 139 + var7 += var2.subWidth - var3.highX; // L: 140 } } - } // L: 132 + } // L: 142 - @ObfuscatedName("d") + @ObfuscatedName("lh") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2127405993" + descriptor = "(Lky;I)I", + garbageValue = "-658194090" ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; // L: 71 - if (var0 < 0 || var0 >= 65536) { // L: 72 - var0 >>>= 16; // L: 73 - var1 += 16; // L: 74 - } - - if (var0 >= 256) { // L: 76 - var0 >>>= 8; // L: 77 - var1 += 8; // L: 78 - } - - if (var0 >= 16) { // L: 80 - var0 >>>= 4; // L: 81 - var1 += 4; // L: 82 - } - - if (var0 >= 4) { // L: 84 - var0 >>>= 2; // L: 85 - var1 += 2; // L: 86 - } - - if (var0 >= 1) { // L: 88 - var0 >>>= 1; // L: 89 - ++var1; // L: 90 - } - - return var0 + var1; // L: 92 + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 12457 + return var1 != null ? var1.integer : var0.flags; // L: 12458 12459 } } diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java index aeaaf569f7..deb62d457a 100644 --- a/runescape-client/src/main/java/class327.java +++ b/runescape-client/src/main/java/class327.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,22 +8,22 @@ public class class327 { @ObfuscatedSignature( descriptor = "Llb;" ) - static final class327 field4051; - @ObfuscatedName("o") + static final class327 field4044; + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Llb;" ) - static final class327 field4052; - @ObfuscatedName("h") + static final class327 field4043; + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Llb;" ) - static final class327 field4050; + static final class327 field4042; static { - field4051 = new class327(); // L: 4 - field4052 = new class327(); // L: 5 - field4050 = new class327(); // L: 6 + field4044 = new class327(); // L: 4 + field4043 = new class327(); // L: 5 + field4042 = new class327(); // L: 6 } class327() { @@ -30,16 +31,72 @@ public class class327 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Ldy;", - garbageValue = "14" + descriptor = "(CB)B", + garbageValue = "4" ) - static class116 method6109(int var0) { - class116[] var1 = new class116[]{class116.field1420, class116.field1419, class116.field1425, class116.field1421, class116.field1423}; // L: 132 - class116 var2 = (class116)ChatChannel.findEnumerated(var1, var0); // L: 134 - if (var2 == null) { // L: 135 - var2 = class116.field1420; + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + var1 = (byte)var0; + } else if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; // L: 26 + } else if (var0 == 8217) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; + } else { + var1 = 63; // L: 40 } - return var2; // L: 136 + return var1; // L: 41 } } diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java index 6dfa87b300..22e6c5fa4e 100644 --- a/runescape-client/src/main/java/class329.java +++ b/runescape-client/src/main/java/class329.java @@ -1,8 +1,17 @@ import java.util.HashMap; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lr") +@ObfuscatedName("lm") public class class329 { + @ObfuscatedName("fa") + @ObfuscatedGetter( + intValue = 1869767523 + ) + @Export("currentPort") + static int currentPort; + static { new HashMap(); } // L: 9 diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java deleted file mode 100644 index 26d3e149a4..0000000000 --- a/runescape-client/src/main/java/class33.java +++ /dev/null @@ -1,45 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ae") -public class class33 { - @ObfuscatedName("sr") - @ObfuscatedGetter( - intValue = -1543138447 - ) - static int field231; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lld;" - ) - @Export("reflectionChecks") - public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -224672805 - ) - static int field237; - @ObfuscatedName("lf") - @ObfuscatedSignature( - descriptor = "Lhm;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - - static { - reflectionChecks = new IterableNodeDeque(); // L: 17 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1943473173" - ) - static final void method632() { - Object var10000 = null; // L: 121 - String var0 = "You can't add yourself to your own friend list"; - Login.addGameMessage(30, "", var0); // L: 123 - } // L: 125 -} diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java index 521970a896..3e62ea0c9d 100644 --- a/runescape-client/src/main/java/class340.java +++ b/runescape-client/src/main/java/class340.java @@ -1,24 +1,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mt") +@ObfuscatedName("mk") public final class class340 { - @ObfuscatedName("us") - @ObfuscatedSignature( - descriptor = "Lla;" - ) - public static class326 field4109; @ObfuscatedName("v") - final Object field4107; - @ObfuscatedName("o") + final Object field4096; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 74702637 + intValue = 1768359201 ) - int field4108; + int field4095; class340(Object var1, int var2) { - this.field4107 = var1; // L: 170 - this.field4108 = var2; // L: 171 - } // L: 172 + this.field4096 = var1; // L: 158 + this.field4095 = var2; // L: 159 + } // L: 160 } diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index 6b9c4ed21c..1d01bcfc27 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -6,74 +6,424 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("mq") public class class341 implements Iterator { - @ObfuscatedName("j") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lco;" ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lmn;" ) - class342 field4112; - @ObfuscatedName("o") + class342 field4102; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 203290691 + intValue = -1686021093 ) - int field4114; - @ObfuscatedName("h") + int field4099; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1571350147 + intValue = 2018103079 ) - int field4113; + int field4100; @ObfuscatedSignature( - descriptor = "(Lmj;)V" + descriptor = "(Lmn;)V" ) class341(class342 var1) { - this.field4114 = 0; // L: 177 - this.field4113 = this.field4112.field4115; // L: 178 - this.field4112 = var1; // L: 181 - } // L: 182 + this.field4099 = 0; // L: 165 + this.field4100 = this.field4102.field4108; // L: 166 + this.field4102 = var1; // L: 169 + } // L: 170 public boolean hasNext() { - return this.field4114 < this.field4112.field4117; // L: 186 + return this.field4099 < this.field4102.field4106; // L: 173 } public void remove() { - throw new UnsupportedOperationException(); // L: 203 + throw new UnsupportedOperationException(); // L: 187 } public Object next() { - if (this.field4112.field4115 != this.field4113) { // L: 192 + if (this.field4102.field4108 != this.field4100) { // L: 177 throw new ConcurrentModificationException(); - } else if (this.field4114 < this.field4112.field4117) { // L: 193 - Object var1 = this.field4112.field4121[this.field4114].field4107; // L: 194 - ++this.field4114; // L: 195 - return var1; // L: 196 + } else if (this.field4099 < this.field4102.field4106) { // L: 178 + Object var1 = this.field4102.field4104[this.field4099].field4096; // L: 179 + ++this.field4099; // L: 180 + return var1; // L: 181 } else { - throw new NoSuchElementException(); // L: 198 + throw new NoSuchElementException(); // L: 183 } } - @ObfuscatedName("ay") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lal;B)V", - garbageValue = "81" + descriptor = "(IIII)I", + garbageValue = "968220447" ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 270 - if (var0.sound != null) { // L: 271 - var0.sound.position = 0; - } + static int method6280(int var0, int var1, int var2) { + return var0 << 28 | var1 << 14 | var2; // L: 34 + } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 272 - } + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(Lcz;IILgm;I)V", + garbageValue = "214021877" + ) + static final void method6279(Player var0, int var1, int var2, class193 var3) { + int var4 = var0.pathX[0]; // L: 8351 + int var5 = var0.pathY[0]; // L: 8352 + int var6 = var0.transformedSize(); // L: 8353 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8354 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8355 + int var8 = var0.transformedSize(); // L: 8357 + RouteStrategy var9 = UserComparator10.method2623(var1, var2); // L: 8358 + CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 8359 + int[] var11 = Client.field784; // L: 8360 + int[] var12 = Client.field785; // L: 8361 - } // L: 273 + int var13; + int var14; + for (var13 = 0; var13 < 128; ++var13) { // L: 8363 + for (var14 = 0; var14 < 128; ++var14) { // L: 8364 + class194.directions[var13][var14] = 0; // L: 8365 + class194.distances[var13][var14] = 99999999; // L: 8366 + } + } + + int var15; + int var16; + byte var18; + int var19; + int var20; + int var22; + int var24; + int var25; + int var26; + int var27; + boolean var33; + int var35; + int var36; + int var38; + if (var8 == 1) { // L: 8370 + var33 = class29.method404(var4, var5, var9, var10); + } else if (var8 == 2) { // L: 8371 + var33 = Calendar.method5507(var4, var5, var9, var10); + } else { + var15 = var4; // L: 8375 + var16 = var5; // L: 8376 + byte var17 = 64; // L: 8377 + var18 = 64; // L: 8378 + var19 = var4 - var17; // L: 8379 + var20 = var5 - var18; // L: 8380 + class194.directions[var17][var18] = 99; // L: 8381 + class194.distances[var17][var18] = 0; // L: 8382 + byte var21 = 0; // L: 8383 + var22 = 0; // L: 8384 + class194.bufferX[var21] = var4; // L: 8385 + var38 = var21 + 1; + class194.bufferY[var21] = var5; // L: 8386 + int[][] var23 = var10.flags; // L: 8387 + + boolean var34; + label496: + while (true) { + label494: + while (true) { + do { + do { + do { + label471: + do { + if (var38 == var22) { // L: 8388 + HealthBarUpdate.field1189 = var15; // L: 8508 + StructComposition.field1988 = var16; // L: 8509 + var34 = false; // L: 8510 + break label496; + } + + var15 = class194.bufferX[var22]; // L: 8389 + var16 = class194.bufferY[var22]; // L: 8390 + var22 = var22 + 1 & 4095; // L: 8391 + var35 = var15 - var19; // L: 8392 + var36 = var16 - var20; // L: 8393 + var24 = var15 - var10.xInset; // L: 8394 + var25 = var16 - var10.yInset; // L: 8395 + if (var9.hasArrived(var8, var15, var16, var10)) { // L: 8396 + HealthBarUpdate.field1189 = var15; // L: 8397 + StructComposition.field1988 = var16; // L: 8398 + var34 = true; // L: 8399 + break label496; + } + + var26 = class194.distances[var35][var36] + 1; // L: 8402 + if (var35 > 0 && class194.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var8 + var25 - 1] & 19136824) == 0) { // L: 8403 8404 8405 8406 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15 - 1; // L: 8410 + class194.bufferY[var38] = var16; // L: 8411 + var38 = var38 + 1 & 4095; // L: 8412 + class194.directions[var35 - 1][var36] = 2; // L: 8413 + class194.distances[var35 - 1][var36] = var26; // L: 8414 + break; + } + + if ((var23[var24 - 1][var27 + var25] & 19136830) != 0) { // L: 8408 + break; + } + + ++var27; // L: 8407 + } + } + + if (var35 < 128 - var8 && class194.directions[var35 + 1][var36] == 0 && (var23[var24 + var8][var25] & 19136899) == 0 && (var23[var24 + var8][var8 + var25 - 1] & 19136992) == 0) { // L: 8416 8417 8418 8419 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15 + 1; // L: 8423 + class194.bufferY[var38] = var16; // L: 8424 + var38 = var38 + 1 & 4095; // L: 8425 + class194.directions[var35 + 1][var36] = 8; // L: 8426 + class194.distances[var35 + 1][var36] = var26; // L: 8427 + break; + } + + if ((var23[var24 + var8][var27 + var25] & 19136995) != 0) { // L: 8421 + break; + } + + ++var27; // L: 8420 + } + } + + if (var36 > 0 && class194.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + var8 - 1][var25 - 1] & 19136899) == 0) { // L: 8429 8430 8431 8432 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15; // L: 8436 + class194.bufferY[var38] = var16 - 1; // L: 8437 + var38 = var38 + 1 & 4095; // L: 8438 + class194.directions[var35][var36 - 1] = 1; // L: 8439 + class194.distances[var35][var36 - 1] = var26; // L: 8440 + break; + } + + if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 8434 + break; + } + + ++var27; // L: 8433 + } + } + + if (var36 < 128 - var8 && class194.directions[var35][var36 + 1] == 0 && (var23[var24][var8 + var25] & 19136824) == 0 && (var23[var8 + var24 - 1][var25 + var8] & 19136992) == 0) { // L: 8442 8443 8444 8445 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15; // L: 8449 + class194.bufferY[var38] = var16 + 1; // L: 8450 + var38 = var38 + 1 & 4095; // L: 8451 + class194.directions[var35][var36 + 1] = 4; // L: 8452 + class194.distances[var35][var36 + 1] = var26; // L: 8453 + break; + } + + if ((var23[var27 + var24][var8 + var25] & 19137016) != 0) { // L: 8447 + break; + } + + ++var27; // L: 8446 + } + } + + if (var35 > 0 && var36 > 0 && class194.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { // L: 8455 8456 8457 + var27 = 1; + + while (true) { + if (var27 >= var8) { + class194.bufferX[var38] = var15 - 1; // L: 8462 + class194.bufferY[var38] = var16 - 1; // L: 8463 + var38 = var38 + 1 & 4095; // L: 8464 + class194.directions[var35 - 1][var36 - 1] = 3; // L: 8465 + class194.distances[var35 - 1][var36 - 1] = var26; // L: 8466 + break; + } + + if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { // L: 8459 8460 + break; + } + + ++var27; // L: 8458 + } + } + + if (var35 < 128 - var8 && var36 > 0 && class194.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { // L: 8468 8469 8470 + var27 = 1; + + while (true) { + if (var27 >= var8) { + class194.bufferX[var38] = var15 + 1; // L: 8475 + class194.bufferY[var38] = var16 - 1; // L: 8476 + var38 = var38 + 1 & 4095; // L: 8477 + class194.directions[var35 + 1][var36 - 1] = 9; // L: 8478 + class194.distances[var35 + 1][var36 - 1] = var26; // L: 8479 + break; + } + + if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var24 + var27][var25 - 1] & 19136911) != 0) { // L: 8472 8473 + break; + } + + ++var27; // L: 8471 + } + } + + if (var35 > 0 && var36 < 128 - var8 && class194.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var8 + var25] & 19136824) == 0) { // L: 8481 8482 8483 + for (var27 = 1; var27 < var8; ++var27) { // L: 8484 + if ((var23[var24 - 1][var27 + var25] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 + var8] & 19137016) != 0) { // L: 8485 8486 + continue label471; + } + } + + class194.bufferX[var38] = var15 - 1; // L: 8488 + class194.bufferY[var38] = var16 + 1; // L: 8489 + var38 = var38 + 1 & 4095; // L: 8490 + class194.directions[var35 - 1][var36 + 1] = 6; // L: 8491 + class194.distances[var35 - 1][var36 + 1] = var26; // L: 8492 + } + } while(var35 >= 128 - var8); // L: 8494 + } while(var36 >= 128 - var8); + } while(class194.directions[var35 + 1][var36 + 1] != 0); // L: 8495 + } while((var23[var8 + var24][var25 + var8] & 19136992) != 0); // L: 8496 + + for (var27 = 1; var27 < var8; ++var27) { // L: 8497 + if ((var23[var24 + var27][var25 + var8] & 19137016) != 0 || (var23[var8 + var24][var25 + var27] & 19136995) != 0) { // L: 8498 8499 + continue label494; + } + } + + class194.bufferX[var38] = var15 + 1; // L: 8501 + class194.bufferY[var38] = var16 + 1; // L: 8502 + var38 = var38 + 1 & 4095; // L: 8503 + class194.directions[var35 + 1][var36 + 1] = 12; // L: 8504 + class194.distances[var35 + 1][var36 + 1] = var26; // L: 8505 + } + } + + var33 = var34; // L: 8512 + } + + int var7; + label542: { + var14 = var4 - 64; // L: 8514 + var15 = var5 - 64; // L: 8515 + var16 = HealthBarUpdate.field1189; // L: 8516 + var35 = StructComposition.field1988; // L: 8517 + if (!var33) { // L: 8518 + var36 = Integer.MAX_VALUE; // L: 8520 + var19 = Integer.MAX_VALUE; // L: 8521 + byte var37 = 10; // L: 8522 + var38 = var9.approxDestinationX; // L: 8523 + var22 = var9.approxDestinationY; // L: 8524 + int var32 = var9.approxDestinationSizeX; // L: 8525 + var24 = var9.approxDestinationSizeY; // L: 8526 + + for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { // L: 8527 + for (var26 = var22 - var37; var26 <= var22 + var37; ++var26) { // L: 8528 + var27 = var25 - var14; // L: 8529 + int var28 = var26 - var15; // L: 8530 + if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class194.distances[var27][var28] < 100) { // L: 8531 8532 + int var29 = 0; // L: 8533 + if (var25 < var38) { // L: 8534 + var29 = var38 - var25; + } else if (var25 > var32 + var38 - 1) { // L: 8535 + var29 = var25 - (var38 + var32 - 1); + } + + int var30 = 0; // L: 8536 + if (var26 < var22) { // L: 8537 + var30 = var22 - var26; + } else if (var26 > var24 + var22 - 1) { // L: 8538 + var30 = var26 - (var24 + var22 - 1); + } + + int var31 = var29 * var29 + var30 * var30; // L: 8539 + if (var31 < var36 || var31 == var36 && class194.distances[var27][var28] < var19) { // L: 8540 + var36 = var31; // L: 8541 + var19 = class194.distances[var27][var28]; // L: 8542 + var16 = var25; // L: 8543 + var35 = var26; // L: 8544 + } + } + } + } + + if (var36 == Integer.MAX_VALUE) { // L: 8550 + var7 = -1; // L: 8551 + break label542; + } + } + + if (var16 == var4 && var5 == var35) { // L: 8560 + var11[0] = var16; // L: 8561 + var12[0] = var35; // L: 8562 + var7 = 0; // L: 8563 + } else { + var18 = 0; // L: 8566 + class194.bufferX[var18] = var16; // L: 8569 + var36 = var18 + 1; + class194.bufferY[var18] = var35; // L: 8570 + + for (var19 = var20 = class194.directions[var16 - var14][var35 - var15]; var4 != var16 || var5 != var35; var19 = class194.directions[var16 - var14][var35 - var15]) { // L: 8571 8572 8582 + if (var19 != var20) { // L: 8573 + var20 = var19; // L: 8574 + class194.bufferX[var36] = var16; // L: 8575 + class194.bufferY[var36++] = var35; // L: 8576 + } + + if ((var19 & 2) != 0) { // L: 8578 + ++var16; + } else if ((var19 & 8) != 0) { // L: 8579 + --var16; + } + + if ((var19 & 1) != 0) { // L: 8580 + ++var35; + } else if ((var19 & 4) != 0) { // L: 8581 + --var35; + } + } + + var38 = 0; // L: 8584 + + while (var36-- > 0) { // L: 8585 + var11[var38] = class194.bufferX[var36]; // L: 8586 + var12[var38++] = class194.bufferY[var36]; // L: 8587 + if (var38 >= var11.length) { // L: 8588 + break; + } + } + + var7 = var38; // L: 8590 + } + } + + var13 = var7; // L: 8592 + if (var7 >= 1) { // L: 8593 + for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 8594 + var0.method2127(Client.field784[var14], Client.field785[var14], var3); + } + + } + } + } + } // L: 8595 } diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java index 697e78797b..c803460463 100644 --- a/runescape-client/src/main/java/class342.java +++ b/runescape-client/src/main/java/class342.java @@ -4,42 +4,37 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.concurrent.ScheduledExecutorService; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("mn") public class class342 extends AbstractQueue { - @ObfuscatedName("f") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lmt;" + descriptor = "[Lmk;" ) - class340[] field4121; - @ObfuscatedName("o") - Map field4116; - @ObfuscatedName("h") + class340[] field4104; + @ObfuscatedName("c") + Map field4105; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 205859761 + intValue = -609081385 ) - int field4117; - @ObfuscatedName("g") - final Comparator field4118; - @ObfuscatedName("l") + int field4106; + @ObfuscatedName("f") + final Comparator field4107; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -116505453 + intValue = -1292007073 ) - int field4115; + int field4108; public class342(int var1, Comparator var2) { - this.field4115 = 0; // L: 10 - this.field4121 = new class340[var1]; // L: 17 - this.field4116 = new HashMap(); // L: 18 - this.field4118 = var2; // L: 19 + this.field4108 = 0; // L: 10 + this.field4104 = new class340[var1]; // L: 17 + this.field4105 = new HashMap(); // L: 18 + this.field4107 = var2; // L: 19 } // L: 20 public class342(int var1) { @@ -49,176 +44,220 @@ public class class342 extends AbstractQueue { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1358753820" + garbageValue = "1379999236" ) - void method6346() { - int var1 = (this.field4121.length << 1) + 1; // L: 23 - this.field4121 = (class340[])((class340[])Arrays.copyOf(this.field4121, var1)); // L: 24 + void method6297() { + int var1 = (this.field4104.length << 1) + 1; // L: 23 + this.field4104 = (class340[])((class340[])Arrays.copyOf(this.field4104, var1)); // L: 24 } // L: 25 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-385967727" + garbageValue = "-54903220" ) - void method6365(int var1) { + void method6285(int var1) { class340 var2; int var3; - for (var2 = this.field4121[var1]; var1 > 0; var1 = var3) { // L: 96 97 108 - var3 = var1 - 1 >>> 1; // L: 98 - class340 var4 = this.field4121[var3]; // L: 99 - if (this.field4118 != null) { // L: 100 - if (this.field4118.compare(var2.field4107, var4.field4107) >= 0) { // L: 101 + for (var2 = this.field4104[var1]; var1 > 0; var1 = var3) { // L: 89 90 101 + var3 = var1 - 1 >>> 1; // L: 91 + class340 var4 = this.field4104[var3]; // L: 92 + if (this.field4107 != null) { // L: 93 + if (this.field4107.compare(var2.field4096, var4.field4096) >= 0) { // L: 94 break; } - } else if (((Comparable)var2.field4107).compareTo(var4.field4107) >= 0) { // L: 104 + } else if (((Comparable)var2.field4096).compareTo(var4.field4096) >= 0) { // L: 97 break; } - this.field4121[var1] = var4; // L: 106 - this.field4121[var1].field4108 = var1; // L: 107 + this.field4104[var1] = var4; // L: 99 + this.field4104[var1].field4095 = var1; // L: 100 } - this.field4121[var1] = var2; // L: 110 - this.field4121[var1].field4108 = var1; // L: 111 - } // L: 112 + this.field4104[var1] = var2; // L: 103 + this.field4104[var1].field4095 = var1; // L: 104 + } // L: 105 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2077762464" + descriptor = "(IB)V", + garbageValue = "45" ) - void method6351(int var1) { - class340 var2 = this.field4121[var1]; // L: 116 + void method6309(int var1) { + class340 var2 = this.field4104[var1]; // L: 108 int var8; - for (int var3 = this.field4117 >>> 1; var1 < var3; var1 = var8) { // L: 117 118 140 - int var4 = (var1 << 1) + 1; // L: 119 - class340 var5 = this.field4121[var4]; // L: 120 - int var6 = (var1 << 1) + 2; // L: 121 - class340 var7 = this.field4121[var6]; // L: 122 - if (this.field4118 != null) { // L: 124 - if (var6 < this.field4117 && this.field4118.compare(var5.field4107, var7.field4107) > 0) { // L: 125 + for (int var3 = this.field4106 >>> 1; var1 < var3; var1 = var8) { // L: 109 110 132 + int var4 = (var1 << 1) + 1; // L: 111 + class340 var5 = this.field4104[var4]; // L: 112 + int var6 = (var1 << 1) + 2; // L: 113 + class340 var7 = this.field4104[var6]; // L: 114 + if (this.field4107 != null) { // L: 116 + if (var6 < this.field4106 && this.field4107.compare(var5.field4096, var7.field4096) > 0) { // L: 117 var8 = var6; } else { - var8 = var4; // L: 126 + var8 = var4; // L: 118 } - } else if (var6 < this.field4117 && ((Comparable)var5.field4107).compareTo(var7.field4107) > 0) { // L: 129 + } else if (var6 < this.field4106 && ((Comparable)var5.field4096).compareTo(var7.field4096) > 0) { // L: 121 var8 = var6; } else { - var8 = var4; // L: 130 + var8 = var4; // L: 122 } - if (this.field4118 != null) { // L: 132 - if (this.field4118.compare(var2.field4107, this.field4121[var8].field4107) <= 0) { // L: 133 + if (this.field4107 != null) { // L: 124 + if (this.field4107.compare(var2.field4096, this.field4104[var8].field4096) <= 0) { // L: 125 break; } - } else if (((Comparable)var2.field4107).compareTo(this.field4121[var8].field4107) <= 0) { // L: 136 + } else if (((Comparable)var2.field4096).compareTo(this.field4104[var8].field4096) <= 0) { // L: 128 break; } - this.field4121[var1] = this.field4121[var8]; // L: 138 - this.field4121[var1].field4108 = var1; // L: 139 + this.field4104[var1] = this.field4104[var8]; // L: 130 + this.field4104[var1].field4095 = var1; // L: 131 } - this.field4121[var1] = var2; // L: 142 - this.field4121[var1].field4108 = var1; // L: 143 - } // L: 144 + this.field4104[var1] = var2; // L: 134 + this.field4104[var1].field4095 = var1; // L: 135 + } // L: 136 public boolean remove(Object var1) { - class340 var2 = (class340)this.field4116.remove(var1); // L: 77 - if (var2 == null) { // L: 78 + class340 var2 = (class340)this.field4105.remove(var1); // L: 71 + if (var2 == null) { // L: 72 return false; } else { - ++this.field4115; // L: 79 - --this.field4117; // L: 80 - if (var2.field4108 == this.field4117) { // L: 81 - this.field4121[this.field4117] = null; // L: 82 - return true; // L: 83 + ++this.field4108; // L: 73 + --this.field4106; // L: 74 + if (var2.field4095 == this.field4106) { // L: 75 + this.field4104[this.field4106] = null; // L: 76 + return true; // L: 77 } else { - class340 var3 = this.field4121[this.field4117]; // L: 85 - this.field4121[this.field4117] = null; // L: 86 - this.field4121[var2.field4108] = var3; // L: 87 - this.field4121[var2.field4108].field4108 = var2.field4108; // L: 88 - this.method6351(var2.field4108); // L: 89 - if (var3 == this.field4121[var2.field4108]) { // L: 90 - this.method6365(var2.field4108); + class340 var3 = this.field4104[this.field4106]; // L: 79 + this.field4104[this.field4106] = null; // L: 80 + this.field4104[var2.field4095] = var3; // L: 81 + this.field4104[var2.field4095].field4095 = var2.field4095; // L: 82 + this.method6309(var2.field4095); // L: 83 + if (var3 == this.field4104[var2.field4095]) { // L: 84 + this.method6285(var2.field4095); } - return true; // L: 91 + return true; // L: 85 } } } public Object peek() { - return this.field4117 == 0 ? null : this.field4121[0].field4107; // L: 54 55 - } - - public int size() { - return this.field4117; // L: 29 - } - - public boolean contains(Object var1) { - return this.field4116.containsKey(var1); // L: 148 + return this.field4106 == 0 ? null : this.field4104[0].field4096; // L: 50 51 } public Object[] toArray() { - Object[] var1 = super.toArray(); // L: 154 - if (this.field4118 != null) { - Arrays.sort(var1, this.field4118); // L: 155 + Object[] var1 = super.toArray(); // L: 143 + if (this.field4107 != null) { + Arrays.sort(var1, this.field4107); // L: 144 } else { - Arrays.sort(var1); // L: 156 + Arrays.sort(var1); // L: 145 } - return var1; // L: 157 - } - - public Iterator iterator() { - return new class341(this); // L: 162 + return var1; // L: 146 } public Object poll() { - if (this.field4117 == 0) { // L: 61 + if (this.field4106 == 0) { // L: 55 return null; } else { - ++this.field4115; // L: 62 - Object var1 = this.field4121[0].field4107; // L: 63 - this.field4116.remove(var1); // L: 64 - --this.field4117; // L: 65 - if (this.field4117 == 0) { - this.field4121[this.field4117] = null; // L: 66 + ++this.field4108; // L: 56 + Object var1 = this.field4104[0].field4096; // L: 57 + this.field4105.remove(var1); // L: 58 + --this.field4106; // L: 59 + if (this.field4106 == 0) { + this.field4104[this.field4106] = null; // L: 60 } else { - this.field4121[0] = this.field4121[this.field4117]; // L: 68 - this.field4121[0].field4108 = 0; // L: 69 - this.field4121[this.field4117] = null; // L: 70 - this.method6351(0); // L: 71 + this.field4104[0] = this.field4104[this.field4106]; // L: 62 + this.field4104[0].field4095 = 0; // L: 63 + this.field4104[this.field4106] = null; // L: 64 + this.method6309(0); // L: 65 } - return var1; // L: 73 + return var1; // L: 67 } } + public int size() { + return this.field4106; // L: 28 + } + + public Iterator iterator() { + return new class341(this); // L: 150 + } + public boolean offer(Object var1) { - if (this.field4116.containsKey(var1)) { // L: 34 + if (this.field4105.containsKey(var1)) { // L: 32 throw new IllegalArgumentException(""); } else { - ++this.field4115; // L: 35 - int var2 = this.field4117; // L: 36 - if (var2 >= this.field4121.length) { // L: 37 - this.method6346(); + ++this.field4108; // L: 33 + int var2 = this.field4106; // L: 34 + if (var2 >= this.field4104.length) { // L: 35 + this.method6297(); } - ++this.field4117; // L: 38 - if (var2 == 0) { // L: 39 - this.field4121[0] = new class340(var1, 0); // L: 40 - this.field4116.put(var1, this.field4121[0]); // L: 41 + ++this.field4106; // L: 36 + if (var2 == 0) { // L: 37 + this.field4104[0] = new class340(var1, 0); // L: 38 + this.field4105.put(var1, this.field4104[0]); // L: 39 } else { - this.field4121[var2] = new class340(var1, var2); // L: 44 - this.field4116.put(var1, this.field4121[var2]); // L: 45 - this.method6365(var2); // L: 46 + this.field4104[var2] = new class340(var1, var2); // L: 42 + this.field4105.put(var1, this.field4104[var2]); // L: 43 + this.method6285(var2); // L: 44 } - return true; // L: 48 + return true; // L: 46 + } + } + + public boolean contains(Object var1) { + return this.field4105.containsKey(var1); // L: 139 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Ldo;", + garbageValue = "901392143" + ) + static class122 method6314(int var0) { + class122 var1 = (class122)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 339 + if (var1 != null) { // L: 340 + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 342 + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 343 + boolean var5 = true; // L: 345 + byte[] var6 = var3.takeFile(var0 >> 16 & 65535, var0 & 65535); // L: 346 + class122 var2; + if (var6 == null) { // L: 347 + var5 = false; // L: 348 + var2 = null; // L: 349 + } else { + int var7 = (var6[1] & 255) << 8 | var6[2] & 255; // L: 352 + byte[] var8 = var4.getFile(var7, 0); // L: 355 + if (var8 == null) { // L: 356 + var5 = false; + } + + if (!var5) { // L: 357 + var2 = null; // L: 358 + } else { + try { + var2 = new class122(var3, var4, var0, false); // L: 362 + } catch (Exception var10) { // L: 364 + var2 = null; // L: 365 + } + } + } + + if (var2 != null) { // L: 369 + SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); + } + + return var2; // L: 370 } } } diff --git a/runescape-client/src/main/java/class345.java b/runescape-client/src/main/java/class345.java index 1e05034ec9..f79aee367c 100644 --- a/runescape-client/src/main/java/class345.java +++ b/runescape-client/src/main/java/class345.java @@ -1,70 +1,44 @@ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") +@ObfuscatedName("ma") public class class345 { - @ObfuscatedName("ry") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; @ObfuscatedName("v") @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lct;" - ) - @Export("World_request") - static UrlRequest World_request; + static final char[] cp1252AsciiExtension; static { cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 } - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "-1027496859" + descriptor = "(B)Ljava/util/Date;", + garbageValue = "12" ) - static String method6478(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 107 - if (var2 && var0 >= 0) { // L: 108 - int var3 = 2; // L: 109 + static Date method6441() throws ParseException { + SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1099 + var0.setLenient(false); // L: 1100 + StringBuilder var1 = new StringBuilder(); // L: 1101 + String[] var2 = Login.field904; // L: 1103 - for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 110 111 113 - var4 /= var1; // L: 112 - } - - char[] var5 = new char[var3]; // L: 115 - var5[0] = '+'; // L: 116 - - for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 117 - int var7 = var0; // L: 118 - var0 /= var1; // L: 119 - int var8 = var7 - var0 * var1; // L: 120 - if (var8 >= 10) { // L: 121 - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); // L: 122 - } - } - - return new String(var5); // L: 124 - } else { - return Integer.toString(var0, var1); + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1104 + String var4 = var2[var3]; // L: 1105 + if (var4 == null) { // L: 1107 + Ignored.method6828(7); // L: 1109 + class4.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1110 + return null; // L: 1112 } - } else { - throw new IllegalArgumentException("" + var1); - } - } - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-50" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 135 + var1.append(var4); // L: 1114 + } + + var1.append("12"); // L: 1118 + return var0.parse(var1.toString()); // L: 1119 } } diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java index 668c8bb965..10e7c6f98f 100644 --- a/runescape-client/src/main/java/class346.java +++ b/runescape-client/src/main/java/class346.java @@ -1,373 +1,104 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mz") public class class346 { @ObfuscatedName("v") - static char[] field4147; - @ObfuscatedName("o") - static char[] field4148; - @ObfuscatedName("h") - static char[] field4150; - @ObfuscatedName("g") - static int[] field4149; + static char[] field4136; + @ObfuscatedName("c") + static char[] field4133; + @ObfuscatedName("i") + static char[] field4134; + @ObfuscatedName("f") + static int[] field4135; static { - field4147 = new char[64]; // L: 7 + field4136 = new char[64]; // L: 7 int var0; for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field4147[var0] = (char)(var0 + 65); + field4136[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field4147[var0] = (char)(var0 + 97 - 26); + field4136[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field4147[var0] = (char)(var0 + 48 - 52); + field4136[var0] = (char)(var0 + 48 - 52); } - field4147[62] = '+'; - field4147[63] = '/'; - field4148 = new char[64]; // L: 18 + field4136[62] = '+'; // L: 11 + field4136[63] = '/'; // L: 12 + field4133 = new char[64]; // L: 18 - for (var0 = 0; var0 < 26; ++var0) { - field4148[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field4133[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field4148[var0] = (char)(var0 + 97 - 26); + field4133[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { - field4148[var0] = (char)(var0 + 48 - 52); + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field4133[var0] = (char)(var0 + 48 - 52); } - field4148[62] = '*'; - field4148[63] = '-'; - field4150 = new char[64]; + field4133[62] = '*'; // L: 22 + field4133[63] = '-'; // L: 23 + field4134 = new char[64]; // L: 29 - for (var0 = 0; var0 < 26; ++var0) { - field4150[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field4134[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field4150[var0] = (char)(var0 + 97 - 26); + field4134[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field4150[var0] = (char)(var0 + 48 - 52); + field4134[var0] = (char)(var0 + 48 - 52); } - field4150[62] = '-'; // L: 33 - field4150[63] = '_'; // L: 34 - field4149 = new int[128]; // L: 40 + field4134[62] = '-'; // L: 33 + field4134[63] = '_'; // L: 34 + field4135 = new int[128]; // L: 40 - for (var0 = 0; var0 < field4149.length; ++var0) { // L: 41 - field4149[var0] = -1; + for (var0 = 0; var0 < field4135.length; ++var0) { // L: 41 + field4135[var0] = -1; } for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field4149[var0] = var0 - 65; + field4135[var0] = var0 - 65; } for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field4149[var0] = var0 - 97 + 26; + field4135[var0] = var0 - 97 + 26; } for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field4149[var0] = var0 - 48 + 52; + field4135[var0] = var0 - 48 + 52; } - int[] var2 = field4149; // L: 45 - field4149[43] = 62; // L: 46 + int[] var2 = field4135; // L: 45 + field4135[43] = 62; // L: 46 var2[42] = 62; // L: 47 - int[] var1 = field4149; // L: 48 - field4149[47] = 63; // L: 49 + int[] var1 = field4135; // L: 48 + field4135[47] = 63; // L: 49 var1[45] = 63; // L: 50 } // L: 51 - @ObfuscatedName("v") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "(Llq;Llq;IZI)Lgo;", - garbageValue = "2016790540" + descriptor = "(Lky;I)V", + garbageValue = "-60390428" ) - public static Frames method6480(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; // L: 11 - int[] var5 = var0.getGroupFileIds(var2); // L: 12 - - for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 - byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 - if (var7 == null) { // L: 15 - var4 = false; // L: 16 - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 - byte[] var9; - if (var3) { // L: 21 - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); // L: 22 - } - - if (var9 == null) { // L: 23 - var4 = false; - } - } + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0 != null && var0.cycle == Client.field540) { // L: 11875 + Client.field715[var0.rootIndex] = true; // L: 11876 } - if (!var4) { // L: 25 - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); // L: 27 - } catch (Exception var11) { // L: 29 - return null; // L: 30 - } - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lmr;Lmr;B)V", - garbageValue = "103" - ) - static void method6482(Font var0, Font var1) { - if (class128.worldSelectBackSprites == null) { // L: 1808 - class128.worldSelectBackSprites = DirectByteArrayCopier.method5541(WorldMapData_1.archive8, "sl_back", ""); - } - - if (class162.worldSelectFlagSprites == null) { // L: 1809 - class162.worldSelectFlagSprites = class271.method5255(WorldMapData_1.archive8, "sl_flags", ""); - } - - if (Client.worldSelectArrows == null) { // L: 1810 - Client.worldSelectArrows = class271.method5255(WorldMapData_1.archive8, "sl_arrows", ""); - } - - if (class29.worldSelectStars == null) { // L: 1811 - class29.worldSelectStars = class271.method5255(WorldMapData_1.archive8, "sl_stars", ""); - } - - if (Interpreter.worldSelectLeftSprite == null) { // L: 1812 - Interpreter.worldSelectLeftSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(WorldMapData_1.archive8, "leftarrow", ""); - } - - if (class124.worldSelectRightSprite == null) { // L: 1813 - class124.worldSelectRightSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(WorldMapData_1.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1814 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1815 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1816 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1817 - if (class29.worldSelectStars != null) { // L: 1818 - class29.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1819 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1820 - class29.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1821 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1822 - } - - int var4; - int var5; - if (Client.worldSelectArrows != null) { // L: 1824 - int var2 = Login.xPadding + 280; // L: 1825 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1826 - Client.worldSelectArrows[2].drawAt(var2, 4); - } else { - Client.worldSelectArrows[0].drawAt(var2, 4); // L: 1827 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1828 - Client.worldSelectArrows[3].drawAt(var2 + 15, 4); - } else { - Client.worldSelectArrows[1].drawAt(var2 + 15, 4); // L: 1829 - } - - var0.draw("World", var2 + 32, 17, 16777215, -1); // L: 1830 - int var3 = Login.xPadding + 390; // L: 1831 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1832 - Client.worldSelectArrows[2].drawAt(var3, 4); - } else { - Client.worldSelectArrows[0].drawAt(var3, 4); // L: 1833 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1834 - Client.worldSelectArrows[3].drawAt(var3 + 15, 4); - } else { - Client.worldSelectArrows[1].drawAt(var3 + 15, 4); // L: 1835 - } - - var0.draw("Players", var3 + 32, 17, 16777215, -1); // L: 1836 - var4 = Login.xPadding + 500; // L: 1837 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1838 - Client.worldSelectArrows[2].drawAt(var4, 4); - } else { - Client.worldSelectArrows[0].drawAt(var4, 4); // L: 1839 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1840 - Client.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - Client.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1841 - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1842 - var5 = Login.xPadding + 610; // L: 1843 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1844 - Client.worldSelectArrows[2].drawAt(var5, 4); - } else { - Client.worldSelectArrows[0].drawAt(var5, 4); // L: 1845 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1846 - Client.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - Client.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1847 - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1848 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1850 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1851 - Login.hoveredWorldIndex = -1; // L: 1852 - if (class128.worldSelectBackSprites != null) { // L: 1853 - byte var23 = 88; // L: 1854 - byte var24 = 19; // L: 1855 - var4 = 765 / (var23 + 1) - 1; // L: 1856 - var5 = 480 / (var24 + 1); // L: 1857 - - int var6; - int var7; - do { - var6 = var5; // L: 1859 - var7 = var4; // L: 1860 - if (var5 * (var4 - 1) >= World.World_count) { // L: 1861 - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { // L: 1862 - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { // L: 1863 - --var5; - } - } while(var5 != var6 || var7 != var4); // L: 1864 - - var6 = (765 - var23 * var4) / (var4 + 1); // L: 1866 - if (var6 > 5) { // L: 1867 - var6 = 5; - } - - var7 = (480 - var5 * var24) / (var5 + 1); // L: 1868 - if (var7 > 5) { // L: 1869 - var7 = 5; - } - - int var8 = (765 - var4 * var23 - var6 * (var4 - 1)) / 2; // L: 1870 - int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; // L: 1871 - int var10 = (var5 + World.World_count - 1) / var5; // L: 1872 - Login.worldSelectPagesCount = var10 - var4; // L: 1873 - if (Interpreter.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1874 - Interpreter.worldSelectLeftSprite.drawAt(8, class309.canvasHeight / 2 - Interpreter.worldSelectLeftSprite.subHeight / 2); // L: 1875 - } - - if (class124.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1877 - class124.worldSelectRightSprite.drawAt(class4.canvasWidth - class124.worldSelectRightSprite.subWidth - 8, class309.canvasHeight / 2 - class124.worldSelectRightSprite.subHeight / 2); // L: 1878 - } - - int var11 = var9 + 23; // L: 1880 - int var12 = var8 + Login.xPadding; // L: 1881 - int var13 = 0; // L: 1882 - boolean var14 = false; // L: 1883 - int var15 = Login.worldSelectPage; // L: 1884 - - int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1885 1886 - World var17 = World.World_worlds[var16]; // L: 1889 - boolean var18 = true; // L: 1890 - String var19 = Integer.toString(var17.population); // L: 1891 - if (var17.population == -1) { // L: 1892 - var19 = "OFF"; // L: 1893 - var18 = false; // L: 1894 - } else if (var17.population > 1980) { // L: 1896 - var19 = "FULL"; // L: 1897 - var18 = false; // L: 1898 - } - - int var21 = 0; // L: 1901 - byte var20; - if (var17.isBeta()) { // L: 1902 - if (var17.isMembersOnly()) { // L: 1903 - var20 = 7; - } else { - var20 = 6; // L: 1904 - } - } else if (var17.isDeadman()) { // L: 1906 - var21 = 16711680; // L: 1907 - if (var17.isMembersOnly()) { // L: 1908 - var20 = 5; - } else { - var20 = 4; // L: 1909 - } - } else if (var17.method1638()) { // L: 1911 - if (var17.isMembersOnly()) { // L: 1912 - var20 = 9; - } else { - var20 = 8; // L: 1913 - } - } else if (var17.isPvp()) { // L: 1915 - if (var17.isMembersOnly()) { // L: 1916 - var20 = 3; - } else { - var20 = 2; // L: 1917 - } - } else if (var17.isMembersOnly()) { // L: 1920 - var20 = 1; - } else { - var20 = 0; // L: 1921 - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var23 + var12 && MouseHandler.MouseHandler_y < var11 + var24 && var18) { // L: 1923 - Login.hoveredWorldIndex = var16; // L: 1924 - class128.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); // L: 1925 - var14 = true; // L: 1926 - } else { - class128.worldSelectBackSprites[var20].drawAt(var12, var11); // L: 1928 - } - - if (class162.worldSelectFlagSprites != null) { // L: 1929 - class162.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); // L: 1930 - var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); // L: 1931 - var11 = var11 + var24 + var7; // L: 1932 - ++var13; // L: 1933 - if (var13 >= var5) { - var11 = var9 + 23; // L: 1934 - var12 = var12 + var23 + var6; // L: 1935 - var13 = 0; // L: 1936 - ++var15; // L: 1937 - } - } - - if (var14) { // L: 1940 - var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1941 - int var22 = var1.ascent + 8; // L: 1942 - int var25 = MouseHandler.MouseHandler_y + 25; // L: 1943 - if (var25 + var22 > 480) { // L: 1944 - var25 = MouseHandler.MouseHandler_y - 25 - var22; // L: 1945 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 16777120); // L: 1947 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 0); // L: 1948 - var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); // L: 1949 - } - } - - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 1952 - } // L: 1953 + } // L: 11878 } diff --git a/runescape-client/src/main/java/class347.java b/runescape-client/src/main/java/class347.java new file mode 100644 index 0000000000..a60b8bcc39 --- /dev/null +++ b/runescape-client/src/main/java/class347.java @@ -0,0 +1,10 @@ +import java.security.SecureRandom; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mt") +public final class class347 { + @ObfuscatedName("fh") + @Export("secureRandom") + static SecureRandom secureRandom; +} diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java new file mode 100644 index 0000000000..fd6421927f --- /dev/null +++ b/runescape-client/src/main/java/class348.java @@ -0,0 +1,30 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mo") +public class class348 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ZS)V", + garbageValue = "255" + ) + static void method6505(boolean var0) { + byte var1 = 0; // L: 1133 + if (!BufferedSource.method6889()) { // L: 1134 + var1 = 12; // L: 1135 + } else if (class127.client.method1532() || class127.client.method1476()) { // L: 1137 + var1 = 10; // L: 1138 + } + + Ignored.method6828(var1); // L: 1140 + if (var0) { // L: 1141 + Login.Login_username = ""; // L: 1142 + Login.Login_password = ""; // L: 1143 + WorldMapID.field2386 = 0; // L: 1144 + HealthBar.otp = ""; // L: 1145 + } + + Players.method2421(); // L: 1147 + class12.method157(); // L: 1148 + } // L: 1149 +} diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java index c85f6cf544..a41c5a7e5e 100644 --- a/runescape-client/src/main/java/class349.java +++ b/runescape-client/src/main/java/class349.java @@ -1,58 +1,76 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mh") public final class class349 { @ObfuscatedName("v") @Export("base37Table") - static final char[] base37Table; - @ObfuscatedName("o") - static long[] field4155; + public static final char[] base37Table; + @ObfuscatedName("c") + static long[] field4142; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("HitSplatDefinition_fontsArchive") + static AbstractArchive HitSplatDefinition_fontsArchive; static { base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4 - field4155 = new long[12]; // L: 5 + field4142 = new long[12]; // L: 5 - for (int var0 = 0; var0 < field4155.length; ++var0) { // L: 8 - field4155[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field4142.length; ++var0) { // L: 8 + field4142[var0] = (long)Math.pow(37.0D, (double)var0); } } // L: 9 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lcv;", - garbageValue = "77762889" + descriptor = "(ILpi;I)Lfj;", + garbageValue = "-307481051" ) - static ClientPreferences method6537() { - AccessFile var0 = null; // L: 112 - ClientPreferences var1 = new ClientPreferences(); // L: 113 + public static class168 method6509(int var0, Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 24 + boolean var3 = (var2 & 1) != 0; // L: 25 + boolean var4 = (var2 & 2) != 0; // L: 26 + class168 var5 = new class168(var0); // L: 27 + int var6; + int[] var7; + boolean var8; + int var9; + short var10; + if (var3) { // L: 28 + var6 = var1.readUnsignedByte(); // L: 29 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 + var8 = var5.field1791 != null && var7.length == var5.field1791.length; // L: 33 - try { - var0 = ReflectionCheck.getPreferencesFile("", Login.field917.name, false); // L: 115 - byte[] var2 = new byte[(int)var0.length()]; // L: 116 - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 117 118 121 - var4 = var0.read(var2, var3, var2.length - var3); // L: 119 - if (var4 == -1) { - throw new IOException(); // L: 120 + for (var9 = 0; var9 < 2; ++var9) { // L: 34 + if (var7[var9] != 15) { // L: 35 + var10 = (short)var1.readUnsignedShort(); // L: 36 + if (var8) { // L: 37 + var5.field1791[var7[var9]] = var10; // L: 38 + } } } - - var1 = new ClientPreferences(new Buffer(var2)); // L: 123 - } catch (Exception var6) { // L: 125 } - try { - if (var0 != null) { // L: 127 - var0.close(); + if (var4) { // L: 43 + var6 = var1.readUnsignedByte(); // L: 44 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 + var8 = var5.field1790 != null && var7.length == var5.field1790.length; // L: 48 + + for (var9 = 0; var9 < 2; ++var9) { // L: 49 + if (var7[var9] != 15) { // L: 50 + var10 = (short)var1.readUnsignedShort(); // L: 51 + if (var8) { // L: 52 + var5.field1790[var7[var9]] = var10; // L: 53 + } + } } - } catch (Exception var5) { // L: 129 } - return var1; // L: 130 + return var5; // L: 58 } } diff --git a/runescape-client/src/main/java/class350.java b/runescape-client/src/main/java/class350.java index 2024f35f52..07848a8d7c 100644 --- a/runescape-client/src/main/java/class350.java +++ b/runescape-client/src/main/java/class350.java @@ -1,7 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mc") +@ObfuscatedName("mb") public class class350 { @ObfuscatedName("v") @Export("writeRandomDat") @@ -51,7 +51,7 @@ public class class350 { } // L: 49 - @ObfuscatedName("r") + @ObfuscatedName("o") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java index 0f657ac923..b8be834e36 100644 --- a/runescape-client/src/main/java/class351.java +++ b/runescape-client/src/main/java/class351.java @@ -1,52 +1,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") +@ObfuscatedName("mp") public class class351 { - @ObfuscatedName("si") - @ObfuscatedGetter( - intValue = 657587037 - ) - static int field4157; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 625961515 + intValue = 1823563099 ) - int field4162; - @ObfuscatedName("o") + int field4151; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -703933987 + intValue = 724631607 ) - int field4156; - @ObfuscatedName("h") + int field4146; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1716197001 + intValue = 159823091 ) - int field4158; - @ObfuscatedName("g") + int field4148; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1542841635 + intValue = -1148185313 ) - int field4159; + int field4149; public String toString() { - boolean var1 = true; // L: 15 - int var2 = 10 - Integer.toString(this.field4162).length(); // L: 16 - int var3 = 10 - Integer.toString(this.field4158).length(); // L: 17 - int var4 = 10 - Integer.toString(this.field4156).length(); - String var5 = " ".substring(10 - var2); // L: 19 - String var6 = " ".substring(10 - var3); // L: 20 - String var7 = " ".substring(10 - var4); // L: 21 - return " Size: " + this.field4162 + var5 + "Created: " + this.field4156 + var7 + "Total used: " + this.field4158 + var6 + "Max-In-Use: " + this.field4159; // L: 22 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1708289498" - ) - static String method6579(int var0) { - return ""; // L: 18 + int var2 = 10 - Integer.toString(this.field4151).length(); // L: 15 + int var3 = 10 - Integer.toString(this.field4148).length(); // L: 16 + int var4 = 10 - Integer.toString(this.field4146).length(); // L: 17 + String var5 = " ".substring(10 - var2); // L: 18 + String var6 = " ".substring(10 - var3); // L: 19 + String var7 = " ".substring(10 - var4); // L: 20 + return " Size: " + this.field4151 + var5 + "Created: " + this.field4146 + var7 + "Total used: " + this.field4148 + var6 + "Max-In-Use: " + this.field4149; // L: 21 } } diff --git a/runescape-client/src/main/java/class355.java b/runescape-client/src/main/java/class355.java deleted file mode 100644 index 7162ed97b5..0000000000 --- a/runescape-client/src/main/java/class355.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mw") -public class class355 { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "[Lqx;" - ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "-56" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 92 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-538784934" - ) - public static boolean method6620(int var0) { - return (var0 >> 22 & 1) != 0; // L: 29 - } -} diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java index 96f7705f19..043d6a7970 100644 --- a/runescape-client/src/main/java/class356.java +++ b/runescape-client/src/main/java/class356.java @@ -1,47 +1,36 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("mi") public class class356 { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "33344244" + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -29527757 ) - public static boolean method6621() { - try { - if (class273.musicPlayerStatus == 2) { // L: 70 - if (class273.musicTrack == null) { // L: 71 - class273.musicTrack = MusicTrack.readTrack(class147.musicTrackArchive, ArchiveLoader.musicTrackGroupId, class273.musicTrackFileId); // L: 72 - if (class273.musicTrack == null) { // L: 73 - return false; - } - } + static int field4185; - if (class273.soundCache == null) { // L: 75 - class273.soundCache = new SoundCache(class273.soundEffectsArchive, class273.musicSamplesArchive); - } - - if (WorldMapEvent.midiPcmStream.loadMusicTrack(class273.musicTrack, class273.musicPatchesArchive, class273.soundCache, 22050)) { // L: 76 - WorldMapEvent.midiPcmStream.clearAll(); // L: 77 - WorldMapEvent.midiPcmStream.setPcmStreamVolume(DevicePcmPlayerProvider.musicTrackVolume); // L: 78 - WorldMapEvent.midiPcmStream.setMusicTrack(class273.musicTrack, class260.musicTrackBoolean); // L: 79 - class273.musicPlayerStatus = 0; // L: 80 - class273.musicTrack = null; // L: 81 - class273.soundCache = null; // L: 82 - class147.musicTrackArchive = null; // L: 83 - return true; // L: 84 - } - } - } catch (Exception var1) { // L: 88 - var1.printStackTrace(); // L: 89 - WorldMapEvent.midiPcmStream.clear(); // L: 90 - class273.musicPlayerStatus = 0; // L: 91 - class273.musicTrack = null; // L: 92 - class273.soundCache = null; // L: 93 - class147.musicTrackArchive = null; // L: 94 + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "1300878569" + ) + static int method6582(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { // L: 2322 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2323 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.method5187(var3) ? 1 : 0; // L: 2324 + return 1; // L: 2325 + } else if (var0 == 3501) { // L: 2327 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2328 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1130(var3) ? 1 : 0; // L: 2329 + return 1; // L: 2330 + } else if (var0 == 3502) { // L: 2332 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2333 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1138(var3) ? 1 : 0; // L: 2334 + return 1; // L: 2335 + } else { + return 2; // L: 2337 } - - return false; // L: 96 } } diff --git a/runescape-client/src/main/java/class357.java b/runescape-client/src/main/java/class357.java new file mode 100644 index 0000000000..772e1b2a0a --- /dev/null +++ b/runescape-client/src/main/java/class357.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mm") +public class class357 { + @ObfuscatedName("w") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; +} diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java index 679d7b2884..cf6287b562 100644 --- a/runescape-client/src/main/java/class358.java +++ b/runescape-client/src/main/java/class358.java @@ -1,31 +1,20 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("mc") public class class358 { - @ObfuscatedName("ai") + @ObfuscatedName("lf") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-16" + descriptor = "(Lky;II)Ljava/lang/String;", + garbageValue = "-707928815" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 4722 - if (MusicPatchNode2.loadInterface(var0)) { // L: 4723 - Widget[] var1 = EnumComposition.Widget_interfaceComponents[var0]; // L: 4724 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725 - Widget var3 = var1[var2]; // L: 4726 - if (var3.onLoad != null) { // L: 4727 - ScriptEvent var4 = new ScriptEvent(); // L: 4728 - var4.widget = var3; // L: 4729 - var4.args = var3.onLoad; // L: 4730 - class175.runScript(var4, 5000000, 0); // L: 4731 - } - } - - } + static String method6583(Widget var0, int var1) { + int var3 = class326.getWidgetFlags(var0); // L: 12468 + boolean var2 = (var3 >> var1 + 1 & 1) != 0; // L: 12470 + if (!var2 && var0.onOp == null) { // L: 12472 + 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; // L: 12473 12474 12476 } - } // L: 4734 + } } diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java index 12fa7479b5..69617c9554 100644 --- a/runescape-client/src/main/java/class359.java +++ b/runescape-client/src/main/java/class359.java @@ -1,73 +1,31 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("mh") +@ObfuscatedName("mx") public class class359 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmx;" ) - public static final class359 field4222; - @ObfuscatedName("o") + public static final class359 field4204; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmx;" ) - static final class359 field4220; - @ObfuscatedName("h") + static final class359 field4205; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1598216455 + intValue = -916709349 ) - final int field4219; + final int field4206; static { - field4222 = new class359(1); // L: 5 - field4220 = new class359(0); // L: 6 + field4204 = new class359(1); // L: 5 + field4205 = new class359(0); // L: 6 } class359(int var1) { - this.field4219 = var1; // L: 10 + this.field4206 = var1; // L: 10 } // L: 11 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-1840227815" - ) - public static byte[] method6624(byte[] var0) { - int var1 = var0.length; // L: 35 - byte[] var2 = new byte[var1]; // L: 36 - System.arraycopy(var0, 0, var2, 0, var1); // L: 37 - return var2; // L: 38 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "1772105666" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 212 - return Byte.TYPE; - } else if (var0.equals("I")) { // L: 213 - return Integer.TYPE; - } else if (var0.equals("S")) { // L: 214 - return Short.TYPE; - } else if (var0.equals("J")) { // L: 215 - return Long.TYPE; - } else if (var0.equals("Z")) { // L: 216 - return Boolean.TYPE; - } else if (var0.equals("F")) { // L: 217 - return Float.TYPE; - } else if (var0.equals("D")) { // L: 218 - return Double.TYPE; - } else if (var0.equals("C")) { // L: 219 - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 220 221 - } - } } diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java index 10f3b0cd55..e9c0763a21 100644 --- a/runescape-client/src/main/java/class360.java +++ b/runescape-client/src/main/java/class360.java @@ -1,17 +1,27 @@ +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.text.ParseException; import java.util.Comparator; +import java.util.Date; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("ml") class class360 implements Comparator { + @ObfuscatedName("fj") + static String field4209; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lms;" + descriptor = "Lmg;" ) final class361 this$0; @ObfuscatedSignature( - descriptor = "(Lms;)V" + descriptor = "(Lmg;)V" ) class360(class361 var1) { this.this$0 = var1; // L: 7 @@ -19,47 +29,930 @@ class class360 implements Comparator { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmv;Lmv;S)I", - garbageValue = "-9501" + descriptor = "(Lmv;Lmv;I)I", + garbageValue = "1269106031" ) - int method6627(class362 var1, class362 var2) { - if (var1.field4236 > var2.field4236) { - return 1; // L: 9 + int method6585(class362 var1, class362 var2) { + if (var1.field4222 > var2.field4222) { // L: 9 + return 1; } else { - return var1.field4236 < var2.field4236 ? -1 : 0; // L: 10 11 + return var1.field4222 < var2.field4222 ? -1 : 0; // L: 10 11 } } public int compare(Object var1, Object var2) { - return this.method6627((class362)var1, (class362)var2); // L: 15 + return this.method6585((class362)var1, (class362)var2); // L: 15 } public boolean equals(Object var1) { return super.equals(var1); // L: 19 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2758570" + descriptor = "(IIILgj;II)V", + garbageValue = "-1591189890" ) - static String method6636() { - String var0; - if (Interpreter.clientPreferences.method2257()) { // L: 279 - String var2 = Login.Login_username; // L: 281 - int var4 = var2.length(); // L: 284 - char[] var5 = new char[var4]; // L: 286 - - for (int var6 = 0; var6 < var4; ++var6) { // L: 287 - var5[var6] = '*'; - } - - String var3 = new String(var5); // L: 288 - var0 = var3; // L: 292 - } else { - var0 = Login.Login_username; // L: 294 + static void method6589(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); // L: 67 + var5.plane = var0; // L: 68 + var5.x = var1 * 128; // L: 69 + var5.y = var2 * 128; // L: 70 + int var6 = var3.sizeX; // L: 71 + int var7 = var3.sizeY; // L: 72 + if (var4 == 1 || var4 == 3) { // L: 73 + var6 = var3.sizeY; // L: 74 + var7 = var3.sizeX; // L: 75 } - return var0; // L: 295 - } + var5.maxX = (var6 + var1) * 128; // L: 77 + var5.maxY = (var7 + var2) * 128; // L: 78 + var5.soundEffectId = var3.ambientSoundId; // L: 79 + var5.field814 = var3.int7 * 128; // L: 80 + var5.field818 = var3.int5; // L: 81 + var5.field810 = var3.int6; // L: 82 + var5.soundEffectIds = var3.soundEffectIds; // L: 83 + if (var3.transforms != null) { // L: 84 + var5.obj = var3; // L: 85 + var5.set(); // L: 86 + } + + ObjectSound.objectSounds.addFirst(var5); // L: 88 + if (var5.soundEffectIds != null) { // L: 89 + var5.field821 = var5.field818 + (int)(Math.random() * (double)(var5.field810 - var5.field818)); + } + + } // L: 90 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lao;Lmd;B)V", + garbageValue = "3" + ) + static void method6592(GameEngine var0, Font var1) { + int var4; + int var38; + if (Login.worldSelectOpen) { // L: 309 + while (true) { + if (!SecureRandomCallable.isKeyDown()) { // L: 311 + if (MouseHandler.MouseHandler_lastButton != 1 && (GameBuild.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 332 + break; + } + + int var2 = Login.xPadding + 280; // L: 333 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 334 + Players.changeWorldSelectSorting(0, 0); // L: 335 + break; // L: 336 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 338 + Players.changeWorldSelectSorting(0, 1); // L: 339 + break; // L: 340 + } + + int var3 = Login.xPadding + 390; // L: 342 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 343 + Players.changeWorldSelectSorting(1, 0); // L: 344 + break; // L: 345 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 347 + Players.changeWorldSelectSorting(1, 1); // L: 348 + break; // L: 349 + } + + var4 = Login.xPadding + 500; // L: 351 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 352 + Players.changeWorldSelectSorting(2, 0); // L: 353 + break; // L: 354 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 356 + Players.changeWorldSelectSorting(2, 1); // L: 357 + break; // L: 358 + } + + var38 = Login.xPadding + 610; // L: 360 + if (MouseHandler.MouseHandler_lastPressedX >= var38 && MouseHandler.MouseHandler_lastPressedX <= var38 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 361 + Players.changeWorldSelectSorting(3, 0); // L: 362 + break; // L: 363 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var38 + 15 && MouseHandler.MouseHandler_lastPressedX <= var38 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 365 + Players.changeWorldSelectSorting(3, 1); // L: 366 + break; // L: 367 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 369 + Login.worldSelectOpen = false; // L: 371 + class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 372 + ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 373 + Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 374 + break; // L: 376 + } + + if (Login.hoveredWorldIndex != -1) { // L: 378 + World var6 = DevicePcmPlayerProvider.World_worlds[Login.hoveredWorldIndex]; // L: 379 + PlatformInfo.changeWorld(var6); // L: 380 + Login.worldSelectOpen = false; // L: 382 + class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 383 + ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 384 + Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 385 + } else { + if (Login.worldSelectPage > 0 && class54.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class54.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class321.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class321.canvasHeight / 2 + 50) { // L: 389 + --Login.worldSelectPage; // L: 390 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && AttackOption.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= InvDefinition.canvasWidth - AttackOption.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= InvDefinition.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class321.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class321.canvasHeight / 2 + 50) { // L: 392 + ++Login.worldSelectPage; // L: 393 + } + } + break; + } + + if (GameEngine.field218 == 13) { // L: 312 + Login.worldSelectOpen = false; // L: 314 + class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 315 + ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 316 + Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 317 + break; // L: 319 + } + + if (GameEngine.field218 == 96) { // L: 321 + if (Login.worldSelectPage > 0 && class54.worldSelectLeftSprite != null) { // L: 322 + --Login.worldSelectPage; // L: 323 + } + } else if (GameEngine.field218 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && AttackOption.worldSelectRightSprite != null) { // L: 326 327 + ++Login.worldSelectPage; // L: 328 + } + } + + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 399 + class131.clientPreferences.method2237(!class131.clientPreferences.method2279()); // L: 400 + if (!class131.clientPreferences.method2279()) { // L: 401 + MidiPcmStream.method5368(class16.archive6, "scape main", "", 255, false); + } else { + class273.midiPcmStream.clear(); // L: 403 + class273.musicPlayerStatus = 1; // L: 404 + class273.musicTrackArchive = null; // L: 405 + } + } + + if (Client.gameState != 5) { // L: 408 + if (-1L == Login.field915) { // L: 409 + Login.field915 = class136.method2931() + 1000L; // L: 410 + } + + long var20 = class136.method2931(); // L: 412 + if (PendingSpawn.method2166() && -1L == Login.field916) { // L: 413 414 + Login.field916 = var20; // L: 415 + if (Login.field916 > Login.field915) { // L: 416 + Login.field915 = Login.field916; // L: 417 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 421 + if (Language.Language_EN == Skills.clientLanguage) { // L: 422 + if (MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 423 + var4 = Login.xPadding + 5; // L: 424 + short var5 = 463; // L: 425 + byte var22 = 100; // L: 426 + byte var7 = 35; // L: 427 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var22 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 428 + SoundCache.method768(); // L: 429 + return; // L: 430 + } + } + + if (class293.World_request != null) { // L: 433 + SoundCache.method768(); + } + } + + var4 = MouseHandler.MouseHandler_lastButton; // L: 435 + var38 = MouseHandler.MouseHandler_lastPressedX; // L: 436 + int var52 = MouseHandler.MouseHandler_lastPressedY; // L: 437 + if (var4 == 0) { // L: 438 + var38 = MouseHandler.MouseHandler_x; // L: 439 + var52 = MouseHandler.MouseHandler_y; // L: 440 + } + + if (!GameBuild.mouseCam && var4 == 4) { // L: 442 + var4 = 1; + } + + int var41; + short var42; + if (Login.loginIndex == 0) { // L: 443 + boolean var50 = false; // L: 444 + + while (SecureRandomCallable.isKeyDown()) { // L: 445 + if (GameEngine.field218 == 84) { // L: 446 + var50 = true; // L: 447 + } + } + + var41 = HealthBarDefinition.loginBoxCenter - 80; // L: 450 + var42 = 291; // L: 451 + if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 452 + class391.openURL(ArchiveLoader.method2063("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 453 + } + + var41 = HealthBarDefinition.loginBoxCenter + 80; // L: 455 + if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20 || var50) { // L: 456 + if ((Client.worldProperties & 33554432) != 0) { // L: 457 + Login.Login_response0 = ""; // L: 458 + Login.Login_response1 = "This is a Beta world."; // L: 459 + Login.Login_response2 = "Your normal account will not be affected."; // L: 460 + Login.Login_response3 = ""; // L: 461 + Ignored.method6828(1); // L: 462 + class12.method157(); // L: 463 + } else if ((Client.worldProperties & 4) != 0) { // L: 465 + if ((Client.worldProperties & 1024) != 0) { // L: 466 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 467 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 468 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 469 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 472 + Login.Login_response2 = "Players can attack each other"; // L: 473 + Login.Login_response3 = "almost everywhere."; // L: 474 + } + + Login.Login_response0 = "Warning!"; // L: 476 + Ignored.method6828(1); // L: 477 + class12.method157(); // L: 478 + } else if ((Client.worldProperties & 1024) != 0) { // L: 480 + Login.Login_response1 = "This is a High Risk world."; // L: 481 + Login.Login_response2 = "The Protect Item prayer will"; // L: 482 + Login.Login_response3 = "not work on this world."; // L: 483 + Login.Login_response0 = "Warning!"; // L: 484 + Ignored.method6828(1); // L: 485 + class12.method157(); // L: 486 + } else { + Messages.Login_promptCredentials(false); // L: 489 + } + } + } else { + short var8; + int var39; + if (Login.loginIndex == 1) { // L: 493 + while (true) { + if (!SecureRandomCallable.isKeyDown()) { // L: 494 + var39 = HealthBarDefinition.loginBoxCenter - 80; // L: 502 + var8 = 321; // L: 503 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 504 + Messages.Login_promptCredentials(false); // L: 505 + } + + var39 = HealthBarDefinition.loginBoxCenter + 80; // L: 507 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 508 + Ignored.method6828(0); // L: 509 + } + break; + } + + if (GameEngine.field218 == 84) { // L: 495 + Messages.Login_promptCredentials(false); // L: 496 + } else if (GameEngine.field218 == 13) { // L: 498 + Ignored.method6828(0); // L: 499 + } + } + } else { + int var11; + int var12; + short var40; + boolean var43; + if (Login.loginIndex == 2) { // L: 512 + var40 = 201; // L: 513 + var39 = var40 + 52; // L: 514 + if (var4 == 1 && var52 >= var39 - 12 && var52 < var39 + 2) { // L: 515 + Login.currentLoginField = 0; + } + + var39 += 15; // L: 516 + if (var4 == 1 && var52 >= var39 - 12 && var52 < var39 + 2) { // L: 517 + Login.currentLoginField = 1; + } + + var39 += 15; // L: 518 + var40 = 361; // L: 519 + if (class113.field1378 != null) { // L: 520 + var41 = class113.field1378.highX / 2; // L: 521 + if (var4 == 1 && var38 >= class113.field1378.lowX - var41 && var38 <= var41 + class113.field1378.lowX && var52 >= var40 - 15 && var52 < var40) { // L: 522 + switch(Login.field895) { // L: 523 + case 1: + class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 531 + Ignored.method6828(5); // L: 532 + return; // L: 533 + case 2: + class391.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 526 + } + } + } + + var41 = HealthBarDefinition.loginBoxCenter - 80; // L: 538 + var42 = 321; // L: 539 + if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 540 + Login.Login_username = Login.Login_username.trim(); // L: 541 + if (Login.Login_username.length() == 0) { // L: 542 + class4.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 543 + return; // L: 544 + } + + if (Login.Login_password.length() == 0) { // L: 546 + class4.setLoginResponseString("", "Please enter your password.", ""); // L: 547 + return; // L: 548 + } + + class4.setLoginResponseString("", "Connecting to server...", ""); // L: 550 + class302.method5766(false); // L: 551 + Decimator.updateGameState(20); // L: 552 + return; // L: 553 + } + + var41 = Login.loginBoxX + 180 + 80; // L: 555 + if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 556 + Ignored.method6828(0); // L: 557 + Login.Login_username = ""; // L: 558 + Login.Login_password = ""; // L: 559 + WorldMapID.field2386 = 0; // L: 560 + HealthBar.otp = ""; // L: 561 + Login.field907 = true; // L: 562 + } + + var41 = HealthBarDefinition.loginBoxCenter + -117; // L: 564 + var42 = 277; // L: 565 + Login.field909 = var38 >= var41 && var38 < var41 + AbstractSocket.field4275 && var52 >= var42 && var52 < var42 + Occluder.field2687; // L: 566 + if (var4 == 1 && Login.field909) { // L: 567 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 568 + if (!Client.Login_isUsernameRemembered && class131.clientPreferences.method2247() != null) { // L: 569 + class131.clientPreferences.method2286((String)null); // L: 570 + } + } + + var41 = HealthBarDefinition.loginBoxCenter + 24; // L: 573 + var42 = 277; // L: 574 + Login.field906 = var38 >= var41 && var38 < var41 + AbstractSocket.field4275 && var52 >= var42 && var52 < var42 + Occluder.field2687; // L: 575 + if (var4 == 1 && Login.field906) { // L: 576 + class131.clientPreferences.method2230(!class131.clientPreferences.method2317()); // L: 577 + if (!class131.clientPreferences.method2317()) { // L: 578 + Login.Login_username = ""; // L: 579 + class131.clientPreferences.method2286((String)null); // L: 580 + class12.method157(); // L: 581 + } + } + + label1472: + while (true) { + Transferable var54; + do { + while (true) { + label1436: + do { + while (true) { + while (SecureRandomCallable.isKeyDown()) { // L: 584 + if (GameEngine.field218 != 13) { // L: 585 + if (Login.currentLoginField != 0) { // L: 594 + continue label1436; + } + + char var44 = ItemComposition.field2121; // L: 595 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var44 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 597 598 + } + + if (GameEngine.field218 == 85 && Login.Login_username.length() > 0) { // L: 601 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (GameEngine.field218 == 84 || GameEngine.field218 == 80) { // L: 602 + Login.currentLoginField = 1; + } + + char var46 = ItemComposition.field2121; // L: 604 + boolean var47 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var46) != -1; // L: 606 + if (var47 && Login.Login_username.length() < 320) { // L: 608 + Login.Login_username = Login.Login_username + ItemComposition.field2121; + } + } else { + Ignored.method6828(0); // L: 586 + Login.Login_username = ""; // L: 587 + Login.Login_password = ""; // L: 588 + WorldMapID.field2386 = 0; // L: 589 + HealthBar.otp = ""; // L: 590 + Login.field907 = true; // L: 591 + } + } + + return; // L: 1096 + } + } while(Login.currentLoginField != 1); // L: 610 + + if (GameEngine.field218 == 85 && Login.Login_password.length() > 0) { // L: 611 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 612 + } else if (GameEngine.field218 == 84 || GameEngine.field218 == 80) { // L: 614 + Login.currentLoginField = 0; // L: 615 + if (GameEngine.field218 == 84) { // L: 616 + Login.Login_username = Login.Login_username.trim(); // L: 617 + if (Login.Login_username.length() == 0) { // L: 618 + class4.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 619 + return; // L: 620 + } + + if (Login.Login_password.length() == 0) { // L: 622 + class4.setLoginResponseString("", "Please enter your password.", ""); // L: 623 + return; // L: 624 + } + + class4.setLoginResponseString("", "Connecting to server...", ""); // L: 626 + class302.method5766(false); // L: 627 + Decimator.updateGameState(20); // L: 628 + return; // L: 629 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && GameEngine.field218 == 67) { // L: 632 + Clipboard var53 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 633 + var54 = var53.getContents(class127.client); // L: 634 + var12 = 20 - Login.Login_password.length(); // L: 635 + break; + } + + if (WorldMapSection0.method4303(ItemComposition.field2121)) { // L: 660 + char var48 = ItemComposition.field2121; // L: 662 + var43 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var48) != -1; // L: 664 + if (var43 && Login.Login_password.length() < 20) { // L: 666 667 + Login.Login_password = Login.Login_password + ItemComposition.field2121; // L: 668 + } + } + } + } while(var12 <= 0); // L: 636 + + try { + String var13 = (String)var54.getTransferData(DataFlavor.stringFlavor); // L: 638 + int var14 = Math.min(var12, var13.length()); // L: 639 + int var49 = 0; + + while (true) { + if (var49 >= var14) { + Login.Login_password = Login.Login_password + var13.substring(0, var14); // L: 654 + continue label1472; + } + + if (!WorldMapSection0.method4303(var13.charAt(var49))) { // L: 642 + break; + } + + char var51 = var13.charAt(var49); // L: 644 + boolean var16 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var51) != -1; // L: 646 + if (!var16) { // L: 648 + break; + } + + ++var49; // L: 640 + } + + Ignored.method6828(3); // L: 650 + return; // L: 651 + } catch (UnsupportedFlavorException var36) { // L: 656 + } catch (IOException var37) { // L: 657 + } + } + } else if (Login.loginIndex == 3) { // L: 676 + var39 = Login.loginBoxX + 180; // L: 677 + var8 = 276; // L: 678 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 679 + class348.method6505(false); // L: 680 + } + + var39 = Login.loginBoxX + 180; // L: 682 + var8 = 326; // L: 683 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 684 + class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 685 + Ignored.method6828(5); // L: 686 + return; // L: 687 + } + } else { + int var10; + if (Login.loginIndex == 4) { // L: 690 + var39 = Login.loginBoxX + 180 - 80; // L: 691 + var8 = 321; // L: 692 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 693 + HealthBar.otp.trim(); // L: 694 + if (HealthBar.otp.length() != 6) { // L: 695 + class4.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 696 + return; // L: 697 + } + + WorldMapID.field2386 = Integer.parseInt(HealthBar.otp); // L: 699 + HealthBar.otp = ""; // L: 700 + class302.method5766(true); // L: 701 + class4.setLoginResponseString("", "Connecting to server...", ""); // L: 702 + Decimator.updateGameState(20); // L: 703 + return; // L: 704 + } + + if (var4 == 1 && var38 >= Login.loginBoxX + 180 - 9 && var38 <= Login.loginBoxX + 180 + 130 && var52 >= 263 && var52 <= 296) { // L: 706 + Login.field907 = !Login.field907; // L: 707 + } + + if (var4 == 1 && var38 >= Login.loginBoxX + 180 - 34 && var38 <= Login.loginBoxX + 34 + 180 && var52 >= 351 && var52 <= 363) { // L: 709 + class391.openURL(ArchiveLoader.method2063("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 710 + } + + var39 = Login.loginBoxX + 180 + 80; // L: 712 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 713 + Ignored.method6828(0); // L: 714 + Login.Login_username = ""; // L: 715 + Login.Login_password = ""; // L: 716 + WorldMapID.field2386 = 0; // L: 717 + HealthBar.otp = ""; // L: 718 + } + + while (SecureRandomCallable.isKeyDown()) { // L: 720 + boolean var9 = false; // L: 721 + + for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 722 + if (ItemComposition.field2121 == "1234567890".charAt(var10)) { // L: 723 + var9 = true; // L: 724 + break; // L: 725 + } + } + + if (GameEngine.field218 == 13) { // L: 728 + Ignored.method6828(0); // L: 729 + Login.Login_username = ""; // L: 730 + Login.Login_password = ""; // L: 731 + WorldMapID.field2386 = 0; // L: 732 + HealthBar.otp = ""; // L: 733 + } else { + if (GameEngine.field218 == 85 && HealthBar.otp.length() > 0) { // L: 736 + HealthBar.otp = HealthBar.otp.substring(0, HealthBar.otp.length() - 1); + } + + if (GameEngine.field218 == 84) { // L: 737 + HealthBar.otp.trim(); // L: 738 + if (HealthBar.otp.length() != 6) { // L: 739 + class4.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 740 + return; // L: 741 + } + + WorldMapID.field2386 = Integer.parseInt(HealthBar.otp); // L: 743 + HealthBar.otp = ""; // L: 744 + class302.method5766(true); // L: 745 + class4.setLoginResponseString("", "Connecting to server...", ""); // L: 746 + Decimator.updateGameState(20); // L: 747 + return; // L: 748 + } + + if (var9 && HealthBar.otp.length() < 6) { // L: 750 + HealthBar.otp = HealthBar.otp + ItemComposition.field2121; + } + } + } + } else if (Login.loginIndex == 5) { // L: 754 + var39 = Login.loginBoxX + 180 - 80; // L: 755 + var8 = 321; // L: 756 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 757 + DynamicObject.method2003(); // L: 758 + return; // L: 759 + } + + var39 = Login.loginBoxX + 180 + 80; // L: 761 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 762 + Messages.Login_promptCredentials(true); // L: 763 + } + + var42 = 361; // L: 765 + if (class260.field2892 != null) { // L: 766 + var10 = class260.field2892.highX / 2; // L: 767 + if (var4 == 1 && var38 >= class260.field2892.lowX - var10 && var38 <= var10 + class260.field2892.lowX && var52 >= var42 - 15 && var52 < var42) { // L: 768 + class391.openURL(ArchiveLoader.method2063("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 769 + } + } + + while (SecureRandomCallable.isKeyDown()) { // L: 772 + var43 = false; // L: 773 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 774 + if (ItemComposition.field2121 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 775 + var43 = true; // L: 776 + break; // L: 777 + } + } + + if (GameEngine.field218 == 13) { // L: 780 + Messages.Login_promptCredentials(true); // L: 781 + } else { + if (GameEngine.field218 == 85 && Login.Login_username.length() > 0) { // L: 784 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (GameEngine.field218 == 84) { // L: 785 + DynamicObject.method2003(); // L: 786 + return; // L: 787 + } + + if (var43 && Login.Login_username.length() < 320) { // L: 789 + Login.Login_username = Login.Login_username + ItemComposition.field2121; + } + } + } + } else if (Login.loginIndex != 6) { // L: 793 + if (Login.loginIndex == 7) { // L: 804 + if (Client.field504 && !Client.onMobile) { // L: 805 + var39 = HealthBarDefinition.loginBoxCenter - 150; // L: 806 + var41 = var39 + 40 + 240 + 25; // L: 807 + var42 = 231; // L: 808 + var10 = var42 + 40; // L: 809 + if (var4 == 1 && var38 >= var39 && var38 <= var41 && var52 >= var42 && var52 <= var10) { // L: 810 + var12 = var39; // L: 812 + int var25 = 0; + + while (true) { + if (var25 >= 8) { + var11 = 0; // L: 822 + break; + } + + if (var38 <= var12 + 30) { // L: 815 + var11 = var25; // L: 816 + break; // L: 817 + } + + var12 += 30; // L: 819 + var12 += var25 != 1 && var25 != 3 ? 5 : 20; // L: 820 + ++var25; // L: 814 + } + + Login.field903 = var11; // L: 824 + } + + var11 = Login.loginBoxX + 180 - 80; // L: 826 + short var45 = 321; // L: 827 + boolean var15; + boolean var17; + Date var18; + java.util.Calendar var19; + Date var26; + java.util.Calendar var28; + Date var29; + boolean var55; + if (var4 == 1 && var38 >= var11 - 75 && var38 <= var11 + 75 && var52 >= var45 - 20 && var52 <= var45 + 20) { // L: 828 + label1307: { + try { + var26 = class345.method6441(); // L: 833 + } catch (ParseException var35) { // L: 835 + Ignored.method6828(7); // L: 837 + class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 838 + var55 = false; // L: 840 + break label1307; // L: 841 + } + + if (var26 == null) { // L: 843 + var55 = false; // L: 844 + } else { + var28 = java.util.Calendar.getInstance(); // L: 849 + var28.set(1, var28.get(1) - 13); // L: 850 + var29 = var28.getTime(); // L: 851 + var15 = var26.before(var29); // L: 852 + var19 = java.util.Calendar.getInstance(); // L: 859 + var19.set(2, 0); // L: 860 + var19.set(5, 1); // L: 861 + var19.set(1, 1900); // L: 862 + var18 = var19.getTime(); // L: 863 + var17 = var26.after(var18); // L: 866 + if (!var17) { // L: 869 + Ignored.method6828(7); // L: 871 + class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 872 + var55 = false; // L: 874 + } else { + if (!var15) { // L: 877 + WorldMapSectionType.field2321 = 8388607; // L: 878 + } else { + WorldMapSectionType.field2321 = (int)(var26.getTime() / 86400000L - 11745L); // L: 881 + } + + var55 = true; // L: 883 + } + } + } + + if (var55) { // L: 886 + Decimator.updateGameState(50); // L: 887 + return; // L: 888 + } + } + + var11 = Login.loginBoxX + 180 + 80; // L: 891 + if (var4 == 1 && var38 >= var11 - 75 && var38 <= var11 + 75 && var52 >= var45 - 20 && var52 <= var45 + 20) { // L: 892 + Login.field904 = new String[8]; // L: 893 + Messages.Login_promptCredentials(true); // L: 894 + } + + while (SecureRandomCallable.isKeyDown()) { // L: 896 + if (GameEngine.field218 == 101) { // L: 897 + Login.field904[Login.field903] = null; // L: 898 + } + + if (GameEngine.field218 == 85) { // L: 900 + if (Login.field904[Login.field903] == null && Login.field903 > 0) { // L: 901 + --Login.field903; // L: 902 + } + + Login.field904[Login.field903] = null; // L: 904 + } + + if (ItemComposition.field2121 >= '0' && ItemComposition.field2121 <= '9') { // L: 906 + Login.field904[Login.field903] = "" + ItemComposition.field2121; // L: 907 + if (Login.field903 < 7) { // L: 908 + ++Login.field903; // L: 909 + } + } + + if (GameEngine.field218 == 84) { // L: 912 + label1243: { + try { + var26 = class345.method6441(); // L: 917 + } catch (ParseException var34) { // L: 919 + Ignored.method6828(7); // L: 921 + class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 922 + var55 = false; // L: 924 + break label1243; // L: 925 + } + + if (var26 == null) { // L: 927 + var55 = false; // L: 928 + } else { + var28 = java.util.Calendar.getInstance(); // L: 933 + var28.set(1, var28.get(1) - 13); // L: 934 + var29 = var28.getTime(); // L: 935 + var15 = var26.before(var29); // L: 936 + var19 = java.util.Calendar.getInstance(); // L: 943 + var19.set(2, 0); // L: 944 + var19.set(5, 1); // L: 945 + var19.set(1, 1900); // L: 946 + var18 = var19.getTime(); // L: 947 + var17 = var26.after(var18); // L: 950 + if (!var17) { // L: 953 + Ignored.method6828(7); // L: 955 + class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 956 + var55 = false; // L: 958 + } else { + if (!var15) { // L: 961 + WorldMapSectionType.field2321 = 8388607; // L: 962 + } else { + WorldMapSectionType.field2321 = (int)(var26.getTime() / 86400000L - 11745L); // L: 965 + } + + var55 = true; // L: 967 + } + } + } + + if (var55) { // L: 970 + Decimator.updateGameState(50); // L: 971 + } + + return; // L: 973 + } + } + } else { + var39 = Login.loginBoxX + 180 - 80; // L: 978 + var8 = 321; // L: 979 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 980 + class391.openURL(ArchiveLoader.method2063("secure", true) + "m=dob/set_dob.ws", true, false); // L: 981 + class4.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 982 + Ignored.method6828(6); // L: 983 + return; // L: 984 + } + + var39 = Login.loginBoxX + 180 + 80; // L: 986 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 987 + Messages.Login_promptCredentials(true); // L: 988 + } + } + } else if (Login.loginIndex == 8) { // L: 992 + var39 = Login.loginBoxX + 180 - 80; // L: 993 + var8 = 321; // L: 994 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 995 + class391.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 996 + class4.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 997 + Ignored.method6828(6); // L: 998 + return; // L: 999 + } + + var39 = Login.loginBoxX + 180 + 80; // L: 1001 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1002 + Messages.Login_promptCredentials(true); // L: 1003 + } + } else if (Login.loginIndex == 9) { // L: 1006 + var39 = Login.loginBoxX + 180; // L: 1007 + var8 = 311; // L: 1008 + if (GameEngine.field218 == 84 || GameEngine.field218 == 13 || var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1009 + class348.method6505(false); // L: 1010 + } + } else if (Login.loginIndex == 10) { // L: 1013 + var39 = Login.loginBoxX + 180; // L: 1014 + var8 = 209; // L: 1015 + if (GameEngine.field218 == 84 || var4 == 1 && var38 >= var39 - 109 && var38 <= var39 + 109 && var52 >= var8 && var52 <= var8 + 68) { // L: 1016 + class4.setLoginResponseString("", "Connecting to server...", ""); // L: 1017 + Client.field532 = class441.field4671; // L: 1018 + class302.method5766(false); // L: 1019 + Decimator.updateGameState(20); // L: 1020 + } + } else if (Login.loginIndex == 12) { // L: 1023 + var39 = HealthBarDefinition.loginBoxCenter; // L: 1024 + var8 = 233; // L: 1025 + Bounds var31 = var1.method6333(0, 30, "terms of use, privacy policy, and end user licence", var39, var8); // L: 1026 + Bounds var23 = var1.method6333(32, 32, "terms of use, privacy policy, and end user licence", var39, var8); // L: 1027 + Bounds var24 = var1.method6333(70, 34, "terms of use, privacy policy, and end user licence", var39, var8); // L: 1028 + var41 = var8 + 17; // L: 1029 + Bounds var32 = var1.method6333(0, 34, "agreement (EULA).", var39, var41); // L: 1030 + if (var4 == 1) { // L: 1031 + if (var31.method6944(var38, var52)) { // L: 1032 + class391.openURL("https://www.jagex.com/terms", true, false); // L: 1033 + } else if (var23.method6944(var38, var52)) { // L: 1035 + class391.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1036 + } else if (var24.method6944(var38, var52) || var32.method6944(var38, var52)) { // L: 1038 + class391.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 1039 + } + } + + var39 = HealthBarDefinition.loginBoxCenter - 80; // L: 1042 + var8 = 311; // L: 1043 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1044 + class131.clientPreferences.method2248(Client.field617); // L: 1046 + class348.method6505(true); // L: 1048 + } + + var39 = HealthBarDefinition.loginBoxCenter + 80; // L: 1050 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1051 + Login.loginIndex = 13; // L: 1052 + } + } else if (Login.loginIndex == 13) { // L: 1055 + var39 = HealthBarDefinition.loginBoxCenter; // L: 1056 + var8 = 321; // L: 1057 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1058 + class348.method6505(true); // L: 1059 + } + } else if (Login.loginIndex == 14) { // L: 1062 + String var33 = ""; // L: 1063 + switch(Login.field901) { // L: 1064 + case 0: + var33 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1066 + break; // L: 1067 + case 1: + var33 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1069 + break; // L: 1070 + default: + Messages.Login_promptCredentials(false); // L: 1072 + } + + var41 = Login.loginBoxX + 180; // L: 1075 + var42 = 276; // L: 1076 + if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 1077 + class391.openURL(var33, true, false); // L: 1078 + class4.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1079 + Ignored.method6828(6); // L: 1080 + return; // L: 1081 + } + + var41 = Login.loginBoxX + 180; // L: 1083 + var42 = 326; // L: 1084 + if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 1085 + Messages.Login_promptCredentials(false); // L: 1086 + } + } else if (Login.loginIndex == 24) { // L: 1089 + var39 = Login.loginBoxX + 180; // L: 1090 + var8 = 301; // L: 1091 + if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1092 + class348.method6505(false); // L: 1093 + } + } + } else { + while (true) { + do { + if (!SecureRandomCallable.isKeyDown()) { // L: 794 + var40 = 321; // L: 799 + if (var4 == 1 && var52 >= var40 - 20 && var52 <= var40 + 20) { // L: 800 + Messages.Login_promptCredentials(true); // L: 801 + } + + return; + } + } while(GameEngine.field218 != 84 && GameEngine.field218 != 13); // L: 795 + + Messages.Login_promptCredentials(true); // L: 796 + } + } + } + } + } + + } + } + } + } // L: 397 } diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java index 6c9c74e9cc..1167ef11ef 100644 --- a/runescape-client/src/main/java/class361.java +++ b/runescape-client/src/main/java/class361.java @@ -5,64 +5,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mg") public final class class361 { + @ObfuscatedName("k") + static int[] field4213; @ObfuscatedName("v") - final Comparator field4230; - @ObfuscatedName("o") - final Map field4226; - @ObfuscatedName("h") + final Comparator field4217; + @ObfuscatedName("c") + final Map field4218; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lmn;" ) - final class342 field4228; - @ObfuscatedName("g") + final class342 field4214; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lmn;" ) - final class342 field4227; - @ObfuscatedName("l") + final class342 field4215; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -4912309807257080405L + longValue = -1677392653166540809L ) - final long field4231; + final long field4219; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmx;" ) - final class359 field4229; - @ObfuscatedName("d") + final class359 field4216; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2090341153 + intValue = 1491932339 ) - final int field4232; + final int field4212; @ObfuscatedSignature( - descriptor = "(JILmh;)V" + descriptor = "(JILmx;)V" ) class361(long var1, int var3, class359 var4) { - this.field4230 = new class360(this); // L: 7 - this.field4231 = var1; // L: 34 - this.field4232 = var3; // L: 35 - this.field4229 = var4; // L: 36 - if (this.field4232 == -1) { // L: 37 - this.field4226 = new HashMap(64); // L: 38 - this.field4228 = new class342(64, this.field4230); // L: 39 - this.field4227 = null; // L: 40 + this.field4217 = new class360(this); // L: 7 + this.field4219 = var1; // L: 34 + this.field4212 = var3; // L: 35 + this.field4216 = var4; // L: 36 + if (this.field4212 == -1) { // L: 37 + this.field4218 = new HashMap(64); // L: 38 + this.field4214 = new class342(64, this.field4217); // L: 39 + this.field4215 = null; // L: 40 } else { - if (this.field4229 == null) { // L: 43 + if (this.field4216 == null) { // L: 43 throw new IllegalArgumentException(""); } - this.field4226 = new HashMap(this.field4232); // L: 44 - this.field4228 = new class342(this.field4232, this.field4230); // L: 45 - this.field4227 = new class342(this.field4232); // L: 46 + this.field4218 = new HashMap(this.field4212); // L: 44 + this.field4214 = new class342(this.field4212, this.field4217); // L: 45 + this.field4215 = new class342(this.field4212); // L: 46 } } // L: 48 @ObfuscatedSignature( - descriptor = "(ILmh;)V" + descriptor = "(ILmx;)V" ) public class361(int var1, class359 var2) { this(-1L, var1, var2); // L: 30 @@ -70,117 +72,117 @@ public final class class361 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-157414931" ) - boolean method6645() { - return this.field4232 != -1; // L: 51 + boolean method6594() { + return this.field4212 != -1; // L: 51 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-1900663720" + garbageValue = "-2019489642" ) - public Object method6639(Object var1) { + public Object method6601(Object var1) { synchronized(this) { // L: 55 - if (-1L != this.field4231) { // L: 56 - this.method6642(); + if (-1L != this.field4219) { // L: 56 + this.method6598(); } - class362 var3 = (class362)this.field4226.get(var1); // L: 57 + class362 var3 = (class362)this.field4218.get(var1); // L: 57 if (var3 == null) { // L: 58 return null; } else { - this.method6641(var3, false); // L: 59 - return var3.field4235; // L: 60 + this.method6600(var3, false); // L: 59 + return var3.field4221; // L: 60 } } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1970853535" + garbageValue = "-1186698319" ) - public Object method6640(Object var1, Object var2) { + public Object method6596(Object var1, Object var2) { synchronized(this) { // L: 65 - if (-1L != this.field4231) { // L: 66 - this.method6642(); + if (-1L != this.field4219) { // L: 66 + this.method6598(); } - class362 var4 = (class362)this.field4226.get(var1); // L: 67 + class362 var4 = (class362)this.field4218.get(var1); // L: 67 if (var4 != null) { // L: 68 - Object var8 = var4.field4235; // L: 69 - var4.field4235 = var2; // L: 70 - this.method6641(var4, false); // L: 71 + Object var8 = var4.field4221; // L: 69 + var4.field4221 = var2; // L: 70 + this.method6600(var4, false); // L: 71 return var8; // L: 72 } else { class362 var5; - if (this.method6645() && this.field4226.size() == this.field4232) { // L: 74 - var5 = (class362)this.field4227.remove(); // L: 75 - this.field4226.remove(var5.field4234); // L: 76 - this.field4228.remove(var5); // L: 77 + if (this.method6594() && this.field4218.size() == this.field4212) { // L: 74 + var5 = (class362)this.field4215.remove(); // L: 75 + this.field4218.remove(var5.field4224); // L: 76 + this.field4214.remove(var5); // L: 77 } var5 = new class362(var2, var1); // L: 79 - this.field4226.put(var1, var5); // L: 80 - this.method6641(var5, true); // L: 81 + this.field4218.put(var1, var5); // L: 80 + this.method6600(var5, true); // L: 81 return null; // L: 82 } } } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Lmv;ZI)V", - garbageValue = "-911621571" + garbageValue = "1250273542" ) - void method6641(class362 var1, boolean var2) { + void method6600(class362 var1, boolean var2) { if (!var2) { // L: 88 - this.field4228.remove(var1); // L: 89 - if (this.method6645() && !this.field4227.remove(var1)) { // L: 90 91 + this.field4214.remove(var1); // L: 89 + if (this.method6594() && !this.field4215.remove(var1)) { // L: 90 91 throw new IllegalStateException(""); } } - var1.field4236 = System.currentTimeMillis(); // L: 94 - if (this.method6645()) { // L: 95 - switch(this.field4229.field4219) { // L: 96 + var1.field4222 = System.currentTimeMillis(); // L: 94 + if (this.method6594()) { // L: 95 + switch(this.field4216.field4206) { // L: 96 case 0: - ++var1.field4237; // L: 98 + ++var1.field4223; // L: 101 break; case 1: - var1.field4237 = var1.field4236; // L: 101 + var1.field4223 = var1.field4222; // L: 98 } - this.field4227.add(var1); // L: 104 + this.field4215.add(var1); // L: 104 } - this.field4228.add(var1); // L: 106 + this.field4214.add(var1); // L: 106 } // L: 107 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "961475175" + garbageValue = "-1192700638" ) - void method6642() { - if (this.field4231 == -1L) { // L: 111 + void method6598() { + if (-1L == this.field4219) { // L: 111 throw new IllegalStateException(""); } else { - long var1 = System.currentTimeMillis() - this.field4231; // L: 112 + long var1 = System.currentTimeMillis() - this.field4219; // L: 112 - while (!this.field4228.isEmpty()) { // L: 113 - class362 var3 = (class362)this.field4228.peek(); // L: 114 - if (var3.field4236 >= var1) { // L: 115 + while (!this.field4214.isEmpty()) { // L: 113 + class362 var3 = (class362)this.field4214.peek(); // L: 114 + if (var3.field4222 >= var1) { // L: 115 return; // L: 120 } - this.field4226.remove(var3.field4234); // L: 116 - this.field4228.remove(var3); // L: 117 - if (this.method6645()) { // L: 118 - this.field4227.remove(var3); + this.field4218.remove(var3.field4224); // L: 116 + this.field4214.remove(var3); // L: 117 + if (this.method6594()) { // L: 118 + this.field4215.remove(var3); } } diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java index 5ba26341bc..b0f5832dc2 100644 --- a/runescape-client/src/main/java/class362.java +++ b/runescape-client/src/main/java/class362.java @@ -5,51 +5,51 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("mv") public final class class362 implements Comparable { @ObfuscatedName("v") - Object field4235; - @ObfuscatedName("o") - Object field4234; - @ObfuscatedName("h") + Object field4221; + @ObfuscatedName("c") + Object field4224; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 6425194224424863611L + longValue = -5736347963697719881L ) - long field4236; - @ObfuscatedName("g") + long field4222; + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -2616776762809416091L + longValue = -1907411133840236385L ) - long field4237; + long field4223; class362(Object var1, Object var2) { - this.field4235 = var1; // L: 10 - this.field4234 = var2; // L: 11 + this.field4221 = var1; // L: 10 + this.field4224 = var2; // L: 11 } // L: 12 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Lmv;I)I", - garbageValue = "-1461813325" + garbageValue = "-368071179" ) - int method6652(class362 var1) { - if (this.field4237 < var1.field4237) { + int method6615(class362 var1) { + if (this.field4223 < var1.field4223) { return -1; // L: 15 } else { - return this.field4237 > var1.field4237 ? 1 : 0; // L: 16 17 + return this.field4223 > var1.field4223 ? 1 : 0; // L: 16 17 } } public boolean equals(Object var1) { - if (var1 instanceof class362) { // L: 22 - return this.field4234.equals(((class362)var1).field4234); + if (var1 instanceof class362) { // L: 21 + return this.field4224.equals(((class362)var1).field4224); } else { - throw new IllegalArgumentException(); // L: 23 + throw new IllegalArgumentException(); // L: 22 } } public int hashCode() { - return this.field4234.hashCode(); // L: 28 + return this.field4224.hashCode(); // L: 26 } public int compareTo(Object var1) { - return this.method6652((class362)var1); // L: 32 + return this.method6615((class362)var1); // L: 30 } } diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java new file mode 100644 index 0000000000..630775c192 --- /dev/null +++ b/runescape-client/src/main/java/class384.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nl") +public class class384 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lln;" + ) + @Export("VarcInt_archive") + public static AbstractArchive VarcInt_archive; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lai;" + ) + @Export("pcmPlayerProvider") + public static class45 pcmPlayerProvider; +} diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java index ceda11882b..cb3d0f75b9 100644 --- a/runescape-client/src/main/java/class385.java +++ b/runescape-client/src/main/java/class385.java @@ -2,130 +2,63 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") +@ObfuscatedName("na") public class class385 { - @ObfuscatedName("g") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; @ObfuscatedName("v") + float field4336; + @ObfuscatedName("c") float field4334; - @ObfuscatedName("o") - float field4332; - @ObfuscatedName("h") + @ObfuscatedName("i") float field4333; static { new class385(0.0F, 0.0F, 0.0F); // L: 5 - new class385(1.0F, 1.0F, 1.0F); + new class385(1.0F, 1.0F, 1.0F); // L: 9 new class385(1.0F, 0.0F, 0.0F); // L: 13 new class385(0.0F, 1.0F, 0.0F); // L: 17 - new class385(0.0F, 0.0F, 1.0F); // L: 21 - KeyHandler.method377(100); // L: 25 + new class385(0.0F, 0.0F, 1.0F); } // L: 26 class385(float var1, float var2, float var3) { - this.field4334 = var1; // L: 35 - this.field4332 = var2; // L: 36 - this.field4333 = var3; // L: 37 - } // L: 38 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-989001357" - ) - final float method7026() { - return (float)Math.sqrt((double)(this.field4334 * this.field4334 + this.field4332 * this.field4332 + this.field4333 * this.field4333)); // L: 41 - } - - public String toString() { - return this.field4334 + ", " + this.field4332 + ", " + this.field4333; // L: 46 - } + this.field4336 = var1; // L: 33 + this.field4334 = var2; // L: 34 + this.field4333 = var3; // L: 35 + } // L: 36 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ld;I)Lg;", - garbageValue = "-1598451029" + descriptor = "(I)F", + garbageValue = "-565998647" ) - public static class3 method7027(class6 var0) { - switch(var0.field17) { // L: 9 - case 0: - return new class0(); // L: 16 - default: - throw new IllegalArgumentException(); // L: 12 + final float method6973() { + return (float)Math.sqrt((double)(this.field4333 * this.field4333 + this.field4336 * this.field4336 + this.field4334 * this.field4334)); // L: 39 + } + + public String toString() { + return this.field4336 + ", " + this.field4334 + ", " + this.field4333; // L: 44 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1727518153" + ) + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 + if (var2 == null) { // L: 22 + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 } } - @ObfuscatedName("he") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "90" + descriptor = "(I)[Ldw;", + garbageValue = "-2020186976" ) - static final void method7028() { - PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7850 - var0.importIndex(); // L: 7851 - int var1 = var0.readBits(8); // L: 7852 - int var2; - if (var1 < Client.npcCount) { // L: 7853 - for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7854 - Client.field612[++Client.field634 - 1] = Client.npcIndices[var2]; - } - } - - if (var1 > Client.npcCount) { // L: 7856 - throw new RuntimeException(""); - } else { - Client.npcCount = 0; // L: 7857 - - for (var2 = 0; var2 < var1; ++var2) { // L: 7858 - int var3 = Client.npcIndices[var2]; // L: 7859 - NPC var4 = Client.npcs[var3]; // L: 7860 - int var5 = var0.readBits(1); // L: 7861 - if (var5 == 0) { // L: 7862 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7863 - var4.npcCycle = Client.cycle; // L: 7864 - } else { - int var6 = var0.readBits(2); // L: 7867 - if (var6 == 0) { // L: 7868 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7869 - var4.npcCycle = Client.cycle; // L: 7870 - Client.field533[++Client.field609 - 1] = var3; // L: 7871 - } else { - int var7; - int var8; - if (var6 == 1) { // L: 7874 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7875 - var4.npcCycle = Client.cycle; // L: 7876 - var7 = var0.readBits(3); // L: 7877 - var4.method2357(var7, class193.field2193); // L: 7878 - var8 = var0.readBits(1); // L: 7879 - if (var8 == 1) { // L: 7880 - Client.field533[++Client.field609 - 1] = var3; - } - } else if (var6 == 2) { // L: 7883 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7884 - var4.npcCycle = Client.cycle; // L: 7885 - if (var0.readBits(1) == 1) { // L: 7886 - var7 = var0.readBits(3); // L: 7887 - var4.method2357(var7, class193.field2191); // L: 7888 - var8 = var0.readBits(3); // L: 7889 - var4.method2357(var8, class193.field2191); // L: 7890 - } else { - var7 = var0.readBits(3); // L: 7893 - var4.method2357(var7, class193.field2195); // L: 7894 - } - - var7 = var0.readBits(1); // L: 7896 - if (var7 == 1) { // L: 7897 - Client.field533[++Client.field609 - 1] = var3; - } - } else if (var6 == 3) { // L: 7900 - Client.field612[++Client.field634 - 1] = var3; // L: 7901 - } - } - } - } - - } - } // L: 7905 + static class123[] method6974() { + return new class123[]{class123.field1483, class123.field1492, class123.field1486, class123.field1482, class123.field1481, class123.field1484, class123.field1487, class123.field1488, class123.field1489}; // L: 106 + } } diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java index 60da67ffe4..47350009b4 100644 --- a/runescape-client/src/main/java/class386.java +++ b/runescape-client/src/main/java/class386.java @@ -2,123 +2,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") +@ObfuscatedName("nq") public final class class386 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "[Lnf;" - ) - static class386[] field4342; - @ObfuscatedName("o") + @ObfuscatedName("su") @ObfuscatedGetter( - intValue = -1794460551 + intValue = 513737707 ) static int field4337; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -404699295 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lnq;" ) - static int field4336; - @ObfuscatedName("g") - float field4339; - @ObfuscatedName("l") + static class386[] field4344; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 829267689 + ) + static int field4338; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 6322965 + ) + static int field4339; + @ObfuscatedName("f") float field4340; - @ObfuscatedName("n") + @ObfuscatedName("b") float field4341; - @ObfuscatedName("d") - float field4338; + @ObfuscatedName("n") + float field4342; + @ObfuscatedName("s") + float field4343; static { - field4342 = new class386[0]; // L: 4 - ObjectComposition.method3692(100); // L: 9 + field4344 = new class386[0]; // L: 4 + field4338 = 100; // L: 10 + field4344 = new class386[100]; // L: 11 + field4339 = 0; // L: 12 new class386(); - } // L: 14 + } // L: 18 class386() { - this.method7033(); // L: 44 - } // L: 45 + this.method6985(); // L: 42 + } // L: 43 - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2084662859" + descriptor = "(B)V", + garbageValue = "18" ) - public void method7043() { - synchronized(field4342) { // L: 38 - if (field4336 < field4337 - 1) { // L: 39 - field4342[++field4336 - 1] = this; + public void method6988() { + synchronized(field4344) { // L: 36 + if (field4339 < field4338 - 1) { // L: 37 + field4344[++field4339 - 1] = this; } } - } // L: 41 + } // L: 39 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(FFFFI)V", - garbageValue = "2036430223" + garbageValue = "-1694420315" ) - void method7031(float var1, float var2, float var3, float var4) { - this.field4339 = var1; // L: 48 - this.field4340 = var2; // L: 49 - this.field4341 = var3; // L: 50 - this.field4338 = var4; // L: 51 - } // L: 52 + void method6983(float var1, float var2, float var3, float var4) { + this.field4340 = var1; // L: 46 + this.field4341 = var2; // L: 47 + this.field4342 = var3; // L: 48 + this.field4343 = var4; // L: 49 + } // L: 50 - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(FFFFI)V", - garbageValue = "-1941052212" + garbageValue = "-1973173355" ) - public void method7032(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(var4 * 0.5F)); // L: 55 - float var6 = (float)Math.cos((double)(0.5F * var4)); // L: 56 - this.field4339 = var5 * var1; // L: 57 - this.field4340 = var5 * var2; // L: 58 - this.field4341 = var3 * var5; // L: 59 - this.field4338 = var6; // L: 60 - } // L: 61 + public void method6984(float var1, float var2, float var3, float var4) { + float var5 = (float)Math.sin((double)(0.5F * var4)); // L: 53 + float var6 = (float)Math.cos((double)(0.5F * var4)); // L: 54 + this.field4340 = var1 * var5; // L: 55 + this.field4341 = var5 * var2; // L: 56 + this.field4342 = var5 * var3; // L: 57 + this.field4343 = var6; // L: 58 + } // L: 59 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "480633161" + ) + final void method6985() { + this.field4342 = 0.0F; // L: 62 + this.field4341 = 0.0F; // L: 63 + this.field4340 = 0.0F; // L: 64 + this.field4343 = 1.0F; // L: 65 + } // L: 66 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1368789286" + descriptor = "(Lnq;I)V", + garbageValue = "1069726937" ) - final void method7033() { - this.field4341 = 0.0F; // L: 64 - this.field4340 = 0.0F; // L: 65 - this.field4339 = 0.0F; // L: 66 - this.field4338 = 1.0F; // L: 67 - } // L: 68 + public final void method6986(class386 var1) { + this.method6983(var1.field4341 * this.field4342 + this.field4340 * var1.field4343 + this.field4343 * var1.field4340 - var1.field4342 * this.field4341, this.field4340 * var1.field4342 + var1.field4343 * this.field4341 - this.field4342 * var1.field4340 + var1.field4341 * this.field4343, this.field4343 * var1.field4342 + (this.field4341 * var1.field4340 + this.field4342 * var1.field4343 - var1.field4341 * this.field4340), var1.field4343 * this.field4343 - var1.field4340 * this.field4340 - var1.field4341 * this.field4341 - var1.field4342 * this.field4342); // L: 69 + } // L: 70 - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lnf;I)V", - garbageValue = "-1233889427" - ) - public final void method7036(class386 var1) { - this.method7031(this.field4341 * var1.field4340 + var1.field4338 * this.field4339 + this.field4338 * var1.field4339 - this.field4340 * var1.field4341, this.field4338 * var1.field4340 + (this.field4340 * var1.field4338 - this.field4341 * var1.field4339) + this.field4339 * var1.field4341, var1.field4341 * this.field4338 + (var1.field4338 * this.field4341 + var1.field4339 * this.field4340 - var1.field4340 * this.field4339), var1.field4338 * this.field4338 - var1.field4339 * this.field4339 - var1.field4340 * this.field4340 - this.field4341 * var1.field4341); // L: 71 - } // L: 72 + public boolean equals(Object var1) { + if (!(var1 instanceof class386)) { // L: 73 + return false; // L: 77 + } else { + class386 var2 = (class386)var1; // L: 74 + return var2.field4340 == this.field4340 && this.field4341 == var2.field4341 && var2.field4342 == this.field4342 && this.field4343 == var2.field4343; // L: 75 + } + } public int hashCode() { - boolean var1 = true; // L: 85 - float var2 = 1.0F; // L: 86 - var2 = this.field4339 + var2 * 31.0F; // L: 87 - var2 = this.field4340 + 31.0F * var2; // L: 88 - var2 = this.field4341 + 31.0F * var2; // L: 89 - var2 = this.field4338 + 31.0F * var2; // L: 90 - return (int)var2; // L: 91 + float var2 = 1.0F; // L: 82 + var2 = this.field4340 + var2 * 31.0F; // L: 83 + var2 = this.field4341 + var2 * 31.0F; // L: 84 + var2 = this.field4342 + var2 * 31.0F; // L: 85 + var2 = this.field4343 + 31.0F * var2; // L: 86 + return (int)var2; // L: 87 } public String toString() { - return this.field4339 + "," + this.field4340 + "," + this.field4341 + "," + this.field4338; // L: 96 - } - - public boolean equals(Object var1) { - if (!(var1 instanceof class386)) { // L: 76 - return false; // L: 80 - } else { - class386 var2 = (class386)var1; // L: 77 - return this.field4339 == var2.field4339 && this.field4340 == var2.field4340 && this.field4341 == var2.field4341 && var2.field4338 == this.field4338; // L: 78 - } + return this.field4340 + "," + this.field4341 + "," + this.field4342 + "," + this.field4343; // L: 92 } } diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java index bc2d9cc1f1..88583073c4 100644 --- a/runescape-client/src/main/java/class387.java +++ b/runescape-client/src/main/java/class387.java @@ -3,441 +3,442 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("nt") public final class class387 { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lnu;" + descriptor = "[Lnt;" ) - static class387[] field4344; - @ObfuscatedName("h") + public static class387[] field4346; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + public static final class387 field4345; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 623605303 + intValue = 288254709 ) - static int field4345; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -29781141 - ) - static int field4346; + public static int field4347; @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - public static final class387 field4348; - @ObfuscatedName("l") - public float[] field4347; + public float[] field4348; static { - field4344 = new class387[0]; // L: 9 - field4345 = 100; // L: 15 - field4344 = new class387[100]; // L: 16 - field4346 = 0; // L: 17 - field4348 = new class387(); - } // L: 22 - - public class387() { - this.field4347 = new float[16]; - this.method7061(); // L: 41 - } // L: 42 - - @ObfuscatedSignature( - descriptor = "(Lnu;)V" - ) - public class387(class387 var1) { - this.field4347 = new float[16]; - this.method7064(var1); // L: 45 - } // L: 46 - - @ObfuscatedSignature( - descriptor = "(Lpd;Z)V" - ) - public class387(Buffer var1, boolean var2) { - this.field4347 = new float[16]; // L: 21 - this.method7059(var1, var2); // L: 49 - } // L: 50 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "57" - ) - public void method7095() { - synchronized(field4344) { // L: 35 - if (field4346 < field4345 - 1) { // L: 36 - field4344[++field4346 - 1] = this; - } - - } - } // L: 38 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lpd;ZI)V", - garbageValue = "-1865581813" - ) - void method7059(Buffer var1, boolean var2) { - if (var2) { // L: 53 - class388 var4 = new class388(); // L: 54 - var4.method7128(HealthBarDefinition.method3433(var1.readShort())); // L: 55 - var4.method7129(HealthBarDefinition.method3433(var1.readShort())); // L: 56 - var4.method7139(HealthBarDefinition.method3433(var1.readShort())); // L: 57 - var4.method7131((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 58 - this.method7070(var4); // L: 59 - } else { - for (int var3 = 0; var3 < 16; ++var3) { // L: 62 - this.field4347[var3] = var1.method7965(); // L: 63 - } - } - - } // L: 66 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "57" - ) - float[] method7086() { - float[] var1 = new float[3]; // L: 69 - if ((double)this.field4347[2] < 0.999D && (double)this.field4347[2] > -0.999D) { // L: 70 - var1[1] = (float)(-Math.asin((double)this.field4347[2])); // L: 71 - double var2 = Math.cos((double)var1[1]); // L: 72 - var1[0] = (float)Math.atan2((double)this.field4347[6] / var2, (double)this.field4347[10] / var2); // L: 73 - var1[2] = (float)Math.atan2((double)this.field4347[1] / var2, (double)this.field4347[0] / var2); // L: 74 - } else { - var1[0] = 0.0F; // L: 77 - var1[1] = (float)Math.atan2((double)this.field4347[2], 0.0D); // L: 78 - var1[2] = (float)Math.atan2((double)(-this.field4347[9]), (double)this.field4347[5]); // L: 79 - } - - return var1; // L: 81 + field4346 = new class387[0]; // L: 9 + class250.method5112(100); // L: 14 + field4345 = new class387(); // L: 18 } - @ObfuscatedName("l") + public class387() { + this.field4348 = new float[16]; + this.method7011(); // L: 33 + } // L: 34 + @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "-2013640874" + descriptor = "(Lnt;)V" ) - public float[] method7072() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field4347[6])), 0.0F, 0.0F}; // L: 85 86 - double var2 = Math.cos((double)var1[0]); // L: 87 - double var4; - double var6; - if (Math.abs(var2) > 0.005D) { // L: 88 - var4 = (double)this.field4347[2]; // L: 89 - var6 = (double)this.field4347[10]; // L: 90 - double var8 = (double)this.field4347[4]; // L: 91 - double var10 = (double)this.field4347[5]; // L: 92 - var1[1] = (float)Math.atan2(var4, var6); // L: 93 - var1[2] = (float)Math.atan2(var8, var10); // L: 94 - } else { - var4 = (double)this.field4347[1]; // L: 97 - var6 = (double)this.field4347[0]; // L: 98 - if (this.field4347[6] < 0.0F) { // L: 99 - var1[1] = (float)Math.atan2(var4, var6); // L: 100 - } else { - var1[1] = (float)(-Math.atan2(var4, var6)); // L: 103 + public class387(class387 var1) { + this.field4348 = new float[16]; + this.method7032(var1); // L: 37 + } // L: 38 + + @ObfuscatedSignature( + descriptor = "(Lpi;Z)V" + ) + public class387(Buffer var1, boolean var2) { + this.field4348 = new float[16]; // L: 17 + this.method7014(var1, var2); // L: 41 + } // L: 42 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "37" + ) + public void method7029() { + synchronized(field4346) { // L: 27 + if (field4347 < class356.field4185 - 1) { // L: 28 + field4346[++field4347 - 1] = this; } - var1[2] = 0.0F; // L: 105 + } + } // L: 30 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpi;ZB)V", + garbageValue = "-26" + ) + void method7014(Buffer var1, boolean var2) { + if (var2) { // L: 45 + class388 var13 = new class388(); // L: 46 + int var6 = var1.readShort(); // L: 49 + var6 &= 16383; // L: 51 + float var5 = (float)(6.283185307179586D * (double)((float)var6 / 16384.0F)); // L: 52 + var13.method7078(var5); // L: 54 + int var9 = var1.readShort(); // L: 57 + var9 &= 16383; // L: 59 + float var8 = (float)(6.283185307179586D * (double)((float)var9 / 16384.0F)); // L: 60 + var13.method7083(var8); // L: 62 + int var12 = var1.readShort(); // L: 65 + var12 &= 16383; // L: 67 + float var11 = (float)(6.283185307179586D * (double)((float)var12 / 16384.0F)); // L: 68 + var13.method7082(var11); // L: 70 + var13.method7091((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 71 + this.method7012(var13); // L: 72 + } else { + for (int var3 = 0; var3 < 16; ++var3) { // L: 75 + this.field4348[var3] = var1.method7681(); // L: 76 + } } - return var1; // L: 107 + } // L: 79 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "426109978" + ) + float[] method7009() { + float[] var1 = new float[3]; // L: 82 + if ((double)this.field4348[2] < 0.999D && (double)this.field4348[2] > -0.999D) { // L: 83 + var1[1] = (float)(-Math.asin((double)this.field4348[2])); // L: 84 + double var2 = Math.cos((double)var1[1]); // L: 85 + var1[0] = (float)Math.atan2((double)this.field4348[6] / var2, (double)this.field4348[10] / var2); // L: 86 + var1[2] = (float)Math.atan2((double)this.field4348[1] / var2, (double)this.field4348[0] / var2); // L: 87 + } else { + var1[0] = 0.0F; // L: 90 + var1[1] = (float)Math.atan2((double)this.field4348[2], 0.0D); // L: 91 + var1[2] = (float)Math.atan2((double)(-this.field4348[9]), (double)this.field4348[5]); // L: 92 + } + + return var1; // L: 94 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "1375072290" + ) + public float[] method7010() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field4348[6])), 0.0F, 0.0F}; // L: 98 99 + double var2 = Math.cos((double)var1[0]); // L: 100 + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { // L: 101 + var4 = (double)this.field4348[2]; // L: 102 + var6 = (double)this.field4348[10]; // L: 103 + double var8 = (double)this.field4348[4]; // L: 104 + double var10 = (double)this.field4348[5]; // L: 105 + var1[1] = (float)Math.atan2(var4, var6); // L: 106 + var1[2] = (float)Math.atan2(var8, var10); // L: 107 + } else { + var4 = (double)this.field4348[1]; // L: 110 + var6 = (double)this.field4348[0]; // L: 111 + if (this.field4348[6] < 0.0F) { // L: 112 + var1[1] = (float)Math.atan2(var4, var6); // L: 113 + } else { + var1[1] = (float)(-Math.atan2(var4, var6)); // L: 116 + } + + var1[2] = 0.0F; // L: 118 + } + + return var1; // L: 120 } @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-521108963" + garbageValue = "-1674890086" ) - void method7061() { - this.field4347[0] = 1.0F; // L: 111 - this.field4347[1] = 0.0F; // L: 112 - this.field4347[2] = 0.0F; // L: 113 - this.field4347[3] = 0.0F; // L: 114 - this.field4347[4] = 0.0F; // L: 115 - this.field4347[5] = 1.0F; // L: 116 - this.field4347[6] = 0.0F; // L: 117 - this.field4347[7] = 0.0F; // L: 118 - this.field4347[8] = 0.0F; // L: 119 - this.field4347[9] = 0.0F; // L: 120 - this.field4347[10] = 1.0F; // L: 121 - this.field4347[11] = 0.0F; // L: 122 - this.field4347[12] = 0.0F; // L: 123 - this.field4347[13] = 0.0F; // L: 124 - this.field4347[14] = 0.0F; // L: 125 - this.field4347[15] = 1.0F; // L: 126 - } // L: 127 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "73" - ) - public void method7063() { - this.field4347[0] = 0.0F; // L: 130 - this.field4347[1] = 0.0F; // L: 131 - this.field4347[2] = 0.0F; // L: 132 - this.field4347[3] = 0.0F; // L: 133 - this.field4347[4] = 0.0F; // L: 134 - this.field4347[5] = 0.0F; // L: 135 - this.field4347[6] = 0.0F; // L: 136 - this.field4347[7] = 0.0F; // L: 137 - this.field4347[8] = 0.0F; // L: 138 - this.field4347[9] = 0.0F; // L: 139 - this.field4347[10] = 0.0F; // L: 140 - this.field4347[11] = 0.0F; // L: 141 - this.field4347[12] = 0.0F; // L: 142 - this.field4347[13] = 0.0F; // L: 143 - this.field4347[14] = 0.0F; // L: 144 - this.field4347[15] = 0.0F; // L: 145 - } // L: 146 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-2027114909" - ) - public void method7064(class387 var1) { - System.arraycopy(var1.field4347, 0, this.field4347, 0, 16); // L: 149 - } // L: 150 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-1159327963" - ) - public void method7065(float var1) { - this.method7066(var1, var1, var1); // L: 153 - } // L: 154 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "1632887499" - ) - public void method7066(float var1, float var2, float var3) { - this.method7061(); // L: 157 - this.field4347[0] = var1; // L: 158 - this.field4347[5] = var2; // L: 159 - this.field4347[10] = var3; // L: 160 - } // L: 161 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "853213330" - ) - public void method7067(class387 var1) { - for (int var2 = 0; var2 < this.field4347.length; ++var2) { // L: 164 - float[] var10000 = this.field4347; // L: 165 - var10000[var2] += var1.field4347[var2]; - } - - } // L: 167 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "39" - ) - public void method7109(class387 var1) { - float var2 = var1.field4347[0] * this.field4347[0] + var1.field4347[4] * this.field4347[1] + this.field4347[2] * var1.field4347[8] + var1.field4347[12] * this.field4347[3]; // L: 170 - float var3 = var1.field4347[1] * this.field4347[0] + var1.field4347[5] * this.field4347[1] + var1.field4347[9] * this.field4347[2] + this.field4347[3] * var1.field4347[13]; // L: 171 - float var4 = this.field4347[3] * var1.field4347[14] + this.field4347[0] * var1.field4347[2] + this.field4347[1] * var1.field4347[6] + var1.field4347[10] * this.field4347[2]; // L: 172 - float var5 = this.field4347[3] * var1.field4347[15] + this.field4347[2] * var1.field4347[11] + this.field4347[1] * var1.field4347[7] + var1.field4347[3] * this.field4347[0]; // L: 173 - float var6 = this.field4347[5] * var1.field4347[4] + this.field4347[4] * var1.field4347[0] + this.field4347[6] * var1.field4347[8] + var1.field4347[12] * this.field4347[7]; // L: 174 - float var7 = var1.field4347[5] * this.field4347[5] + this.field4347[4] * var1.field4347[1] + this.field4347[6] * var1.field4347[9] + this.field4347[7] * var1.field4347[13]; // L: 175 - float var8 = this.field4347[5] * var1.field4347[6] + this.field4347[4] * var1.field4347[2] + var1.field4347[10] * this.field4347[6] + var1.field4347[14] * this.field4347[7]; // L: 176 - float var9 = var1.field4347[7] * this.field4347[5] + var1.field4347[3] * this.field4347[4] + this.field4347[6] * var1.field4347[11] + var1.field4347[15] * this.field4347[7]; // L: 177 - float var10 = var1.field4347[0] * this.field4347[8] + var1.field4347[4] * this.field4347[9] + var1.field4347[8] * this.field4347[10] + var1.field4347[12] * this.field4347[11]; // L: 178 - float var11 = var1.field4347[13] * this.field4347[11] + var1.field4347[1] * this.field4347[8] + var1.field4347[5] * this.field4347[9] + var1.field4347[9] * this.field4347[10]; // L: 179 - float var12 = var1.field4347[6] * this.field4347[9] + this.field4347[8] * var1.field4347[2] + var1.field4347[10] * this.field4347[10] + var1.field4347[14] * this.field4347[11]; // L: 180 - float var13 = this.field4347[11] * var1.field4347[15] + this.field4347[8] * var1.field4347[3] + this.field4347[9] * var1.field4347[7] + var1.field4347[11] * this.field4347[10]; // L: 181 - float var14 = this.field4347[15] * var1.field4347[12] + var1.field4347[4] * this.field4347[13] + var1.field4347[0] * this.field4347[12] + this.field4347[14] * var1.field4347[8]; // L: 182 - float var15 = this.field4347[14] * var1.field4347[9] + var1.field4347[5] * this.field4347[13] + this.field4347[12] * var1.field4347[1] + var1.field4347[13] * this.field4347[15]; // L: 183 - float var16 = var1.field4347[14] * this.field4347[15] + this.field4347[13] * var1.field4347[6] + var1.field4347[2] * this.field4347[12] + this.field4347[14] * var1.field4347[10]; // L: 184 - float var17 = var1.field4347[3] * this.field4347[12] + this.field4347[13] * var1.field4347[7] + this.field4347[14] * var1.field4347[11] + this.field4347[15] * var1.field4347[15]; // L: 185 - this.field4347[0] = var2; // L: 186 - this.field4347[1] = var3; // L: 187 - this.field4347[2] = var4; // L: 188 - this.field4347[3] = var5; // L: 189 - this.field4347[4] = var6; // L: 190 - this.field4347[5] = var7; // L: 191 - this.field4347[6] = var8; // L: 192 - this.field4347[7] = var9; // L: 193 - this.field4347[8] = var10; // L: 194 - this.field4347[9] = var11; // L: 195 - this.field4347[10] = var12; // L: 196 - this.field4347[11] = var13; // L: 197 - this.field4347[12] = var14; // L: 198 - this.field4347[13] = var15; // L: 199 - this.field4347[14] = var16; // L: 200 - this.field4347[15] = var17; // L: 201 - } // L: 202 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lnf;I)V", - garbageValue = "-1554495705" - ) - public void method7069(class386 var1) { - float var2 = var1.field4338 * var1.field4338; // L: 205 - float var3 = var1.field4338 * var1.field4339; // L: 206 - float var4 = var1.field4338 * var1.field4340; // L: 207 - float var5 = var1.field4341 * var1.field4338; // L: 208 - float var6 = var1.field4339 * var1.field4339; // L: 209 - float var7 = var1.field4340 * var1.field4339; // L: 210 - float var8 = var1.field4339 * var1.field4341; // L: 211 - float var9 = var1.field4340 * var1.field4340; // L: 212 - float var10 = var1.field4340 * var1.field4341; // L: 213 - float var11 = var1.field4341 * var1.field4341; // L: 214 - this.field4347[0] = var2 + var6 - var11 - var9; // L: 215 - this.field4347[1] = var7 + var5 + var7 + var5; // L: 216 - this.field4347[2] = var8 + (var8 - var4 - var4); // L: 217 - this.field4347[4] = var7 - var5 - var5 + var7; // L: 218 - this.field4347[5] = var9 + var2 - var6 - var11; // L: 219 - this.field4347[6] = var3 + var10 + var3 + var10; // L: 220 - this.field4347[8] = var4 + var4 + var8 + var8; // L: 221 - this.field4347[9] = var10 + (var10 - var3 - var3); // L: 222 - this.field4347[10] = var11 + var2 - var9 - var6; // L: 223 - } // L: 224 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lnr;B)V", - garbageValue = "-72" - ) - void method7070(class388 var1) { - this.field4347[0] = var1.field4359; // L: 227 - this.field4347[1] = var1.field4350; // L: 228 - this.field4347[2] = var1.field4351; // L: 229 - this.field4347[3] = 0.0F; // L: 230 - this.field4347[4] = var1.field4352; // L: 231 - this.field4347[5] = var1.field4353; // L: 232 - this.field4347[6] = var1.field4357; // L: 233 - this.field4347[7] = 0.0F; // L: 234 - this.field4347[8] = var1.field4355; // L: 235 - this.field4347[9] = var1.field4349; // L: 236 - this.field4347[10] = var1.field4356; // L: 237 - this.field4347[11] = 0.0F; // L: 238 - this.field4347[12] = var1.field4358; // L: 239 - this.field4347[13] = var1.field4354; // L: 240 - this.field4347[14] = var1.field4360; // L: 241 - this.field4347[15] = 1.0F; // L: 242 - } // L: 243 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "0" - ) - float method7071() { - return this.field4347[12] * this.field4347[3] * this.field4347[6] * this.field4347[9] + (this.field4347[8] * this.field4347[3] * this.field4347[5] * this.field4347[14] + this.field4347[13] * this.field4347[3] * this.field4347[4] * this.field4347[10] + (this.field4347[13] * this.field4347[2] * this.field4347[7] * this.field4347[8] + this.field4347[10] * this.field4347[1] * this.field4347[7] * this.field4347[12] + (this.field4347[15] * this.field4347[0] * this.field4347[5] * this.field4347[10] - this.field4347[14] * this.field4347[11] * this.field4347[0] * this.field4347[5] - this.field4347[15] * this.field4347[9] * this.field4347[6] * this.field4347[0] + this.field4347[11] * this.field4347[0] * this.field4347[6] * this.field4347[13] + this.field4347[0] * this.field4347[7] * this.field4347[9] * this.field4347[14] - this.field4347[13] * this.field4347[7] * this.field4347[0] * this.field4347[10] - this.field4347[15] * this.field4347[10] * this.field4347[4] * this.field4347[1] + this.field4347[14] * this.field4347[11] * this.field4347[4] * this.field4347[1] + this.field4347[6] * this.field4347[1] * this.field4347[8] * this.field4347[15] - this.field4347[1] * this.field4347[6] * this.field4347[11] * this.field4347[12] - this.field4347[8] * this.field4347[7] * this.field4347[1] * this.field4347[14]) + this.field4347[15] * this.field4347[2] * this.field4347[4] * this.field4347[9] - this.field4347[2] * this.field4347[4] * this.field4347[11] * this.field4347[13] - this.field4347[15] * this.field4347[8] * this.field4347[5] * this.field4347[2] + this.field4347[12] * this.field4347[11] * this.field4347[2] * this.field4347[5] - this.field4347[12] * this.field4347[9] * this.field4347[2] * this.field4347[7] - this.field4347[4] * this.field4347[3] * this.field4347[9] * this.field4347[14]) - this.field4347[12] * this.field4347[10] * this.field4347[3] * this.field4347[5] - this.field4347[13] * this.field4347[8] * this.field4347[6] * this.field4347[3]); // L: 246 - } + public void method7011() { + this.field4348[0] = 1.0F; // L: 124 + this.field4348[1] = 0.0F; // L: 125 + this.field4348[2] = 0.0F; // L: 126 + this.field4348[3] = 0.0F; // L: 127 + this.field4348[4] = 0.0F; // L: 128 + this.field4348[5] = 1.0F; // L: 129 + this.field4348[6] = 0.0F; // L: 130 + this.field4348[7] = 0.0F; // L: 131 + this.field4348[8] = 0.0F; // L: 132 + this.field4348[9] = 0.0F; // L: 133 + this.field4348[10] = 1.0F; // L: 134 + this.field4348[11] = 0.0F; // L: 135 + this.field4348[12] = 0.0F; // L: 136 + this.field4348[13] = 0.0F; // L: 137 + this.field4348[14] = 0.0F; // L: 138 + this.field4348[15] = 1.0F; // L: 139 + } // L: 140 @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "2" + garbageValue = "39" ) - public void method7111() { - float var1 = 1.0F / this.method7071(); // L: 250 - float var2 = (this.field4347[13] * this.field4347[6] * this.field4347[11] + (this.field4347[10] * this.field4347[5] * this.field4347[15] - this.field4347[11] * this.field4347[5] * this.field4347[14] - this.field4347[15] * this.field4347[9] * this.field4347[6]) + this.field4347[7] * this.field4347[9] * this.field4347[14] - this.field4347[13] * this.field4347[7] * this.field4347[10]) * var1; // L: 251 - float var3 = var1 * (this.field4347[10] * this.field4347[3] * this.field4347[13] + (this.field4347[10] * -this.field4347[1] * this.field4347[15] + this.field4347[14] * this.field4347[11] * this.field4347[1] + this.field4347[15] * this.field4347[2] * this.field4347[9] - this.field4347[13] * this.field4347[2] * this.field4347[11] - this.field4347[14] * this.field4347[3] * this.field4347[9])); // L: 252 - float var4 = var1 * (this.field4347[13] * this.field4347[2] * this.field4347[7] + (this.field4347[6] * this.field4347[1] * this.field4347[15] - this.field4347[1] * this.field4347[7] * this.field4347[14] - this.field4347[15] * this.field4347[5] * this.field4347[2]) + this.field4347[5] * this.field4347[3] * this.field4347[14] - this.field4347[3] * this.field4347[6] * this.field4347[13]); // L: 253 - float var5 = (this.field4347[9] * this.field4347[6] * this.field4347[3] + (this.field4347[10] * this.field4347[1] * this.field4347[7] + this.field4347[6] * -this.field4347[1] * this.field4347[11] + this.field4347[2] * this.field4347[5] * this.field4347[11] - this.field4347[9] * this.field4347[2] * this.field4347[7] - this.field4347[3] * this.field4347[5] * this.field4347[10])) * var1; // L: 254 - float var6 = (this.field4347[7] * this.field4347[10] * this.field4347[12] + (this.field4347[14] * this.field4347[11] * this.field4347[4] + this.field4347[15] * -this.field4347[4] * this.field4347[10] + this.field4347[8] * this.field4347[6] * this.field4347[15] - this.field4347[6] * this.field4347[11] * this.field4347[12] - this.field4347[14] * this.field4347[7] * this.field4347[8])) * var1; // L: 255 - float var7 = (this.field4347[3] * this.field4347[8] * this.field4347[14] + this.field4347[12] * this.field4347[11] * this.field4347[2] + (this.field4347[15] * this.field4347[0] * this.field4347[10] - this.field4347[11] * this.field4347[0] * this.field4347[14] - this.field4347[15] * this.field4347[2] * this.field4347[8]) - this.field4347[12] * this.field4347[3] * this.field4347[10]) * var1; // L: 256 - float var8 = var1 * (this.field4347[15] * this.field4347[2] * this.field4347[4] + -this.field4347[0] * this.field4347[6] * this.field4347[15] + this.field4347[14] * this.field4347[7] * this.field4347[0] - this.field4347[12] * this.field4347[2] * this.field4347[7] - this.field4347[14] * this.field4347[3] * this.field4347[4] + this.field4347[6] * this.field4347[3] * this.field4347[12]); // L: 257 - float var9 = var1 * (this.field4347[2] * this.field4347[7] * this.field4347[8] + (this.field4347[11] * this.field4347[0] * this.field4347[6] - this.field4347[7] * this.field4347[0] * this.field4347[10] - this.field4347[11] * this.field4347[2] * this.field4347[4]) + this.field4347[3] * this.field4347[4] * this.field4347[10] - this.field4347[8] * this.field4347[6] * this.field4347[3]); // L: 258 - float var10 = var1 * (this.field4347[12] * this.field4347[11] * this.field4347[5] + (this.field4347[4] * this.field4347[9] * this.field4347[15] - this.field4347[4] * this.field4347[11] * this.field4347[13] - this.field4347[15] * this.field4347[5] * this.field4347[8]) + this.field4347[7] * this.field4347[8] * this.field4347[13] - this.field4347[12] * this.field4347[9] * this.field4347[7]); // L: 259 - float var11 = var1 * (this.field4347[0] * this.field4347[11] * this.field4347[13] + this.field4347[9] * -this.field4347[0] * this.field4347[15] + this.field4347[15] * this.field4347[8] * this.field4347[1] - this.field4347[12] * this.field4347[11] * this.field4347[1] - this.field4347[13] * this.field4347[3] * this.field4347[8] + this.field4347[12] * this.field4347[9] * this.field4347[3]); // L: 260 - float var12 = var1 * (this.field4347[4] * this.field4347[3] * this.field4347[13] + this.field4347[15] * this.field4347[5] * this.field4347[0] - this.field4347[0] * this.field4347[7] * this.field4347[13] - this.field4347[4] * this.field4347[1] * this.field4347[15] + this.field4347[12] * this.field4347[7] * this.field4347[1] - this.field4347[12] * this.field4347[3] * this.field4347[5]); // L: 261 - float var13 = var1 * (this.field4347[8] * this.field4347[5] * this.field4347[3] + (-this.field4347[0] * this.field4347[5] * this.field4347[11] + this.field4347[7] * this.field4347[0] * this.field4347[9] + this.field4347[1] * this.field4347[4] * this.field4347[11] - this.field4347[8] * this.field4347[1] * this.field4347[7] - this.field4347[9] * this.field4347[4] * this.field4347[3])); // L: 262 - float var14 = var1 * (this.field4347[13] * this.field4347[4] * this.field4347[10] + -this.field4347[4] * this.field4347[9] * this.field4347[14] + this.field4347[14] * this.field4347[8] * this.field4347[5] - this.field4347[5] * this.field4347[10] * this.field4347[12] - this.field4347[13] * this.field4347[8] * this.field4347[6] + this.field4347[12] * this.field4347[9] * this.field4347[6]); // L: 263 - float var15 = var1 * (this.field4347[13] * this.field4347[8] * this.field4347[2] + this.field4347[14] * this.field4347[0] * this.field4347[9] - this.field4347[10] * this.field4347[0] * this.field4347[13] - this.field4347[8] * this.field4347[1] * this.field4347[14] + this.field4347[12] * this.field4347[10] * this.field4347[1] - this.field4347[12] * this.field4347[9] * this.field4347[2]); // L: 264 - float var16 = var1 * (-this.field4347[0] * this.field4347[5] * this.field4347[14] + this.field4347[13] * this.field4347[6] * this.field4347[0] + this.field4347[14] * this.field4347[4] * this.field4347[1] - this.field4347[1] * this.field4347[6] * this.field4347[12] - this.field4347[2] * this.field4347[4] * this.field4347[13] + this.field4347[2] * this.field4347[5] * this.field4347[12]); // L: 265 - float var17 = var1 * (this.field4347[2] * this.field4347[4] * this.field4347[9] + this.field4347[10] * this.field4347[0] * this.field4347[5] - this.field4347[9] * this.field4347[0] * this.field4347[6] - this.field4347[10] * this.field4347[1] * this.field4347[4] + this.field4347[8] * this.field4347[6] * this.field4347[1] - this.field4347[5] * this.field4347[2] * this.field4347[8]); // L: 266 - this.field4347[0] = var2; // L: 267 - this.field4347[1] = var3; // L: 268 - this.field4347[2] = var4; // L: 269 - this.field4347[3] = var5; // L: 270 - this.field4347[4] = var6; // L: 271 - this.field4347[5] = var7; // L: 272 - this.field4347[6] = var8; // L: 273 - this.field4347[7] = var9; // L: 274 - this.field4347[8] = var10; // L: 275 - this.field4347[9] = var11; // L: 276 - this.field4347[10] = var12; // L: 277 - this.field4347[11] = var13; // L: 278 - this.field4347[12] = var14; // L: 279 - this.field4347[13] = var15; // L: 280 - this.field4347[14] = var16; // L: 281 - this.field4347[15] = var17; // L: 282 - } // L: 283 + public void method7064() { + this.field4348[0] = 0.0F; // L: 143 + this.field4348[1] = 0.0F; // L: 144 + this.field4348[2] = 0.0F; // L: 145 + this.field4348[3] = 0.0F; // L: 146 + this.field4348[4] = 0.0F; // L: 147 + this.field4348[5] = 0.0F; // L: 148 + this.field4348[6] = 0.0F; // L: 149 + this.field4348[7] = 0.0F; // L: 150 + this.field4348[8] = 0.0F; // L: 151 + this.field4348[9] = 0.0F; // L: 152 + this.field4348[10] = 0.0F; // L: 153 + this.field4348[11] = 0.0F; // L: 154 + this.field4348[12] = 0.0F; // L: 155 + this.field4348[13] = 0.0F; // L: 156 + this.field4348[14] = 0.0F; // L: 157 + this.field4348[15] = 0.0F; // L: 158 + } // L: 159 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "100" + descriptor = "(Lnt;I)V", + garbageValue = "1612769001" ) - public float[] method7074() { - float[] var1 = new float[3]; // L: 320 - class385 var2 = new class385(this.field4347[0], this.field4347[1], this.field4347[2]); // L: 321 - class385 var3 = new class385(this.field4347[4], this.field4347[5], this.field4347[6]); // L: 322 - class385 var4 = new class385(this.field4347[8], this.field4347[9], this.field4347[10]); // L: 323 - var1[0] = var2.method7026(); // L: 324 - var1[1] = var3.method7026(); // L: 325 - var1[2] = var4.method7026(); // L: 326 - return var1; // L: 327 + public void method7032(class387 var1) { + System.arraycopy(var1.field4348, 0, this.field4348, 0, 16); // L: 162 + } // L: 163 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1962810997" + ) + public void method7043(float var1) { + this.method7049(var1, var1, var1); // L: 166 + } // L: 167 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(FFFB)V", + garbageValue = "-93" + ) + public void method7049(float var1, float var2, float var3) { + this.method7011(); // L: 170 + this.field4348[0] = var1; // L: 171 + this.field4348[5] = var2; // L: 172 + this.field4348[10] = var3; // L: 173 + } // L: 174 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lnt;I)V", + garbageValue = "-290385011" + ) + public void method7016(class387 var1) { + for (int var2 = 0; var2 < this.field4348.length; ++var2) { // L: 177 + float[] var10000 = this.field4348; // L: 178 + var10000[var2] += var1.field4348[var2]; + } + + } // L: 180 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lnt;I)V", + garbageValue = "-1551118407" + ) + public void method7017(class387 var1) { + float var2 = var1.field4348[0] * this.field4348[0] + var1.field4348[4] * this.field4348[1] + this.field4348[2] * var1.field4348[8] + this.field4348[3] * var1.field4348[12]; // L: 183 + float var3 = var1.field4348[13] * this.field4348[3] + this.field4348[1] * var1.field4348[5] + this.field4348[0] * var1.field4348[1] + var1.field4348[9] * this.field4348[2]; // L: 184 + float var4 = var1.field4348[14] * this.field4348[3] + this.field4348[2] * var1.field4348[10] + this.field4348[0] * var1.field4348[2] + this.field4348[1] * var1.field4348[6]; // L: 185 + float var5 = var1.field4348[15] * this.field4348[3] + var1.field4348[7] * this.field4348[1] + this.field4348[0] * var1.field4348[3] + var1.field4348[11] * this.field4348[2]; // L: 186 + float var6 = this.field4348[6] * var1.field4348[8] + var1.field4348[0] * this.field4348[4] + var1.field4348[4] * this.field4348[5] + var1.field4348[12] * this.field4348[7]; // L: 187 + float var7 = this.field4348[6] * var1.field4348[9] + var1.field4348[5] * this.field4348[5] + var1.field4348[1] * this.field4348[4] + this.field4348[7] * var1.field4348[13]; // L: 188 + float var8 = this.field4348[7] * var1.field4348[14] + var1.field4348[2] * this.field4348[4] + var1.field4348[6] * this.field4348[5] + var1.field4348[10] * this.field4348[6]; // L: 189 + float var9 = var1.field4348[15] * this.field4348[7] + this.field4348[5] * var1.field4348[7] + this.field4348[4] * var1.field4348[3] + this.field4348[6] * var1.field4348[11]; // L: 190 + float var10 = var1.field4348[12] * this.field4348[11] + var1.field4348[8] * this.field4348[10] + var1.field4348[4] * this.field4348[9] + this.field4348[8] * var1.field4348[0]; // L: 191 + float var11 = this.field4348[11] * var1.field4348[13] + this.field4348[10] * var1.field4348[9] + this.field4348[8] * var1.field4348[1] + this.field4348[9] * var1.field4348[5]; // L: 192 + float var12 = this.field4348[10] * var1.field4348[10] + var1.field4348[6] * this.field4348[9] + this.field4348[8] * var1.field4348[2] + var1.field4348[14] * this.field4348[11]; // L: 193 + float var13 = this.field4348[10] * var1.field4348[11] + this.field4348[8] * var1.field4348[3] + var1.field4348[7] * this.field4348[9] + var1.field4348[15] * this.field4348[11]; // L: 194 + float var14 = var1.field4348[4] * this.field4348[13] + this.field4348[12] * var1.field4348[0] + this.field4348[14] * var1.field4348[8] + this.field4348[15] * var1.field4348[12]; // L: 195 + float var15 = var1.field4348[13] * this.field4348[15] + this.field4348[14] * var1.field4348[9] + var1.field4348[1] * this.field4348[12] + this.field4348[13] * var1.field4348[5]; // L: 196 + float var16 = var1.field4348[14] * this.field4348[15] + var1.field4348[10] * this.field4348[14] + var1.field4348[6] * this.field4348[13] + this.field4348[12] * var1.field4348[2]; // L: 197 + float var17 = var1.field4348[7] * this.field4348[13] + this.field4348[12] * var1.field4348[3] + var1.field4348[11] * this.field4348[14] + this.field4348[15] * var1.field4348[15]; // L: 198 + this.field4348[0] = var2; // L: 199 + this.field4348[1] = var3; // L: 200 + this.field4348[2] = var4; // L: 201 + this.field4348[3] = var5; // L: 202 + this.field4348[4] = var6; // L: 203 + this.field4348[5] = var7; // L: 204 + this.field4348[6] = var8; // L: 205 + this.field4348[7] = var9; // L: 206 + this.field4348[8] = var10; // L: 207 + this.field4348[9] = var11; // L: 208 + this.field4348[10] = var12; // L: 209 + this.field4348[11] = var13; // L: 210 + this.field4348[12] = var14; // L: 211 + this.field4348[13] = var15; // L: 212 + this.field4348[14] = var16; // L: 213 + this.field4348[15] = var17; // L: 214 + } // L: 215 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lnq;I)V", + garbageValue = "1080708844" + ) + public void method7006(class386 var1) { + float var2 = var1.field4343 * var1.field4343; // L: 218 + float var3 = var1.field4340 * var1.field4343; // L: 219 + float var4 = var1.field4341 * var1.field4343; // L: 220 + float var5 = var1.field4343 * var1.field4342; // L: 221 + float var6 = var1.field4340 * var1.field4340; // L: 222 + float var7 = var1.field4341 * var1.field4340; // L: 223 + float var8 = var1.field4340 * var1.field4342; // L: 224 + float var9 = var1.field4341 * var1.field4341; // L: 225 + float var10 = var1.field4341 * var1.field4342; // L: 226 + float var11 = var1.field4342 * var1.field4342; // L: 227 + this.field4348[0] = var2 + var6 - var11 - var9; // L: 228 + this.field4348[1] = var5 + var7 + var7 + var5; // L: 229 + this.field4348[2] = var8 - var4 - var4 + var8; // L: 230 + this.field4348[4] = var7 + (var7 - var5 - var5); // L: 231 + this.field4348[5] = var2 + var9 - var6 - var11; // L: 232 + this.field4348[6] = var3 + var10 + var10 + var3; // L: 233 + this.field4348[8] = var4 + var8 + var8 + var4; // L: 234 + this.field4348[9] = var10 + (var10 - var3 - var3); // L: 235 + this.field4348[10] = var2 + var11 - var9 - var6; // L: 236 + } // L: 237 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lnb;B)V", + garbageValue = "-22" + ) + void method7012(class388 var1) { + this.field4348[0] = var1.field4355; // L: 240 + this.field4348[1] = var1.field4357; // L: 241 + this.field4348[2] = var1.field4353; // L: 242 + this.field4348[3] = 0.0F; // L: 243 + this.field4348[4] = var1.field4354; // L: 244 + this.field4348[5] = var1.field4352; // L: 245 + this.field4348[6] = var1.field4356; // L: 246 + this.field4348[7] = 0.0F; // L: 247 + this.field4348[8] = var1.field4351; // L: 248 + this.field4348[9] = var1.field4360; // L: 249 + this.field4348[10] = var1.field4359; // L: 250 + this.field4348[11] = 0.0F; // L: 251 + this.field4348[12] = var1.field4362; // L: 252 + this.field4348[13] = var1.field4361; // L: 253 + this.field4348[14] = var1.field4358; // L: 254 + this.field4348[15] = 1.0F; // L: 255 + } // L: 256 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "110" + ) + float method7075() { + return this.field4348[13] * this.field4348[8] * this.field4348[7] * this.field4348[2] + this.field4348[15] * this.field4348[9] * this.field4348[2] * this.field4348[4] + this.field4348[15] * this.field4348[8] * this.field4348[1] * this.field4348[6] + this.field4348[0] * this.field4348[7] * this.field4348[9] * this.field4348[14] + this.field4348[11] * this.field4348[0] * this.field4348[6] * this.field4348[13] + (this.field4348[15] * this.field4348[0] * this.field4348[5] * this.field4348[10] - this.field4348[5] * this.field4348[0] * this.field4348[11] * this.field4348[14] - this.field4348[15] * this.field4348[9] * this.field4348[6] * this.field4348[0]) - this.field4348[13] * this.field4348[10] * this.field4348[7] * this.field4348[0] - this.field4348[10] * this.field4348[1] * this.field4348[4] * this.field4348[15] + this.field4348[4] * this.field4348[1] * this.field4348[11] * this.field4348[14] - this.field4348[11] * this.field4348[6] * this.field4348[1] * this.field4348[12] - this.field4348[1] * this.field4348[7] * this.field4348[8] * this.field4348[14] + this.field4348[10] * this.field4348[7] * this.field4348[1] * this.field4348[12] - this.field4348[13] * this.field4348[11] * this.field4348[4] * this.field4348[2] - this.field4348[2] * this.field4348[5] * this.field4348[8] * this.field4348[15] + this.field4348[11] * this.field4348[5] * this.field4348[2] * this.field4348[12] - this.field4348[7] * this.field4348[2] * this.field4348[9] * this.field4348[12] - this.field4348[14] * this.field4348[4] * this.field4348[3] * this.field4348[9] + this.field4348[10] * this.field4348[4] * this.field4348[3] * this.field4348[13] + this.field4348[14] * this.field4348[8] * this.field4348[5] * this.field4348[3] - this.field4348[10] * this.field4348[5] * this.field4348[3] * this.field4348[12] - this.field4348[13] * this.field4348[6] * this.field4348[3] * this.field4348[8] + this.field4348[9] * this.field4348[6] * this.field4348[3] * this.field4348[12]; // L: 259 } - public int hashCode() { - boolean var1 = true; // L: 305 - byte var2 = 1; // L: 306 - int var3 = var2 * 31 + Arrays.hashCode(this.field4347); // L: 307 - return var3; // L: 308 + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1244640444" + ) + public void method7021() { + float var1 = 1.0F / this.method7075(); // L: 263 + float var2 = var1 * (this.field4348[10] * this.field4348[5] * this.field4348[15] - this.field4348[11] * this.field4348[5] * this.field4348[14] - this.field4348[15] * this.field4348[9] * this.field4348[6] + this.field4348[11] * this.field4348[6] * this.field4348[13] + this.field4348[14] * this.field4348[9] * this.field4348[7] - this.field4348[13] * this.field4348[7] * this.field4348[10]); // L: 264 + float var3 = (this.field4348[13] * this.field4348[10] * this.field4348[3] + (this.field4348[15] * -this.field4348[1] * this.field4348[10] + this.field4348[14] * this.field4348[11] * this.field4348[1] + this.field4348[2] * this.field4348[9] * this.field4348[15] - this.field4348[13] * this.field4348[11] * this.field4348[2] - this.field4348[3] * this.field4348[9] * this.field4348[14])) * var1; // L: 265 + float var4 = var1 * (this.field4348[5] * this.field4348[3] * this.field4348[14] + this.field4348[6] * this.field4348[1] * this.field4348[15] - this.field4348[14] * this.field4348[7] * this.field4348[1] - this.field4348[5] * this.field4348[2] * this.field4348[15] + this.field4348[13] * this.field4348[7] * this.field4348[2] - this.field4348[6] * this.field4348[3] * this.field4348[13]); // L: 266 + float var5 = (this.field4348[5] * this.field4348[2] * this.field4348[11] + -this.field4348[1] * this.field4348[6] * this.field4348[11] + this.field4348[10] * this.field4348[7] * this.field4348[1] - this.field4348[7] * this.field4348[2] * this.field4348[9] - this.field4348[10] * this.field4348[5] * this.field4348[3] + this.field4348[9] * this.field4348[3] * this.field4348[6]) * var1; // L: 267 + float var6 = (this.field4348[10] * this.field4348[7] * this.field4348[12] + (this.field4348[11] * this.field4348[4] * this.field4348[14] + -this.field4348[4] * this.field4348[10] * this.field4348[15] + this.field4348[15] * this.field4348[6] * this.field4348[8] - this.field4348[12] * this.field4348[6] * this.field4348[11] - this.field4348[14] * this.field4348[7] * this.field4348[8])) * var1; // L: 268 + float var7 = var1 * (this.field4348[14] * this.field4348[3] * this.field4348[8] + this.field4348[12] * this.field4348[2] * this.field4348[11] + (this.field4348[15] * this.field4348[0] * this.field4348[10] - this.field4348[11] * this.field4348[0] * this.field4348[14] - this.field4348[8] * this.field4348[2] * this.field4348[15]) - this.field4348[3] * this.field4348[10] * this.field4348[12]); // L: 269 + float var8 = (this.field4348[2] * this.field4348[4] * this.field4348[15] + this.field4348[14] * this.field4348[7] * this.field4348[0] + this.field4348[6] * -this.field4348[0] * this.field4348[15] - this.field4348[2] * this.field4348[7] * this.field4348[12] - this.field4348[14] * this.field4348[4] * this.field4348[3] + this.field4348[12] * this.field4348[3] * this.field4348[6]) * var1; // L: 270 + float var9 = var1 * (this.field4348[2] * this.field4348[7] * this.field4348[8] + (this.field4348[11] * this.field4348[0] * this.field4348[6] - this.field4348[0] * this.field4348[7] * this.field4348[10] - this.field4348[4] * this.field4348[2] * this.field4348[11]) + this.field4348[4] * this.field4348[3] * this.field4348[10] - this.field4348[6] * this.field4348[3] * this.field4348[8]); // L: 271 + float var10 = var1 * (this.field4348[7] * this.field4348[8] * this.field4348[13] + this.field4348[12] * this.field4348[5] * this.field4348[11] + (this.field4348[15] * this.field4348[4] * this.field4348[9] - this.field4348[13] * this.field4348[4] * this.field4348[11] - this.field4348[5] * this.field4348[8] * this.field4348[15]) - this.field4348[9] * this.field4348[7] * this.field4348[12]); // L: 272 + float var11 = var1 * (this.field4348[15] * this.field4348[8] * this.field4348[1] + this.field4348[13] * this.field4348[11] * this.field4348[0] + this.field4348[15] * -this.field4348[0] * this.field4348[9] - this.field4348[12] * this.field4348[1] * this.field4348[11] - this.field4348[8] * this.field4348[3] * this.field4348[13] + this.field4348[12] * this.field4348[9] * this.field4348[3]); // L: 273 + float var12 = var1 * (this.field4348[5] * this.field4348[0] * this.field4348[15] - this.field4348[13] * this.field4348[0] * this.field4348[7] - this.field4348[4] * this.field4348[1] * this.field4348[15] + this.field4348[12] * this.field4348[7] * this.field4348[1] + this.field4348[13] * this.field4348[3] * this.field4348[4] - this.field4348[5] * this.field4348[3] * this.field4348[12]); // L: 274 + float var13 = var1 * (this.field4348[8] * this.field4348[5] * this.field4348[3] + (this.field4348[4] * this.field4348[1] * this.field4348[11] + -this.field4348[0] * this.field4348[5] * this.field4348[11] + this.field4348[9] * this.field4348[0] * this.field4348[7] - this.field4348[1] * this.field4348[7] * this.field4348[8] - this.field4348[4] * this.field4348[3] * this.field4348[9])); // L: 275 + float var14 = (this.field4348[6] * this.field4348[9] * this.field4348[12] + (this.field4348[5] * this.field4348[8] * this.field4348[14] + this.field4348[13] * this.field4348[4] * this.field4348[10] + this.field4348[14] * -this.field4348[4] * this.field4348[9] - this.field4348[12] * this.field4348[10] * this.field4348[5] - this.field4348[8] * this.field4348[6] * this.field4348[13])) * var1; // L: 276 + float var15 = var1 * (this.field4348[0] * this.field4348[9] * this.field4348[14] - this.field4348[13] * this.field4348[0] * this.field4348[10] - this.field4348[8] * this.field4348[1] * this.field4348[14] + this.field4348[12] * this.field4348[1] * this.field4348[10] + this.field4348[13] * this.field4348[2] * this.field4348[8] - this.field4348[12] * this.field4348[2] * this.field4348[9]); // L: 277 + float var16 = var1 * (this.field4348[12] * this.field4348[5] * this.field4348[2] + (this.field4348[14] * -this.field4348[0] * this.field4348[5] + this.field4348[13] * this.field4348[6] * this.field4348[0] + this.field4348[4] * this.field4348[1] * this.field4348[14] - this.field4348[12] * this.field4348[6] * this.field4348[1] - this.field4348[2] * this.field4348[4] * this.field4348[13])); // L: 278 + float var17 = var1 * (this.field4348[9] * this.field4348[2] * this.field4348[4] + this.field4348[8] * this.field4348[6] * this.field4348[1] + (this.field4348[10] * this.field4348[5] * this.field4348[0] - this.field4348[0] * this.field4348[6] * this.field4348[9] - this.field4348[10] * this.field4348[1] * this.field4348[4]) - this.field4348[2] * this.field4348[5] * this.field4348[8]); // L: 279 + this.field4348[0] = var2; // L: 280 + this.field4348[1] = var3; // L: 281 + this.field4348[2] = var4; // L: 282 + this.field4348[3] = var5; // L: 283 + this.field4348[4] = var6; // L: 284 + this.field4348[5] = var7; // L: 285 + this.field4348[6] = var8; // L: 286 + this.field4348[7] = var9; // L: 287 + this.field4348[8] = var10; // L: 288 + this.field4348[9] = var11; // L: 289 + this.field4348[10] = var12; // L: 290 + this.field4348[11] = var13; // L: 291 + this.field4348[12] = var14; // L: 292 + this.field4348[13] = var15; // L: 293 + this.field4348[14] = var16; // L: 294 + this.field4348[15] = var17; // L: 295 + } // L: 296 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "926402902" + ) + public float[] method7023() { + float[] var1 = new float[3]; // L: 330 + class385 var2 = new class385(this.field4348[0], this.field4348[1], this.field4348[2]); // L: 331 + class385 var3 = new class385(this.field4348[4], this.field4348[5], this.field4348[6]); // L: 332 + class385 var4 = new class385(this.field4348[8], this.field4348[9], this.field4348[10]); // L: 333 + var1[0] = var2.method6973(); // L: 334 + var1[1] = var3.method6973(); // L: 335 + var1[2] = var4.method6973(); // L: 336 + return var1; // L: 337 } public String toString() { - StringBuilder var1 = new StringBuilder(); // L: 288 - this.method7072(); // L: 289 - this.method7086(); // L: 290 + StringBuilder var1 = new StringBuilder(); // L: 300 + this.method7010(); // L: 301 + this.method7009(); // L: 302 - for (int var2 = 0; var2 < 4; ++var2) { // L: 291 - for (int var3 = 0; var3 < 4; ++var3) { // L: 292 + for (int var2 = 0; var2 < 4; ++var2) { // L: 303 + for (int var3 = 0; var3 < 4; ++var3) { // L: 304 if (var3 > 0) { - var1.append("\t"); // L: 293 + var1.append("\t"); // L: 305 } - float var4 = this.field4347[var3 + var2 * 4]; // L: 294 - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 295 + float var4 = this.field4348[var3 + var2 * 4]; // L: 306 + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 307 var4 = 0.0F; } - var1.append(var4); // L: 296 + var1.append(var4); // L: 308 } - var1.append("\n"); // L: 298 + var1.append("\n"); // L: 310 } - return var1.toString(); // L: 300 + return var1.toString(); // L: 312 } public boolean equals(Object var1) { - if (!(var1 instanceof class387)) { // L: 313 + if (!(var1 instanceof class387)) { // L: 323 return false; } else { - class387 var2 = (class387)var1; // L: 314 + class387 var2 = (class387)var1; // L: 324 - for (int var3 = 0; var3 < 16; ++var3) { // L: 315 - if (var2.field4347[var3] != this.field4347[var3]) { + for (int var3 = 0; var3 < 16; ++var3) { // L: 325 + if (this.field4348[var3] != var2.field4348[var3]) { return false; } } - return true; // L: 316 + return true; // L: 326 } } + + public int hashCode() { + byte var2 = 1; // L: 317 + int var3 = var2 * 31 + Arrays.hashCode(this.field4348); // L: 318 + return var3; // L: 319 + } } diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java index af6a1ae436..a494995603 100644 --- a/runescape-client/src/main/java/class388.java +++ b/runescape-client/src/main/java/class388.java @@ -1,274 +1,139 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nr") +@ObfuscatedName("nb") public class class388 { @ObfuscatedName("v") + float field4355; + @ObfuscatedName("c") + float field4357; + @ObfuscatedName("i") + float field4353; + @ObfuscatedName("f") + float field4354; + @ObfuscatedName("b") + float field4352; + @ObfuscatedName("n") + float field4356; + @ObfuscatedName("s") + float field4351; + @ObfuscatedName("l") + float field4360; + @ObfuscatedName("q") float field4359; @ObfuscatedName("o") - float field4350; - @ObfuscatedName("h") - float field4351; - @ObfuscatedName("g") - float field4352; - @ObfuscatedName("l") - float field4353; - @ObfuscatedName("n") - float field4357; - @ObfuscatedName("d") - float field4355; - @ObfuscatedName("f") - float field4349; - @ObfuscatedName("u") - float field4356; + float field4362; @ObfuscatedName("r") + float field4361; + @ObfuscatedName("p") float field4358; - @ObfuscatedName("k") - float field4354; - @ObfuscatedName("x") - float field4360; static { new class388(); } // L: 6 class388() { - this.method7127(); - } + this.method7077(); // L: 22 + } // L: 23 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1625527457" + garbageValue = "1869591200" ) - void method7127() { - this.field4360 = 0.0F; // L: 26 - this.field4354 = 0.0F; - this.field4358 = 0.0F; - this.field4349 = 0.0F; - this.field4355 = 0.0F; // L: 30 - this.field4357 = 0.0F; - this.field4352 = 0.0F; - this.field4351 = 0.0F; - this.field4350 = 0.0F; // L: 34 - this.field4356 = 1.0F; - this.field4353 = 1.0F; - this.field4359 = 1.0F; + void method7077() { + this.field4358 = 0.0F; // L: 26 + this.field4361 = 0.0F; // L: 27 + this.field4362 = 0.0F; // L: 28 + this.field4360 = 0.0F; // L: 29 + this.field4351 = 0.0F; // L: 30 + this.field4356 = 0.0F; // L: 31 + this.field4354 = 0.0F; // L: 32 + this.field4353 = 0.0F; // L: 33 + this.field4357 = 0.0F; // L: 34 + this.field4359 = 1.0F; // L: 35 + this.field4352 = 1.0F; // L: 36 + this.field4355 = 1.0F; // L: 37 } // L: 38 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-465113031" + descriptor = "(FB)V", + garbageValue = "1" ) - void method7128(float var1) { - float var2 = (float)Math.cos((double)var1); + void method7078(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 41 float var3 = (float)Math.sin((double)var1); // L: 42 - float var4 = this.field4350; - float var5 = this.field4353; - float var6 = this.field4349; - float var7 = this.field4354; // L: 46 - this.field4350 = var2 * var4 - var3 * this.field4351; - this.field4351 = var2 * this.field4351 + var4 * var3; - this.field4353 = var2 * var5 - var3 * this.field4357; - this.field4357 = var5 * var3 + var2 * this.field4357; // L: 50 - this.field4349 = var6 * var2 - var3 * this.field4356; - this.field4356 = var3 * var6 + this.field4356 * var2; - this.field4354 = var2 * var7 - this.field4360 * var3; - this.field4360 = var2 * this.field4360 + var7 * var3; // L: 54 - } + float var4 = this.field4357; // L: 43 + float var5 = this.field4352; // L: 44 + float var6 = this.field4360; // L: 45 + float var7 = this.field4361; // L: 46 + this.field4357 = var2 * var4 - this.field4353 * var3; // L: 47 + this.field4353 = this.field4353 * var2 + var4 * var3; // L: 48 + this.field4352 = var2 * var5 - this.field4356 * var3; // L: 49 + this.field4356 = this.field4356 * var2 + var5 * var3; // L: 50 + this.field4360 = var6 * var2 - var3 * this.field4359; // L: 51 + this.field4359 = var2 * this.field4359 + var6 * var3; // L: 52 + this.field4361 = var7 * var2 - var3 * this.field4358; // L: 53 + this.field4358 = this.field4358 * var2 + var7 * var3; // L: 54 + } // L: 55 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(FI)V", - garbageValue = "1919823756" + garbageValue = "-118819231" ) - void method7129(float var1) { + void method7083(float var1) { float var2 = (float)Math.cos((double)var1); // L: 58 - float var3 = (float)Math.sin((double)var1); - float var4 = this.field4359; - float var5 = this.field4352; - float var6 = this.field4355; // L: 62 - float var7 = this.field4358; - this.field4359 = var2 * var4 + var3 * this.field4351; - this.field4351 = var2 * this.field4351 - var4 * var3; - this.field4352 = this.field4357 * var3 + var2 * var5; // L: 66 - this.field4357 = this.field4357 * var2 - var3 * var5; - this.field4355 = this.field4356 * var3 + var2 * var6; - this.field4356 = this.field4356 * var2 - var6 * var3; - this.field4358 = var7 * var2 + this.field4360 * var3; // L: 70 - this.field4360 = this.field4360 * var2 - var7 * var3; - } + float var3 = (float)Math.sin((double)var1); // L: 59 + float var4 = this.field4355; // L: 60 + float var5 = this.field4354; // L: 61 + float var6 = this.field4351; // L: 62 + float var7 = this.field4362; // L: 63 + this.field4355 = this.field4353 * var3 + var2 * var4; // L: 64 + this.field4353 = this.field4353 * var2 - var4 * var3; // L: 65 + this.field4354 = var2 * var5 + this.field4356 * var3; // L: 66 + this.field4356 = this.field4356 * var2 - var5 * var3; // L: 67 + this.field4351 = var6 * var2 + var3 * this.field4359; // L: 68 + this.field4359 = this.field4359 * var2 - var3 * var6; // L: 69 + this.field4362 = var3 * this.field4358 + var2 * var7; // L: 70 + this.field4358 = this.field4358 * var2 - var7 * var3; // L: 71 + } // L: 72 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-1580684401" + descriptor = "(FS)V", + garbageValue = "9676" ) - void method7139(float var1) { + void method7082(float var1) { float var2 = (float)Math.cos((double)var1); // L: 75 - float var3 = (float)Math.sin((double)var1); - float var4 = this.field4359; - float var5 = this.field4352; - float var6 = this.field4355; // L: 79 - float var7 = this.field4358; - this.field4359 = var2 * var4 - var3 * this.field4350; - this.field4350 = var2 * this.field4350 + var3 * var4; - this.field4352 = var2 * var5 - this.field4353 * var3; // L: 83 - this.field4353 = this.field4353 * var2 + var3 * var5; - this.field4355 = var6 * var2 - var3 * this.field4349; - this.field4349 = this.field4349 * var2 + var6 * var3; - this.field4358 = var7 * var2 - var3 * this.field4354; // L: 87 - this.field4354 = var2 * this.field4354 + var3 * var7; - } + float var3 = (float)Math.sin((double)var1); // L: 76 + float var4 = this.field4355; // L: 77 + float var5 = this.field4354; // L: 78 + float var6 = this.field4351; // L: 79 + float var7 = this.field4362; // L: 80 + this.field4355 = var4 * var2 - this.field4357 * var3; // L: 81 + this.field4357 = this.field4357 * var2 + var4 * var3; // L: 82 + this.field4354 = var2 * var5 - this.field4352 * var3; // L: 83 + this.field4352 = var3 * var5 + this.field4352 * var2; // L: 84 + this.field4351 = var6 * var2 - this.field4360 * var3; // L: 85 + this.field4360 = var2 * this.field4360 + var6 * var3; // L: 86 + this.field4362 = var2 * var7 - this.field4361 * var3; // L: 87 + this.field4361 = var3 * var7 + this.field4361 * var2; // L: 88 + } // L: 89 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(FFFS)V", - garbageValue = "3240" + descriptor = "(FFFI)V", + garbageValue = "-1907030010" ) - void method7131(float var1, float var2, float var3) { - this.field4358 += var1; - this.field4354 += var2; - this.field4360 += var3; + void method7091(float var1, float var2, float var3) { + this.field4362 += var1; // L: 92 + this.field4361 += var2; // L: 93 + this.field4358 += var3; // L: 94 } // L: 95 public String toString() { - return this.field4359 + "," + this.field4352 + "," + this.field4355 + "," + this.field4358 + "\n" + this.field4350 + "," + this.field4353 + "," + this.field4349 + "," + this.field4354 + "\n" + this.field4351 + "," + this.field4357 + "," + this.field4356 + "," + this.field4360; // L: 99 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Llp;II)Ljt;", - garbageValue = "1639475928" - ) - public static PacketBufferNode method7151(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2928, Client.packetWriter.isaacCipher); // L: 17 - var4.packetBuffer.writeByte(0); // L: 18 - int var5 = var4.packetBuffer.offset; // L: 19 - var4.packetBuffer.writeByte(var0); // L: 20 - String var6 = var1.toLowerCase(); // L: 21 - byte var7 = 0; // L: 22 - if (var6.startsWith("yellow:")) { // L: 23 - var7 = 0; // L: 24 - var1 = var1.substring("yellow:".length()); // L: 25 - } else if (var6.startsWith("red:")) { // L: 27 - var7 = 1; // L: 28 - var1 = var1.substring("red:".length()); // L: 29 - } else if (var6.startsWith("green:")) { // L: 31 - var7 = 2; // L: 32 - var1 = var1.substring("green:".length()); // L: 33 - } else if (var6.startsWith("cyan:")) { // L: 35 - var7 = 3; // L: 36 - var1 = var1.substring("cyan:".length()); // L: 37 - } else if (var6.startsWith("purple:")) { // L: 39 - var7 = 4; // L: 40 - var1 = var1.substring("purple:".length()); // L: 41 - } else if (var6.startsWith("white:")) { // L: 43 - var7 = 5; // L: 44 - var1 = var1.substring("white:".length()); // L: 45 - } else if (var6.startsWith("flash1:")) { // L: 47 - var7 = 6; // L: 48 - var1 = var1.substring("flash1:".length()); // L: 49 - } else if (var6.startsWith("flash2:")) { // L: 51 - var7 = 7; // L: 52 - var1 = var1.substring("flash2:".length()); // L: 53 - } else if (var6.startsWith("flash3:")) { // L: 55 - var7 = 8; // L: 56 - var1 = var1.substring("flash3:".length()); // L: 57 - } else if (var6.startsWith("glow1:")) { // L: 59 - var7 = 9; // L: 60 - var1 = var1.substring("glow1:".length()); // L: 61 - } else if (var6.startsWith("glow2:")) { // L: 63 - var7 = 10; // L: 64 - var1 = var1.substring("glow2:".length()); // L: 65 - } else if (var6.startsWith("glow3:")) { // L: 67 - var7 = 11; // L: 68 - var1 = var1.substring("glow3:".length()); // L: 69 - } else if (var2 != Language.Language_EN) { // L: 71 - if (var6.startsWith("yellow:")) { // L: 72 - var7 = 0; // L: 73 - var1 = var1.substring("yellow:".length()); // L: 74 - } else if (var6.startsWith("red:")) { // L: 76 - var7 = 1; // L: 77 - var1 = var1.substring("red:".length()); // L: 78 - } else if (var6.startsWith("green:")) { // L: 80 - var7 = 2; // L: 81 - var1 = var1.substring("green:".length()); // L: 82 - } else if (var6.startsWith("cyan:")) { // L: 84 - var7 = 3; // L: 85 - var1 = var1.substring("cyan:".length()); // L: 86 - } else if (var6.startsWith("purple:")) { // L: 88 - var7 = 4; // L: 89 - var1 = var1.substring("purple:".length()); // L: 90 - } else if (var6.startsWith("white:")) { // L: 92 - var7 = 5; // L: 93 - var1 = var1.substring("white:".length()); // L: 94 - } else if (var6.startsWith("flash1:")) { // L: 96 - var7 = 6; // L: 97 - var1 = var1.substring("flash1:".length()); // L: 98 - } else if (var6.startsWith("flash2:")) { // L: 100 - var7 = 7; // L: 101 - var1 = var1.substring("flash2:".length()); // L: 102 - } else if (var6.startsWith("flash3:")) { // L: 104 - var7 = 8; // L: 105 - var1 = var1.substring("flash3:".length()); // L: 106 - } else if (var6.startsWith("glow1:")) { // L: 108 - var7 = 9; // L: 109 - var1 = var1.substring("glow1:".length()); // L: 110 - } else if (var6.startsWith("glow2:")) { // L: 112 - var7 = 10; // L: 113 - var1 = var1.substring("glow2:".length()); // L: 114 - } else if (var6.startsWith("glow3:")) { // L: 116 - var7 = 11; // L: 117 - var1 = var1.substring("glow3:".length()); // L: 118 - } - } - - var6 = var1.toLowerCase(); // L: 121 - byte var8 = 0; // L: 122 - if (var6.startsWith("wave:")) { // L: 123 - var8 = 1; // L: 124 - var1 = var1.substring("wave:".length()); // L: 125 - } else if (var6.startsWith("wave2:")) { // L: 127 - var8 = 2; // L: 128 - var1 = var1.substring("wave2:".length()); // L: 129 - } else if (var6.startsWith("shake:")) { // L: 131 - var8 = 3; // L: 132 - var1 = var1.substring("shake:".length()); // L: 133 - } else if (var6.startsWith("scroll:")) { // L: 135 - var8 = 4; // L: 136 - var1 = var1.substring("scroll:".length()); // L: 137 - } else if (var6.startsWith("slide:")) { // L: 139 - var8 = 5; // L: 140 - var1 = var1.substring("slide:".length()); // L: 141 - } else if (var2 != Language.Language_EN) { // L: 143 - if (var6.startsWith("wave:")) { // L: 144 - var8 = 1; // L: 145 - var1 = var1.substring("wave:".length()); // L: 146 - } else if (var6.startsWith("wave2:")) { // L: 148 - var8 = 2; // L: 149 - var1 = var1.substring("wave2:".length()); // L: 150 - } else if (var6.startsWith("shake:")) { // L: 152 - var8 = 3; // L: 153 - var1 = var1.substring("shake:".length()); // L: 154 - } else if (var6.startsWith("scroll:")) { // L: 156 - var8 = 4; // L: 157 - var1 = var1.substring("scroll:".length()); // L: 158 - } else if (var6.startsWith("slide:")) { // L: 160 - var8 = 5; // L: 161 - var1 = var1.substring("slide:".length()); // L: 162 - } - } - - var4.packetBuffer.writeByte(var7); // L: 165 - var4.packetBuffer.writeByte(var8); // L: 166 - WorldMapIcon_0.method4900(var4.packetBuffer, var1); // L: 167 - if (var0 == class296.field3502.rsOrdinal()) { // L: 168 - var4.packetBuffer.writeByte(var3); // L: 169 - } - - var4.packetBuffer.method7756(var4.packetBuffer.offset - var5); // L: 171 - return var4; // L: 172 + return this.field4355 + "," + this.field4354 + "," + this.field4351 + "," + this.field4362 + "\n" + this.field4357 + "," + this.field4352 + "," + this.field4360 + "," + this.field4361 + "\n" + this.field4353 + "," + this.field4356 + "," + this.field4359 + "," + this.field4358; // L: 99 } } diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java index 53835c2a79..7004028664 100644 --- a/runescape-client/src/main/java/class389.java +++ b/runescape-client/src/main/java/class389.java @@ -1,18 +1,44 @@ +import java.io.IOException; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("nj") public class class389 { @ObfuscatedName("v") - float[] field4363; - @ObfuscatedName("o") + float[] field4364; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -981271763 + intValue = -1953516053 ) - int field4366; + int field4363; class389(float[] var1, int var2) { - this.field4363 = var1; // L: 10 - this.field4366 = var2; // L: 11 + this.field4364 = var1; // L: 10 + this.field4363 = var2; // L: 11 } // L: 12 + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "82" + ) + static final void method7094(boolean var0) { + class116.playPcmPlayers(); // L: 5631 + ++Client.packetWriter.pendingWrites; // L: 5632 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5633 + Client.packetWriter.pendingWrites = 0; // L: 5634 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5635 + PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2950, Client.packetWriter.isaacCipher); // L: 5637 + Client.packetWriter.addNode(var1); // L: 5638 + + try { + Client.packetWriter.flush(); // L: 5640 + } catch (IOException var3) { // L: 5642 + Client.hadNetworkError = true; // L: 5643 + } + } + + } + } // L: 5646 } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java index 9ed4c22db4..a87ee96ba0 100644 --- a/runescape-client/src/main/java/class390.java +++ b/runescape-client/src/main/java/class390.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("ob") public enum class390 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Lob;" ) - field4370(0, 1), - @ObfuscatedName("o") + field4369(0, 1), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Lob;" ) - field4369(3, 2), - @ObfuscatedName("h") + field4366(3, 2), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Lob;" ) - field4368(2, 3), - @ObfuscatedName("g") + field4367(2, 3), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Lob;" ) - field4371(1, 10); + field4368(1, 10); - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1657165177 + intValue = -1064934695 ) - final int field4372; + final int field4370; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1977568173 + intValue = -1290046755 ) - final int field4373; + final int field4365; class390(int var3, int var4) { - this.field4372 = var3; // L: 16 - this.field4373 = var4; // L: 17 + this.field4370 = var3; // L: 16 + this.field4365 = var4; // L: 17 } // L: 18 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4373; // L: 22 + return this.field4365; // L: 21 } } diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java index 0b2deb3399..6d33629c1d 100644 --- a/runescape-client/src/main/java/class391.java +++ b/runescape-client/src/main/java/class391.java @@ -1,23 +1,30 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("os") +@ObfuscatedName("oa") public class class391 implements class396 { + @ObfuscatedName("fn") + @ObfuscatedGetter( + intValue = -1037477201 + ) + static int field4372; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpx;" + descriptor = "Lpd;" ) - public final class419 field4376; + public final class419 field4373; @ObfuscatedSignature( - descriptor = "(Lpf;)V" + descriptor = "(Lpp;)V" ) class391(class420 var1) { - this.field4376 = var1; // L: 14 + this.field4373 = var1; // L: 14 } // L: 15 @ObfuscatedSignature( - descriptor = "(Loo;)V" + descriptor = "(Lom;)V" ) public class391(class392 var1) { this(new class420(var1)); // L: 10 @@ -26,34 +33,48 @@ public class class391 implements class396 { @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "15" + garbageValue = "50" ) - public int method7164(int var1) { - return this.field4376.vmethod7559(var1); // L: 18 + public int method7105(int var1) { + return this.field4373.vmethod7471(var1); // L: 18 } - @ObfuscatedName("le") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-896274145" + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "977969655" ) - static void method7169() { - if (Client.field602 && class19.localPlayer != null) { // L: 11917 - int var0 = class19.localPlayer.pathX[0]; // L: 11918 - int var1 = class19.localPlayer.pathY[0]; // L: 11919 - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11920 - return; - } + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + WorldMapElement.method3403(var0, var1, "openjs", var2); // L: 27 + } // L: 28 - Messages.oculusOrbFocalPointX = class19.localPlayer.x; // L: 11921 - int var2 = Archive.getTileHeight(class19.localPlayer.x, class19.localPlayer.y, class160.Client_plane) - Client.camFollowHeight; // L: 11922 - if (var2 < FloorOverlayDefinition.field2136) { // L: 11923 - FloorOverlayDefinition.field2136 = var2; - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)[Lqi;", + garbageValue = "1455527219" + ) + static SpritePixels[] method7111() { + SpritePixels[] var0 = new SpritePixels[class451.SpriteBuffer_spriteCount]; // L: 169 - class115.oculusOrbFocalPointY = class19.localPlayer.y; // L: 11924 - Client.field602 = false; // L: 11925 + for (int var1 = 0; var1 < class451.SpriteBuffer_spriteCount; ++var1) { // L: 170 + SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 171 + var2.width = class451.SpriteBuffer_spriteWidth; // L: 172 + var2.height = class451.SpriteBuffer_spriteHeight; // L: 173 + var2.xOffset = class451.SpriteBuffer_xOffsets[var1]; // L: 174 + var2.yOffset = class271.SpriteBuffer_yOffsets[var1]; // L: 175 + var2.subWidth = class451.SpriteBuffer_spriteWidths[var1]; // L: 176 + var2.subHeight = class451.SpriteBuffer_spriteHeights[var1]; // L: 177 + int var3 = var2.subHeight * var2.subWidth; // L: 178 + byte[] var4 = FriendLoginUpdate.SpriteBuffer_pixels[var1]; // L: 179 + var2.pixels = new int[var3]; // L: 180 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 181 + var2.pixels[var5] = NetFileRequest.SpriteBuffer_spritePalette[var4[var5] & 255]; + } } - } // L: 11927 + ArchiveDiskActionHandler.method5813(); // L: 183 + return var0; // L: 184 + } } diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java index 44cbee92dd..183ff67669 100644 --- a/runescape-client/src/main/java/class392.java +++ b/runescape-client/src/main/java/class392.java @@ -1,10 +1,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") +@ObfuscatedName("om") public abstract class class392 extends class250 implements class444 { + @ObfuscatedName("l") + static byte[][][] field4374; + @ObfuscatedSignature( - descriptor = "(Lkh;Llp;I)V" + descriptor = "(Lkt;Llo;I)V" ) protected class392(StudioGame var1, Language var2, int var3) { super(var1, var2, var3); // L: 15 @@ -12,83 +15,60 @@ public abstract class class392 extends class250 implements class444 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Loi;", - garbageValue = "4" + descriptor = "(IB)Lox;", + garbageValue = "60" ) - protected abstract class394 vmethod7638(int var1); + protected abstract class394 vmethod7542(int var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1997278431" + garbageValue = "-693594265" ) - public int method7171() { + public int method7113() { return super.field2872; // L: 19 } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-1983515453" + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "-61" ) - public Object vmethod8046(int var1) { - class394 var2 = this.vmethod7638(var1); // L: 24 - return var2 != null && var2.method7201() ? var2.method7200() : null; // L: 25 26 + public Object vmethod7950(int var1) { + class394 var2 = this.vmethod7542(var1); // L: 23 + return var2 != null && var2.method7127() ? var2.method7131() : null; // L: 24 25 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpd;B)Lqk;", - garbageValue = "-15" + descriptor = "(Lpi;B)Lqd;", + garbageValue = "109" ) - public class445 method7173(Buffer var1) { - int var2 = var1.readUnsignedShort(); // L: 30 - class394 var3 = this.vmethod7638(var2); // L: 31 - class445 var4 = new class445(var2); // L: 32 - Class var5 = var3.field4378.field4599; // L: 33 - if (var5 == Integer.class) { // L: 34 + public class445 method7115(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 29 + class394 var3 = this.vmethod7542(var2); // L: 30 + class445 var4 = new class445(var2); // L: 31 + Class var5 = var3.field4378.field4593; // L: 32 + if (var5 == Integer.class) { // L: 33 var4.field4681 = var1.readInt(); } else if (var5 == Long.class) { - var4.field4681 = var1.readLong(); // L: 35 - } else if (var5 == String.class) { // L: 36 + var4.field4681 = var1.readLong(); // L: 34 + } else if (var5 == String.class) { // L: 35 var4.field4681 = var1.readStringCp1252NullCircumfixed(); } else { - if (!class440.class.isAssignableFrom(var5)) { // L: 37 - throw new IllegalStateException(); // L: 46 + if (!class440.class.isAssignableFrom(var5)) { // L: 36 + throw new IllegalStateException(); // L: 45 } try { - class440 var6 = (class440)var5.newInstance(); // L: 39 - var6.method8012(var1); // L: 40 - var4.field4681 = var6; // L: 41 - } catch (InstantiationException var7) { // L: 43 - } catch (IllegalAccessException var8) { // L: 44 + class440 var6 = (class440)var5.newInstance(); // L: 38 + var6.method7924(var1); // L: 39 + var4.field4681 = var6; // L: 40 + } catch (InstantiationException var7) { // L: 42 + } catch (IllegalAccessException var8) { // L: 43 } } - return var4; // L: 47 + return var4; // L: 46 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-265352452" - ) - public static int method7190(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29 - } - - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-1704519794" - ) - public static void method7191(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2940, Client.packetWriter.isaacCipher); // L: 11893 - var4.packetBuffer.writeShort(var0); // L: 11894 - var4.packetBuffer.method7796(var1); // L: 11895 - var4.packetBuffer.method7788(var2); // L: 11896 - var4.packetBuffer.method7806(var3 ? Client.field571 * 1761289457 * 34294801 : 0); // L: 11897 - Client.packetWriter.addNode(var4); // L: 11898 - } // L: 11899 } diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java index ebf65cc2c7..1f16aa196c 100644 --- a/runescape-client/src/main/java/class393.java +++ b/runescape-client/src/main/java/class393.java @@ -1,17 +1,25 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("of") +@ObfuscatedName("oh") public class class393 extends class394 { + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + public class393(int var1) { super(var1); // L: 7 } // L: 8 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", - garbageValue = "3" + descriptor = "(Lpi;IS)V", + garbageValue = "256" ) - void vmethod7204(Buffer var1, int var2) { - } // L: 12 + void vmethod7129(Buffer var1, int var2) { + } // L: 11 } diff --git a/runescape-client/src/main/java/class394.java b/runescape-client/src/main/java/class394.java index b78c34f30c..2a425d7ea0 100644 --- a/runescape-client/src/main/java/class394.java +++ b/runescape-client/src/main/java/class394.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oi") +@ObfuscatedName("ox") public abstract class class394 implements class249 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpk;" ) class431 field4378; @@ -14,226 +14,105 @@ public abstract class class394 implements class249 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;IB)V", + descriptor = "(Lpi;IS)V", + garbageValue = "256" + ) + abstract void vmethod7129(Buffer var1, int var2); + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", garbageValue = "3" ) - abstract void vmethod7204(Buffer var1, int var2); - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lpd;I)V", - garbageValue = "1362633882" - ) - public void method7199(Buffer var1) { + public void method7128(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 17 if (var2 == 0) { // L: 18 - return; + return; // L: 60 } - class390[] var3 = new class390[]{class390.field4370, class390.field4368, class390.field4369, class390.field4371}; // L: 21 - class390 var4 = (class390)ChatChannel.findEnumerated(var3, var2); // L: 23 + class390[] var3 = new class390[]{class390.field4367, class390.field4368, class390.field4366, class390.field4369}; // L: 21 + class390 var4 = (class390)MusicPatchPcmStream.findEnumerated(var3, var2); // L: 23 if (var4 != null) { // L: 24 - switch(var4.field4372) { // L: 25 + switch(var4.field4370) { // L: 25 case 0: int var5 = var1.readUnsignedByte(); // L: 27 - int var8 = class429.field4592[var5]; // L: 30 + int var7 = class429.field4588[var5]; class431 var6; - if (var8 == 1) { // L: 31 - var6 = class431.field4598; // L: 32 - } else if (var8 == 2) { // L: 35 - var6 = class431.field4600; // L: 36 - } else if (var8 == 3) { // L: 39 + if (var7 == 1) { var6 = class431.field4595; + } else if (var7 == 2) { + var6 = class431.field4598; + } else if (var7 == 3) { // L: 39 + var6 = class431.field4592; // L: 40 } else { - var6 = null; + var6 = null; // L: 43 } - this.field4378 = var6; - if (this.field4378 != null) { // L: 46 + this.field4378 = var6; // L: 45 + if (this.field4378 != null) { break; } - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); // L: 46 case 1: - var1.readStringCp1252NullCircumfixed(); // L: 58 - break; // L: 59 + var1.readStringCp1252NullCircumfixed(); // L: 49 + break; // L: 50 case 2: default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 49 + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 55 case 3: - class309[] var7 = new class309[]{class309.field3911, class309.field3910, class309.field3912, class309.field3918}; // L: 53 - ChatChannel.findEnumerated(var7, var1.readUnsignedByte()); + MusicPatchPcmStream.findEnumerated(Client.method1633(), var1.readUnsignedByte()); // L: 52 } } else { - this.vmethod7204(var1, var2); // L: 62 + this.vmethod7129(var1, var2); // L: 58 } } } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2144539286" + descriptor = "(B)Z", + garbageValue = "95" ) - boolean method7201() { - return this.field4378 != null; + boolean method7127() { + return this.field4378 != null; // L: 65 } - @ObfuscatedName("u") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/Object;", - garbageValue = "0" + descriptor = "(I)Ljava/lang/Object;", + garbageValue = "1513731633" ) - Object method7200() { - if (this.field4378 == class431.field4598) { // L: 73 - return 0; - } else if (this.field4378 == class431.field4595) { // L: 76 - return -1L; // L: 77 + Object method7131() { + if (this.field4378 == class431.field4595) { // L: 69 + return 0; // L: 70 + } else if (this.field4378 == class431.field4592) { // L: 72 + return -1L; // L: 73 } else { - return this.field4378 == class431.field4600 ? "" : null; // L: 79 80 82 + return this.field4378 == class431.field4598 ? "" : null; // L: 75 76 78 } } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lpa;I)Ljava/lang/String;", - garbageValue = "-1784818161" + descriptor = "(IIIIIIB)I", + garbageValue = "-20" ) - public static String method7212(CharSequence var0, LoginType var1) { - if (var0 == null) { // L: 40 - return null; + public static int method7141(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 30 + int var6 = var3; // L: 31 + var3 = var4; // L: 32 + var4 = var6; // L: 33 + } + + var2 &= 3; // L: 35 + if (var2 == 0) { // L: 36 + return var1; + } else if (var2 == 1) { // L: 37 + return 7 - var0 - (var3 - 1); } else { - int var2 = 0; // L: 41 - - int var3; - for (var3 = var0.length(); var2 < var3 && class291.method5588(var0.charAt(var2)); ++var2) { // L: 42 43 - } - - while (var3 > var2 && class291.method5588(var0.charAt(var3 - 1))) { // L: 44 - --var3; - } - - int var4 = var3 - var2; // L: 45 - if (var4 >= 1) { // L: 47 - byte var6; - if (var1 == null) { // L: 51 - var6 = 12; // L: 52 - } else { - switch(var1.field4560) { // L: 55 - case 3: - var6 = 20; // L: 60 - break; - default: - var6 = 12; // L: 57 - } - } - - if (var4 <= var6) { // L: 64 - StringBuilder var10 = new StringBuilder(var4); // L: 68 - - for (int var11 = var2; var11 < var3; ++var11) { // L: 69 - char var7 = var0.charAt(var11); // L: 70 - if (ViewportMouse.method4463(var7)) { // L: 71 - char var8; - switch(var7) { // L: 74 - case ' ': - case '-': - case '_': - case ' ': - var8 = '_'; // L: 122 - break; // L: 123 - case '#': - case '[': - case ']': - var8 = var7; // L: 116 - break; // L: 117 - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var8 = 'a'; // L: 148 - break; // L: 149 - case 'Ç': - case 'ç': - var8 = 'c'; // L: 111 - break; // L: 112 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var8 = 'e'; // L: 136 - break; // L: 137 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var8 = 'i'; // L: 81 - break; - case 'Ñ': - case 'ñ': - var8 = 'n'; // L: 126 - break; // L: 127 - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var8 = 'o'; // L: 93 - break; // L: 94 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var8 = 'u'; // L: 107 - break; // L: 108 - case 'ß': - var8 = 'b'; // L: 151 - break; // L: 152 - case 'ÿ': - case 'Ÿ': - var8 = 'y'; // L: 97 - break; // L: 98 - default: - var8 = Character.toLowerCase(var7); // L: 154 - } - - if (var8 != 0) { // L: 159 - var10.append(var8); // L: 160 - } - } - } - - if (var10.length() == 0) { // L: 162 - return null; - } - - return var10.toString(); // L: 163 - } - } - - return null; // L: 66 + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 38 } } } diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java index fae8ba055b..6e04fc3fd0 100644 --- a/runescape-client/src/main/java/class396.java +++ b/runescape-client/src/main/java/class396.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oc") +@ObfuscatedName("oi") public interface class396 extends class395 { } diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java index 763cc42612..74738e1dd5 100644 --- a/runescape-client/src/main/java/class397.java +++ b/runescape-client/src/main/java/class397.java @@ -1,36 +1,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") +@ObfuscatedName("oy") public class class397 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lom;" - ) - static final class397 field4381; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Loy;" ) static final class397 field4380; - @ObfuscatedName("h") - String field4379; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Loy;" + ) + static final class397 field4379; + @ObfuscatedName("i") + String field4381; static { - field4381 = new class397("application/json"); // L: 4 - field4380 = new class397("text/plain"); // L: 5 + field4380 = new class397("application/json"); // L: 4 + field4379 = new class397("text/plain"); // L: 5 } class397(String var1) { - this.field4379 = var1; // L: 9 + this.field4381 = var1; // L: 9 } // L: 10 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1563884040" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-28" ) - public String method7217() { - return this.field4379; // L: 13 + public String method7142() { + return this.field4381; // L: 13 } } diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java index c6886d7ed5..d94f5fb524 100644 --- a/runescape-client/src/main/java/class398.java +++ b/runescape-client/src/main/java/class398.java @@ -2,12 +2,12 @@ import java.io.UnsupportedEncodingException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") +@ObfuscatedName("ok") public interface class398 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-2124784886" + descriptor = "(S)[B", + garbageValue = "201" ) - byte[] vmethod7229() throws UnsupportedEncodingException; + byte[] vmethod7150() throws UnsupportedEncodingException; } diff --git a/runescape-client/src/main/java/class399.java b/runescape-client/src/main/java/class399.java index 5bb1511c7f..aa68fd7c26 100644 --- a/runescape-client/src/main/java/class399.java +++ b/runescape-client/src/main/java/class399.java @@ -5,51 +5,51 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -@ObfuscatedName("ox") +@ObfuscatedName("op") public class class399 implements class398 { - @ObfuscatedName("h") - JSONObject field4385; + @ObfuscatedName("i") + JSONObject field4384; public class399(byte[] var1) throws UnsupportedEncodingException { - this.method7231(var1); // L: 13 + this.method7148(var1); // L: 13 } // L: 14 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-2124784886" + descriptor = "(S)[B", + garbageValue = "201" ) - public byte[] vmethod7229() throws UnsupportedEncodingException { - return this.field4385 == null ? new byte[0] : this.field4385.toString().getBytes("UTF-8"); // L: 46 47 49 + public byte[] vmethod7150() throws UnsupportedEncodingException { + return this.field4384 == null ? new byte[0] : this.field4384.toString().getBytes("UTF-8"); // L: 45 46 48 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1077952512" + garbageValue = "1800116953" ) - void method7231(byte[] var1) throws UnsupportedEncodingException { + void method7148(byte[] var1) throws UnsupportedEncodingException { String var2 = new String(var1, "UTF-8"); // L: 17 - this.method7224(var2); // L: 18 + this.method7149(var2); // L: 18 } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "67" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2059250912" ) - void method7224(String var1) throws UnsupportedEncodingException { + void method7149(String var1) throws UnsupportedEncodingException { try { if (var1.charAt(0) == '{') { // L: 23 - this.field4385 = new JSONObject(var1); // L: 24 + this.field4384 = new JSONObject(var1); // L: 24 } else { if (var1.charAt(0) != '[') { // L: 26 throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); // L: 32 } JSONArray var2 = new JSONArray(var1); // L: 27 - this.field4385 = new JSONObject(); // L: 28 - this.field4385.put("arrayValues", var2); // L: 29 + this.field4384 = new JSONObject(); // L: 28 + this.field4384.put("arrayValues", var2); // L: 29 } } catch (JSONException var3) { // L: 35 @@ -59,10 +59,10 @@ public class class399 implements class398 { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Lorg/json/JSONObject;", - garbageValue = "120" + descriptor = "(I)Lorg/json/JSONObject;", + garbageValue = "1611326690" ) - public JSONObject method7225() { - return this.field4385; // L: 41 + public JSONObject method7156() { + return this.field4384; // L: 41 } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index c5c85e3f32..6d80a0edb3 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,57 +1,58 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("b") public final class class4 { - @ObfuscatedName("r") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("k") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lfq;" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1921636813" ) - @Export("clock") - static Clock clock; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 337025771 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("archive13") - static Archive archive13; + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1817 + Login.Login_response2 = var1; // L: 1818 + Login.Login_response3 = var2; // L: 1819 + } // L: 1820 - @ObfuscatedName("fn") + @ObfuscatedName("gy") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "178536163" + descriptor = "(B)V", + garbageValue = "-5" ) - static long method16() { - return Client.field608; // L: 2578 - } + static void method17() { + PacketBufferNode var0 = WorldMapSprite.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 4277 + var0.packetBuffer.writeByte(Client.getWindowedMode()); // L: 4278 + var0.packetBuffer.writeShort(InvDefinition.canvasWidth); // L: 4279 + var0.packetBuffer.writeShort(class321.canvasHeight); // L: 4280 + Client.packetWriter.addNode(var0); // L: 4281 + } // L: 4282 - @ObfuscatedName("ld") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1841271895" + descriptor = "(IIII)Lcc;", + garbageValue = "-1034458506" ) - static void method19() { - if (class340.field4109 != null) { // L: 11948 - Client.field764 = Client.cycle; // L: 11949 - class340.field4109.method6086(); // L: 11950 - - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11951 - if (Client.players[var0] != null) { // L: 11952 - class340.field4109.method6091((Client.players[var0].x >> 7) + ApproximateRouteStrategy.baseX, (Client.players[var0].y >> 7) + class250.baseY); // L: 11953 - } - } + static final InterfaceParent method16(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 12149 + var3.group = var1; // L: 12150 + var3.type = var2; // L: 12151 + Client.interfaceParents.put(var3, (long)var0); // L: 12152 + class29.Widget_resetModelFrames(var1); // L: 12153 + Widget var4 = class127.getWidget(var0); // L: 12154 + class346.invalidateWidget(var4); // L: 12155 + if (Client.meslayerContinueWidget != null) { // L: 12156 + class346.invalidateWidget(Client.meslayerContinueWidget); // L: 12157 + Client.meslayerContinueWidget = null; // L: 12158 } - } // L: 11957 + AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12160 + class145.runWidgetOnLoadListener(var1); // L: 12161 + if (Client.rootInterface != -1) { // L: 12162 + MouseRecorder.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 12163 + } } diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java index b9119b14c4..ac4cb9162d 100644 --- a/runescape-client/src/main/java/class400.java +++ b/runescape-client/src/main/java/class400.java @@ -2,57 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("op") +@ObfuscatedName("on") public class class400 { - @ObfuscatedName("l") - static final int[] field4390; - @ObfuscatedName("n") + @ObfuscatedName("b") static final int[] field4389; + @ObfuscatedName("n") + static final int[] field4391; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "[Lqq;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; static { - field4390 = new int[16384]; // L: 8 - field4389 = new int[16384]; // L: 9 + field4389 = new int[16384]; // L: 8 + field4391 = new int[16384]; // L: 9 double var0 = 3.834951969714103E-4D; // L: 12 for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 - field4390[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14 - field4389[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 + field4389[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14 + field4391[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 } } // L: 17 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lkn;I[B[BI)V", - garbageValue = "-785240877" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3422 == null) { // L: 988 - if (var2 == null) { // L: 989 - return; // L: 995 - } - - var0.field3422 = new byte[11][]; // L: 990 - var0.field3423 = new byte[11][]; // L: 991 - var0.field3424 = new int[11]; // L: 992 - var0.field3425 = new int[11]; // L: 993 - } - - var0.field3422[var1] = var2; // L: 997 - if (var2 != null) { - var0.field3432 = true; // L: 998 - } else { - var0.field3432 = false; // L: 1000 - - for (int var4 = 0; var4 < var0.field3422.length; ++var4) { // L: 1001 - if (var0.field3422[var4] != null) { // L: 1002 - var0.field3432 = true; // L: 1003 - break; - } - } - } - - var0.field3423[var1] = var3; // L: 1008 - } // L: 1009 } diff --git a/runescape-client/src/main/java/class401.java b/runescape-client/src/main/java/class401.java index 2b959f6632..16c4e907d1 100644 --- a/runescape-client/src/main/java/class401.java +++ b/runescape-client/src/main/java/class401.java @@ -1,58 +1,21 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ou") +@ObfuscatedName("oc") public class class401 { - @ObfuscatedName("r") + @ObfuscatedName("o") static final int[] field4398; - @ObfuscatedName("k") - static final int[] field4393; + @ObfuscatedName("r") + static final int[] field4399; static { - field4398 = new int[2048]; - field4393 = new int[2048]; // L: 14 + field4398 = new int[2048]; // L: 13 + field4399 = new int[2048]; // L: 14 double var0 = 0.0030679615757712823D; // L: 17 for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4398[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 - field4393[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 + field4398[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 + field4399[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 } } // L: 22 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "298301940" - ) - public static int method7247(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 - } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2145917637" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field731) { // L: 3341 - WorldMapEvent.midiPcmStream.clear(); // L: 3343 - class273.musicPlayerStatus = 1; // L: 3344 - class147.musicTrackArchive = null; // L: 3345 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Interpreter.clientPreferences.method2288() != 0 && !Client.field731) { // L: 3348 - Archive var1 = ArchiveLoader.archive6; // L: 3349 - int var2 = Interpreter.clientPreferences.method2288(); // L: 3350 - class273.musicPlayerStatus = 1; // L: 3352 - class147.musicTrackArchive = var1; // L: 3353 - ArchiveLoader.musicTrackGroupId = var0; // L: 3354 - class273.musicTrackFileId = 0; // L: 3355 - DevicePcmPlayerProvider.musicTrackVolume = var2; // L: 3356 - class260.musicTrackBoolean = false; // L: 3357 - class273.pcmSampleLength = 2; // L: 3358 - } - - Client.currentTrackGroupId = var0; // L: 3361 - } // L: 3362 } diff --git a/runescape-client/src/main/java/class406.java b/runescape-client/src/main/java/class406.java index fa5990e901..18ee7a6f4b 100644 --- a/runescape-client/src/main/java/class406.java +++ b/runescape-client/src/main/java/class406.java @@ -1,6 +1,6 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("or") +@ObfuscatedName("os") public class class406 extends Node { @ObfuscatedName("v") public long field4407; diff --git a/runescape-client/src/main/java/class419.java b/runescape-client/src/main/java/class419.java index feba28b4c8..7a1668e704 100644 --- a/runescape-client/src/main/java/class419.java +++ b/runescape-client/src/main/java/class419.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("px") +@ObfuscatedName("pd") public interface class419 extends Iterable { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1911974643" + descriptor = "(IB)I", + garbageValue = "1" ) - int vmethod7559(int var1); + int vmethod7471(int var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "1473978830" + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "-12" ) - void vmethod7561(int var1, Object var2); + void vmethod7464(int var1, Object var2); } diff --git a/runescape-client/src/main/java/class420.java b/runescape-client/src/main/java/class420.java index 99827622c2..ceef94984d 100644 --- a/runescape-client/src/main/java/class420.java +++ b/runescape-client/src/main/java/class420.java @@ -2,63 +2,126 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pf") +@ObfuscatedName("pp") public class class420 implements class419 { + @ObfuscatedName("d") + static int[][][] field4545; @ObfuscatedName("v") - Map field4549; - @ObfuscatedName("o") + Map field4547; + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lqf;" ) - final class444 field4550; + final class444 field4546; @ObfuscatedSignature( descriptor = "(Lqf;)V" ) public class420(class444 var1) { - this.field4550 = var1; // L: 15 + this.field4546 = var1; // L: 15 } // L: 16 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1911974643" + descriptor = "(IB)I", + garbageValue = "1" ) - public int vmethod7559(int var1) { - if (this.field4549 != null) { // L: 20 - class445 var2 = (class445)this.field4549.get(var1); // L: 21 + public int vmethod7471(int var1) { + if (this.field4547 != null) { // L: 19 + class445 var2 = (class445)this.field4547.get(var1); // L: 20 if (var2 != null) { - return (Integer)var2.field4681; // L: 22 + return (Integer)var2.field4681; // L: 21 } } - return (Integer)this.field4550.vmethod8046(var1); // L: 24 + return (Integer)this.field4546.vmethod7950(var1); // L: 23 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "1473978830" + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "-12" ) - public void vmethod7561(int var1, Object var2) { - if (this.field4549 == null) { // L: 29 - this.field4549 = new HashMap(); // L: 30 - this.field4549.put(var1, new class445(var1, var2)); // L: 31 + public void vmethod7464(int var1, Object var2) { + if (this.field4547 == null) { // L: 27 + this.field4547 = new HashMap(); // L: 28 + this.field4547.put(var1, new class445(var1, var2)); // L: 29 } else { - class445 var3 = (class445)this.field4549.get(var1); // L: 34 + class445 var3 = (class445)this.field4547.get(var1); // L: 32 if (var3 == null) { - this.field4549.put(var1, new class445(var1, var2)); // L: 35 + this.field4547.put(var1, new class445(var1, var2)); // L: 33 } else { - var3.field4681 = var2; // L: 36 + var3.field4681 = var2; // L: 34 } } - } // L: 38 + } // L: 36 public Iterator iterator() { - return this.field4549 == null ? Collections.emptyList().iterator() : this.field4549.values().iterator(); // L: 42 43 + return this.field4547 == null ? Collections.emptyList().iterator() : this.field4547.values().iterator(); // L: 39 40 } + + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "126" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3681 + class131.clientPreferences.method2246(!class131.clientPreferences.method2263()); // L: 3682 + if (class131.clientPreferences.method2263()) { // L: 3683 + Actor.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3684 + } else { + Actor.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3687 + } + } + + if (var0.equalsIgnoreCase("displayfps")) { // L: 3690 + class131.clientPreferences.method2302(); + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3691 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; // L: 3692 + } + + if (Client.staffModLevel >= 2) { // L: 3693 + if (var0.equalsIgnoreCase("errortest")) { // L: 3694 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3695 + ScriptFrame.worldMap.showCoord = !ScriptFrame.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3696 + class131.clientPreferences.method2234(true); + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3697 + class131.clientPreferences.method2234(false); + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3698 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3699 + ClanChannelMember.method2868(); + } + } + + PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 3702 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3703 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3704 + Client.packetWriter.addNode(var1); // L: 3705 + } // L: 3706 } diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java index 242a165095..31c1d878c0 100644 --- a/runescape-client/src/main/java/class422.java +++ b/runescape-client/src/main/java/class422.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pe") +@ObfuscatedName("pg") public class class422 { - @ObfuscatedName("h") - static final char[] field4564; - @ObfuscatedName("g") - static final char[] field4562; + @ObfuscatedName("i") + static final char[] field4560; + @ObfuscatedName("f") + static final char[] field4563; static { - field4564 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4562 = new char[]{'[', ']', '#'}; // L: 9 + field4560 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4563 = new char[]{'[', ']', '#'}; // L: 9 } } diff --git a/runescape-client/src/main/java/class425.java b/runescape-client/src/main/java/class425.java index 855ddbff52..56d9fd210f 100644 --- a/runescape-client/src/main/java/class425.java +++ b/runescape-client/src/main/java/class425.java @@ -1,50 +1,50 @@ 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("ph") +@ObfuscatedName("pn") class class425 implements Iterator { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1020132659 + intValue = -991583815 ) - int field4584; + int field4581; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lps;" + descriptor = "Lpj;" ) final class426 this$0; @ObfuscatedSignature( - descriptor = "(Lps;)V" + descriptor = "(Lpj;)V" ) class425(class426 var1) { - this.this$0 = var1; // L: 51 + this.this$0 = var1; // L: 50 } public boolean hasNext() { - return this.field4584 < this.this$0.method7171(); // L: 56 + return this.field4581 < this.this$0.method7113(); // L: 54 } public Object next() { - int var1 = ++this.field4584 - 1; // L: 61 - class393 var2 = (class393)this.this$0.field4585.get((long)var1); // L: 62 - return var2 != null ? var2 : this.this$0.method7639(var1); // L: 63 64 + int var1 = ++this.field4581 - 1; // L: 58 + class393 var2 = (class393)this.this$0.field4583.get((long)var1); // L: 59 + return var2 != null ? var2 : this.this$0.method7543(var1); // L: 60 61 } public void remove() { - throw new UnsupportedOperationException(); // L: 69 + throw new UnsupportedOperationException(); // L: 65 } - @ObfuscatedName("g") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-131933810" ) - public static int method7636(int var0, int var1, int var2) { - int var3 = class260.method5203(var2 - var1 + 1); // L: 48 - var3 <<= var1; // L: 49 - return var0 & ~var3; // L: 50 + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 117 } } diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java index 67fe40b630..edbb3c1c06 100644 --- a/runescape-client/src/main/java/class426.java +++ b/runescape-client/src/main/java/class426.java @@ -3,78 +3,88 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ps") +@ObfuscatedName("pj") public class class426 extends class392 implements class252 { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lln;" ) - final AbstractArchive field4586; - @ObfuscatedName("h") + final AbstractArchive field4584; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lie;" ) - final DemotingHashTable field4585; - @ObfuscatedName("g") + final DemotingHashTable field4583; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1295217061 + intValue = 474099221 ) - final int field4587; + final int field4585; @ObfuscatedSignature( - descriptor = "(Lkh;ILlp;Llq;)V" + descriptor = "(Lkt;ILlo;Lln;)V" ) public class426(StudioGame var1, int var2, Language var3, AbstractArchive var4) { super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 - this.field4585 = new DemotingHashTable(64); // L: 15 - this.field4586 = var4; // L: 20 - this.field4587 = var2; // L: 21 + this.field4583 = new DemotingHashTable(64); // L: 15 + this.field4584 = var4; // L: 20 + this.field4585 = var2; // L: 21 } // L: 22 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Loi;", - garbageValue = "4" + descriptor = "(IB)Lox;", + garbageValue = "60" ) - protected class394 vmethod7638(int var1) { - synchronized(this.field4585) { // L: 26 - class393 var2 = (class393)this.field4585.get((long)var1); // L: 27 + protected class394 vmethod7542(int var1) { + synchronized(this.field4583) { // L: 26 + class393 var2 = (class393)this.field4583.get((long)var1); // L: 27 if (var2 == null) { // L: 28 - var2 = this.method7639(var1); // L: 29 - this.field4585.method5145(var2, (long)var1); // L: 30 + var2 = this.method7543(var1); // L: 29 + this.field4583.method5124(var2, (long)var1); // L: 30 } return var2; // L: 33 } } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Lof;", - garbageValue = "90" + descriptor = "(II)Loh;", + garbageValue = "1788746986" ) - class393 method7639(int var1) { - byte[] var2 = this.field4586.takeFile(this.field4587, var1); // L: 37 + class393 method7543(int var1) { + byte[] var2 = this.field4584.takeFile(this.field4585, var1); // L: 37 class393 var3 = new class393(var1); // L: 38 if (var2 != null) { - var3.method7199(new Buffer(var2)); // L: 39 + var3.method7128(new Buffer(var2)); // L: 39 } return var3; // L: 40 } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1581325429" + descriptor = "(B)V", + garbageValue = "-9" ) - public void method7640() { - synchronized(this.field4585) { // L: 44 - this.field4585.clear(); // L: 45 + public void method7541() { + synchronized(this.field4583) { // L: 44 + this.field4583.clear(); // L: 45 } } // L: 47 public Iterator iterator() { - return new class425(this); // L: 51 + return new class425(this); // L: 50 } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + static final void method7546() { + Client.field703 = Client.cycleCntr; // L: 12380 + SoundSystem.field309 = true; // L: 12381 + } // L: 12382 } diff --git a/runescape-client/src/main/java/class427.java b/runescape-client/src/main/java/class427.java index 2b1ff77db6..35895e89b1 100644 --- a/runescape-client/src/main/java/class427.java +++ b/runescape-client/src/main/java/class427.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pj") +@ObfuscatedName("pw") public interface class427 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpd;B)V", - garbageValue = "25" + descriptor = "(Ljava/lang/Object;Lpi;I)V", + garbageValue = "-700069158" ) - void vmethod7681(Object var1, Buffer var2); + void vmethod7597(Object var1, Buffer var2); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)Ljava/lang/Object;", - garbageValue = "1821026092" + descriptor = "(Lpi;I)Ljava/lang/Object;", + garbageValue = "-1640188252" ) - Object vmethod7683(Buffer var1); + Object vmethod7598(Buffer var1); } diff --git a/runescape-client/src/main/java/class428.java b/runescape-client/src/main/java/class428.java index 902d5bc3d2..77d0d44449 100644 --- a/runescape-client/src/main/java/class428.java +++ b/runescape-client/src/main/java/class428.java @@ -1,82 +1,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pk") +@ObfuscatedName("pa") final class class428 implements class427 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpd;B)V", - garbageValue = "25" + descriptor = "(Ljava/lang/Object;Lpi;I)V", + garbageValue = "-700069158" ) - public void vmethod7681(Object var1, Buffer var2) { - this.method7655((Integer)var1, var2); // L: 21 - } // L: 22 + public void vmethod7597(Object var1, Buffer var2) { + this.method7561((Integer)var1, var2); // L: 20 + } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)Ljava/lang/Object;", - garbageValue = "1821026092" + descriptor = "(Lpi;I)Ljava/lang/Object;", + garbageValue = "-1640188252" ) - public Object vmethod7683(Buffer var1) { - return var1.readInt(); // L: 17 + public Object vmethod7598(Buffer var1) { + return var1.readInt(); // L: 16 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lpd;I)V", - garbageValue = "1028680582" + descriptor = "(Ljava/lang/Integer;Lpi;B)V", + garbageValue = "1" ) - void method7655(Integer var1, Buffer var2) { + void method7561(Integer var1, Buffer var2) { var2.writeInt(var1); // L: 12 } // L: 13 - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2049600891" - ) - static final void method7654(int var0, int var1, int var2) { - if (EnumComposition.cameraX < var0) { // L: 3501 - EnumComposition.cameraX = (var0 - EnumComposition.cameraX) * class33.field231 / 1000 + EnumComposition.cameraX + Tiles.field996; // L: 3502 - if (EnumComposition.cameraX > var0) { // L: 3503 - EnumComposition.cameraX = var0; - } - } - - if (EnumComposition.cameraX > var0) { // L: 3505 - EnumComposition.cameraX -= (EnumComposition.cameraX - var0) * class33.field231 / 1000 + Tiles.field996; // L: 3506 - if (EnumComposition.cameraX < var0) { // L: 3507 - EnumComposition.cameraX = var0; - } - } - - if (FriendSystem.cameraY < var1) { // L: 3509 - FriendSystem.cameraY = (var1 - FriendSystem.cameraY) * class33.field231 / 1000 + FriendSystem.cameraY + Tiles.field996; // L: 3510 - if (FriendSystem.cameraY > var1) { // L: 3511 - FriendSystem.cameraY = var1; - } - } - - if (FriendSystem.cameraY > var1) { // L: 3513 - FriendSystem.cameraY -= (FriendSystem.cameraY - var1) * class33.field231 / 1000 + Tiles.field996; // L: 3514 - if (FriendSystem.cameraY < var1) { // L: 3515 - FriendSystem.cameraY = var1; - } - } - - if (CollisionMap.cameraZ < var2) { // L: 3517 - CollisionMap.cameraZ = (var2 - CollisionMap.cameraZ) * class33.field231 / 1000 + CollisionMap.cameraZ + Tiles.field996; // L: 3518 - if (CollisionMap.cameraZ > var2) { // L: 3519 - CollisionMap.cameraZ = var2; - } - } - - if (CollisionMap.cameraZ > var2) { // L: 3521 - CollisionMap.cameraZ -= (CollisionMap.cameraZ - var2) * class33.field231 / 1000 + Tiles.field996; // L: 3522 - if (CollisionMap.cameraZ < var2) { // L: 3523 - CollisionMap.cameraZ = var2; - } - } - - } // L: 3525 } diff --git a/runescape-client/src/main/java/class429.java b/runescape-client/src/main/java/class429.java index 551082d49b..eb5a8e2d09 100644 --- a/runescape-client/src/main/java/class429.java +++ b/runescape-client/src/main/java/class429.java @@ -1,13 +1,30 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pt") +@ObfuscatedName("py") public class class429 { @ObfuscatedName("v") - public static final int[] field4592; - @ObfuscatedName("bd") - static String field4593; + public static final int[] field4588; static { - field4592 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 + field4588 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lln;III)[Lqi;", + garbageValue = "311728442" + ) + public static SpritePixels[] method7568(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 25 + boolean var3; + if (var4 == null) { // L: 26 + var3 = false; // L: 27 + } else { + WorldMapArea.SpriteBuffer_decode(var4); // L: 30 + var3 = true; // L: 31 + } + + return !var3 ? null : class391.method7111(); // L: 33 34 } } diff --git a/runescape-client/src/main/java/class430.java b/runescape-client/src/main/java/class430.java index ba4fb4d9a7..2a216a5a1c 100644 --- a/runescape-client/src/main/java/class430.java +++ b/runescape-client/src/main/java/class430.java @@ -1,32 +1,62 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("pi") +@ObfuscatedName("pc") final class class430 implements class427 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpd;B)V", - garbageValue = "25" + descriptor = "(Ljava/lang/Object;Lpi;I)V", + garbageValue = "-700069158" ) - public void vmethod7681(Object var1, Buffer var2) { - this.method7661((Long)var1, var2); // L: 35 - } // L: 36 + public void vmethod7597(Object var1, Buffer var2) { + this.method7570((Long)var1, var2); // L: 33 + } // L: 34 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)Ljava/lang/Object;", - garbageValue = "1821026092" + descriptor = "(Lpi;I)Ljava/lang/Object;", + garbageValue = "-1640188252" ) - public Object vmethod7683(Buffer var1) { - return var1.readLong(); // L: 31 + public Object vmethod7598(Buffer var1) { + return var1.readLong(); // L: 29 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lpd;B)V", - garbageValue = "22" + descriptor = "(Ljava/lang/Long;Lpi;B)V", + garbageValue = "-28" ) - void method7661(Long var1, Buffer var2) { - var2.writeLong(var1); // L: 26 - } // L: 27 + void method7570(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 25 + } // L: 26 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "1539194584" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 222 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 223 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 224 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 225 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 226 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 227 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 228 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 229 + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + } + } } diff --git a/runescape-client/src/main/java/class431.java b/runescape-client/src/main/java/class431.java index fee6e92ff1..923412d31b 100644 --- a/runescape-client/src/main/java/class431.java +++ b/runescape-client/src/main/java/class431.java @@ -3,82 +3,197 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pc") +@ObfuscatedName("pk") public class class431 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpc;" - ) - public static final class431 field4598; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpk;" ) public static final class431 field4595; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpk;" ) - public static final class431 field4600; - @ObfuscatedName("g") + public static final class431 field4592; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lpk;" + ) + public static final class431 field4598; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lfr;" + ) + @Export("clock") + static Clock clock; + @ObfuscatedName("do") + static boolean field4602; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -715377131 + intValue = -1045232419 ) - final int field4597; - @ObfuscatedName("l") + final int field4594; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -632033909 + intValue = 690785775 ) - public final int field4594; + public final int field4596; @ObfuscatedName("n") - public final Class field4599; - @ObfuscatedName("d") + public final Class field4593; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpj;" + descriptor = "Lpw;" ) - public final class427 field4596; + final class427 field4597; static { - field4598 = new class431(0, 0, Integer.class, new class428()); // L: 10 - field4595 = new class431(2, 1, Long.class, new class430()); // L: 24 - field4600 = new class431(1, 2, String.class, new class432()); // L: 38 + field4595 = new class431(1, 0, Integer.class, new class428()); // L: 10 + field4592 = new class431(0, 1, Long.class, new class430()); // L: 23 + field4598 = new class431(2, 2, String.class, new class432()); // L: 36 } @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lpj;)V" + descriptor = "(IILjava/lang/Class;Lpw;)V" ) class431(int var1, int var2, Class var3, class427 var4) { - this.field4597 = var1; // L: 58 - this.field4594 = var2; // L: 59 - this.field4599 = var3; // L: 60 - this.field4596 = var4; // L: 61 - } // L: 62 + this.field4594 = var1; // L: 59 + this.field4596 = var2; // L: 60 + this.field4593 = var3; // L: 61 + this.field4597 = var4; // L: 62 + } // L: 63 @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpd;I)Ljava/lang/Object;", - garbageValue = "2058035287" - ) - public Object method7671(Buffer var1) { - return this.field4596.vmethod7683(var1); // L: 70 - } - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4594; // L: 66 + return this.field4596; // L: 94 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "35" + descriptor = "(Lpi;I)Ljava/lang/Object;", + garbageValue = "1124863933" ) - public static boolean method7673(int var0) { - return (var0 & 1) != 0; // L: 9 + public Object method7581(Buffer var1) { + return this.field4597.vmethod7598(var1); // L: 98 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "32" + ) + static final void method7593(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79 + for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80 + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81 + class392.field4374[0][var5][var4] = 127; // L: 82 + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var5 == var0 + var2 && var5 < 103) { // L: 84 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { // L: 85 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var4 == var3 + var1 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)[Lpk;", + garbageValue = "1" + ) + public static class431[] method7584() { + return new class431[]{field4592, field4595, field4598}; // L: 55 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpi;B)V", + garbageValue = "54" + ) + public static void method7579(Object var0, Buffer var1) { + Class var3 = var0.getClass(); // L: 67 + class431[] var5 = method7584(); // L: 72 + int var6 = 0; + + class431 var4; + while (true) { + if (var6 >= var5.length) { + var4 = null; // L: 83 + break; + } + + class431 var7 = var5[var6]; // L: 74 + if (var3 == var7.field4593) { // L: 76 + var4 = var7; // L: 77 + break; + } + + ++var6; // L: 73 + } + + if (var4 == null) { // L: 86 + throw new IllegalArgumentException(); + } else { + class427 var2 = var4.field4597; // L: 87 + var2.vmethod7597(var0, var1); // L: 90 + } + } // L: 91 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lln;Lln;Ljava/lang/String;Ljava/lang/String;I)Lmd;", + garbageValue = "986567968" + ) + public static Font method7594(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 149 + int var5 = var0.getFileId(var4, var3); // L: 150 + return class163.method3322(var0, var1, var4, var5); // L: 151 + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lky;I)Ljava/lang/String;", + garbageValue = "695765846" + ) + static String method7592(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 10730 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 10731 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 10733 + if (var3 == -1) { // L: 10734 + break; + } + + String var4 = var0.substring(0, var3); // L: 10735 + int var6 = BufferedSource.method6907(var1, var2 - 1); // L: 10737 + String var5; + if (var6 < 999999999) { // L: 10739 + var5 = Integer.toString(var6); // L: 10740 + } else { + var5 = "*"; // L: 10743 + } + + var0 = var4 + var5 + var0.substring(var3 + 2); // L: 10745 + } + } + } + + return var0; // L: 10749 } } diff --git a/runescape-client/src/main/java/class432.java b/runescape-client/src/main/java/class432.java index 734b035eff..c947143297 100644 --- a/runescape-client/src/main/java/class432.java +++ b/runescape-client/src/main/java/class432.java @@ -1,40 +1,41 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pl") +@ObfuscatedName("ps") final class class432 implements class427 { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lkn;" + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = -951968351 ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; + @Export("selectedItemSlot") + static int selectedItemSlot; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpd;B)V", - garbageValue = "25" + descriptor = "(Ljava/lang/Object;Lpi;I)V", + garbageValue = "-700069158" ) - public void vmethod7681(Object var1, Buffer var2) { - this.method7682((String)var1, var2); // L: 49 - } // L: 50 + public void vmethod7597(Object var1, Buffer var2) { + this.method7601((String)var1, var2); // L: 46 + } // L: 47 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpd;I)Ljava/lang/Object;", - garbageValue = "1821026092" + descriptor = "(Lpi;I)Ljava/lang/Object;", + garbageValue = "-1640188252" ) - public Object vmethod7683(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 45 + public Object vmethod7598(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 42 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lpd;I)V", - garbageValue = "-1807705187" + descriptor = "(Ljava/lang/String;Lpi;I)V", + garbageValue = "-1186525563" ) - void method7682(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 40 - } // L: 41 + void method7601(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 38 + } // L: 39 } diff --git a/runescape-client/src/main/java/class433.java b/runescape-client/src/main/java/class433.java new file mode 100644 index 0000000000..749c474aec --- /dev/null +++ b/runescape-client/src/main/java/class433.java @@ -0,0 +1,42 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pl") +public final class class433 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIIB)V", + garbageValue = "91" + ) + public static void method7605(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { // L: 39 + int var4 = (var3 + var2) / 2; // L: 40 + int var5 = var2; // L: 41 + String var6 = var0[var4]; // L: 42 + var0[var4] = var0[var3]; // L: 43 + var0[var3] = var6; // L: 44 + int var7 = var1[var4]; // L: 45 + var1[var4] = var1[var3]; // L: 46 + var1[var3] = var7; // L: 47 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 48 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 49 + String var9 = var0[var8]; // L: 50 + var0[var8] = var0[var5]; // L: 51 + var0[var5] = var9; // L: 52 + int var10 = var1[var8]; // L: 53 + var1[var8] = var1[var5]; // L: 54 + var1[var5++] = var10; // L: 55 + } + } + + var0[var3] = var0[var5]; // L: 59 + var0[var5] = var6; // L: 60 + var1[var3] = var1[var5]; // L: 61 + var1[var5] = var7; // L: 62 + method7605(var0, var1, var2, var5 - 1); // L: 63 + method7605(var0, var1, var5 + 1, var3); // L: 64 + } + + } // L: 66 +} diff --git a/runescape-client/src/main/java/class434.java b/runescape-client/src/main/java/class434.java deleted file mode 100644 index 3aff6acaac..0000000000 --- a/runescape-client/src/main/java/class434.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pv") -public class class434 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lfw;" - ) - @Export("taskHandler") - protected static TaskHandler taskHandler; -} diff --git a/runescape-client/src/main/java/class435.java b/runescape-client/src/main/java/class435.java deleted file mode 100644 index 18c6c9fff5..0000000000 --- a/runescape-client/src/main/java/class435.java +++ /dev/null @@ -1,34 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pu") -public class class435 { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)[Lql;", - garbageValue = "3" - ) - static SpritePixels[] method7695() { - SpritePixels[] var0 = new SpritePixels[class451.SpriteBuffer_spriteCount]; // L: 119 - - for (int var1 = 0; var1 < class451.SpriteBuffer_spriteCount; ++var1) { // L: 120 - SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 121 - var2.width = class451.SpriteBuffer_spriteWidth; // L: 122 - var2.height = class451.SpriteBuffer_spriteHeight; // L: 123 - var2.xOffset = class451.SpriteBuffer_xOffsets[var1]; // L: 124 - var2.yOffset = class451.SpriteBuffer_yOffsets[var1]; // L: 125 - var2.subWidth = class451.SpriteBuffer_spriteWidths[var1]; // L: 126 - var2.subHeight = class451.SpriteBuffer_spriteHeights[var1]; // L: 127 - int var3 = var2.subWidth * var2.subHeight; // L: 128 - byte[] var4 = class460.SpriteBuffer_pixels[var1]; // L: 129 - var2.pixels = new int[var3]; // L: 130 - - for (int var5 = 0; var5 < var3; ++var5) { // L: 131 - var2.pixels[var5] = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var4[var5] & 255]; - } - } - - RouteStrategy.method3872(); // L: 133 - return var0; // L: 134 - } -} diff --git a/runescape-client/src/main/java/class440.java b/runescape-client/src/main/java/class440.java index 305b3652ac..cfd558a5af 100644 --- a/runescape-client/src/main/java/class440.java +++ b/runescape-client/src/main/java/class440.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pn") +@ObfuscatedName("pv") public interface class440 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpd;I)V" + descriptor = "(Lpi;S)V" ) - void method8012(Buffer var1); + void method7924(Buffer var1); } diff --git a/runescape-client/src/main/java/class441.java b/runescape-client/src/main/java/class441.java index 3053dee58a..c2c34037b1 100644 --- a/runescape-client/src/main/java/class441.java +++ b/runescape-client/src/main/java/class441.java @@ -3,79 +3,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pb") +@ObfuscatedName("pq") public class class441 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpq;" ) - public static final class441 field4672; - @ObfuscatedName("o") + public static final class441 field4678; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpq;" ) - public static final class441 field4667; - @ObfuscatedName("h") + public static final class441 field4671; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpb;" - ) - static final class441 field4670; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lpb;" - ) - static final class441 field4669; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpq;" ) static final class441 field4673; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lpq;" + ) + static final class441 field4674; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lpq;" + ) + static final class441 field4677; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpq;" ) - static final class441 field4671; - @ObfuscatedName("d") + static final class441 field4676; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1789333857 + intValue = 489938793 ) - final int field4668; - @ObfuscatedName("f") + final int field4675; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -863462931 + intValue = 464620871 ) - final int field4666; + final int field4672; static { - field4672 = new class441(0, 0); // L: 8 - field4667 = new class441(2, 2); // L: 9 - field4670 = new class441(3, 5); // L: 10 - field4669 = new class441(5, 6); // L: 11 - field4673 = new class441(4, 7); // L: 12 - field4671 = new class441(1, 8); // L: 13 + field4678 = new class441(2, 0); // L: 8 + field4671 = new class441(4, 2); // L: 9 + field4673 = new class441(0, 5); // L: 10 + field4674 = new class441(3, 6); // L: 11 + field4677 = new class441(1, 7); // L: 12 + field4676 = new class441(5, 8); // L: 13 } class441(int var1, int var2) { - this.field4668 = var1; // L: 18 - this.field4666 = var2; // L: 19 + this.field4675 = var1; // L: 18 + this.field4672 = var2; // L: 19 } // L: 20 @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1638703737" - ) - public boolean method8013() { - return this == field4667; // L: 28 - } - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4666; // L: 24 + return this.field4672; // L: 23 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1052027203" + ) + public boolean method7928() { + return this == field4671; // L: 27 } } diff --git a/runescape-client/src/main/java/class444.java b/runescape-client/src/main/java/class444.java index 31b6123a8c..0931b1fce8 100644 --- a/runescape-client/src/main/java/class444.java +++ b/runescape-client/src/main/java/class444.java @@ -3,10 +3,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("qf") public interface class444 { - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-1983515453" + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "-61" ) - Object vmethod8046(int var1); + Object vmethod7950(int var1); } diff --git a/runescape-client/src/main/java/class445.java b/runescape-client/src/main/java/class445.java index 40a5d0e4c1..2df798297f 100644 --- a/runescape-client/src/main/java/class445.java +++ b/runescape-client/src/main/java/class445.java @@ -1,59 +1,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qk") +@ObfuscatedName("qd") public class class445 { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 739167355 + intValue = -994672853 ) - public final int field4680; - @ObfuscatedName("o") + public final int field4683; + @ObfuscatedName("c") public Object field4681; public class445(int var1) { - this.field4680 = var1; // L: 8 + this.field4683 = var1; // L: 8 } // L: 9 public class445(int var1, Object var2) { - this.field4680 = var1; // L: 12 + this.field4683 = var1; // L: 12 this.field4681 = var2; // L: 13 } // L: 14 public int hashCode() { - return super.hashCode(); // L: 18 + return super.hashCode(); // L: 17 } public boolean equals(Object var1) { - if (!(var1 instanceof class445)) { // L: 23 + if (!(var1 instanceof class445)) { // L: 21 return false; } else { - class445 var2 = (class445)var1; // L: 24 - if (var2.field4681 == null && this.field4681 != null) { // L: 25 + class445 var2 = (class445)var1; // L: 22 + if (var2.field4681 == null && this.field4681 != null) { // L: 23 return false; - } else if (this.field4681 == null && var2.field4681 != null) { // L: 26 + } else if (this.field4681 == null && var2.field4681 != null) { // L: 24 return false; } else { - return var2.field4680 == this.field4680 && var2.field4681.equals(this.field4681); // L: 27 + return this.field4683 == var2.field4683 && var2.field4681.equals(this.field4681); // L: 25 } } } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lbr;Lbr;IZIZB)I", - garbageValue = "35" - ) - static int method8053(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = GrandExchangeOffer.compareWorlds(var0, var1, var2, var3); // L: 199 - if (var6 != 0) { // L: 200 - return var3 ? -var6 : var6; // L: 201 - } else if (var4 == -1) { // L: 204 - return 0; - } else { - int var7 = GrandExchangeOffer.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 - } - } } diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class45.java similarity index 67% rename from runescape-client/src/main/java/class47.java rename to runescape-client/src/main/java/class45.java index 0660422a8f..f7f2cbafa1 100644 --- a/runescape-client/src/main/java/class47.java +++ b/runescape-client/src/main/java/class45.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") -public interface class47 { +@ObfuscatedName("ai") +public interface class45 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lao;", - garbageValue = "-1472980183" + descriptor = "(I)Lay;", + garbageValue = "-262480710" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/class451.java b/runescape-client/src/main/java/class451.java index 1e91b6dc4b..a88a265d8d 100644 --- a/runescape-client/src/main/java/class451.java +++ b/runescape-client/src/main/java/class451.java @@ -2,36 +2,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qb") +@ObfuscatedName("qy") public class class451 { @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1151895275 + intValue = -1097850827 ) @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; - @ObfuscatedName("o") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 457753385 + intValue = 28448161 ) @Export("SpriteBuffer_spriteWidth") - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("h") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1318930393 + intValue = 972266423 ) @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("g") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("f") @Export("SpriteBuffer_xOffsets") - static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("l") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; + public static int[] SpriteBuffer_xOffsets; @ObfuscatedName("n") @Export("SpriteBuffer_spriteWidths") - static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("d") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("s") @Export("SpriteBuffer_spriteHeights") - static int[] SpriteBuffer_spriteHeights; + public static int[] SpriteBuffer_spriteHeights; } diff --git a/runescape-client/src/main/java/class452.java b/runescape-client/src/main/java/class452.java deleted file mode 100644 index 386cd9aaeb..0000000000 --- a/runescape-client/src/main/java/class452.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("qj") -public class class452 { - @ObfuscatedName("bi") - @Export("otp") - static String otp; -} diff --git a/runescape-client/src/main/java/class457.java b/runescape-client/src/main/java/class457.java deleted file mode 100644 index 3179519abf..0000000000 --- a/runescape-client/src/main/java/class457.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("qz") -public abstract class class457 { - @ObfuscatedName("tk") - @ObfuscatedGetter( - intValue = -2095941621 - ) - static int field4747; -} diff --git a/runescape-client/src/main/java/class460.java b/runescape-client/src/main/java/class460.java deleted file mode 100644 index e5154fde66..0000000000 --- a/runescape-client/src/main/java/class460.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("qc") -public class class460 { - @ObfuscatedName("u") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; -} diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index f3678b6c1f..77eabf5bd4 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -7,38 +7,38 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("n") public class class5 implements class2 { @ObfuscatedName("v") - final MessageDigest field14; + final MessageDigest field9; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lq;)V" ) class5(class8 var1) { - this.field14 = this.method31(); // L: 14 + this.field9 = this.method23(); // L: 14 } // L: 15 @ObfuscatedName("v") - boolean method21(int var1, String var2, long var3) { - byte[] var5 = this.method23(var2, var3); // L: 18 - return method22(var5) >= var1; // L: 19 + boolean method19(int var1, String var2, long var3) { + byte[] var5 = this.method22(var2, var3); // L: 18 + return method33(var5) >= var1; // L: 19 } - @ObfuscatedName("g") - byte[] method23(String var1, long var2) { + @ObfuscatedName("f") + byte[] method22(String var1, long var2) { StringBuilder var4 = new StringBuilder(); // L: 56 var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field14.reset(); // L: 58 + this.field9.reset(); // L: 58 try { - this.field14.update(var4.toString().getBytes("UTF-8")); // L: 60 + this.field9.update(var4.toString().getBytes("UTF-8")); // L: 60 } catch (UnsupportedEncodingException var6) { // L: 62 var6.printStackTrace(); // L: 63 } - return this.field14.digest(); // L: 65 + return this.field9.digest(); // L: 65 } - @ObfuscatedName("l") - MessageDigest method31() { + @ObfuscatedName("b") + MessageDigest method23() { try { return MessageDigest.getInstance("SHA-256"); // L: 70 } catch (NoSuchAlgorithmException var2) { // L: 72 @@ -47,14 +47,14 @@ public class class5 implements class2 { } } - @ObfuscatedName("o") - static int method22(byte[] var0) { + @ObfuscatedName("c") + static int method33(byte[] var0) { int var1 = 0; // L: 23 byte[] var2 = var0; // L: 25 for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 byte var4 = var2[var3]; // L: 27 - int var5 = method20(var4); // L: 29 + int var5 = method26(var4); // L: 29 var1 += var5; // L: 30 if (var5 != 8) { // L: 31 break; @@ -64,8 +64,8 @@ public class class5 implements class2 { return var1; // L: 37 } - @ObfuscatedName("h") - static int method20(byte var0) { + @ObfuscatedName("i") + static int method26(byte var0) { int var1 = 0; // L: 41 if (var0 == 0) { // L: 42 var1 = 8; // L: 43 diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java new file mode 100644 index 0000000000..ae4dffde39 --- /dev/null +++ b/runescape-client/src/main/java/class54.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("br") +public class class54 { + @ObfuscatedName("sn") + @ObfuscatedGetter( + intValue = -508954501 + ) + static int field447; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + @Export("reflectionChecks") + static IterableNodeDeque reflectionChecks; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("en") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + @Export("archive17") + static Archive archive17; + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "[Lqi;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + + static { + reflectionChecks = new IterableNodeDeque(); // L: 17 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1793988868" + ) + public static int method1078(int var0) { + return class271.field3155[var0]; // L: 24 + } +} diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 85cab72c8d..43c0477766 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -3,79 +3,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("s") public enum class6 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ld;" + descriptor = "Ls;" ) - field22(0, 0); - - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -7519613 - ) - final int field17; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 151046051 - ) - final int field18; - - class6(int var3, int var4) { - this.field17 = var3; // L: 16 - this.field18 = var4; // L: 17 - } // L: 18 + field14(0, 0); @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" + descriptor = "Lah;" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field18; // L: 22 - } + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -758443575 + ) + public final int field12; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 834021789 + ) + final int field13; + + class6(int var3, int var4) { + this.field12 = var3; // L: 12 + this.field13 = var4; // L: 13 + } // L: 14 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lfp;", - garbageValue = "758685102" + descriptor = "(B)I", + garbageValue = "16" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { // L: 33 - return var1; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field13; // L: 17 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lln;III)Lqi;", + garbageValue = "-1027602960" + ) + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 40 + boolean var3; + if (var4 == null) { // L: 41 + var3 = false; // L: 42 } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 - var1 = new SpotAnimationDefinition(); // L: 35 - var1.id = var0; // L: 36 - if (var2 != null) { // L: 37 - var1.decode(new Buffer(var2)); + WorldMapArea.SpriteBuffer_decode(var4); // L: 45 + var3 = true; // L: 46 + } + + if (!var3) { // L: 48 + return null; + } else { + SpritePixels var5 = new SpritePixels(); // L: 51 + var5.width = class451.SpriteBuffer_spriteWidth; // L: 52 + var5.height = class451.SpriteBuffer_spriteHeight; // L: 53 + var5.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 54 + var5.yOffset = class271.SpriteBuffer_yOffsets[0]; // L: 55 + var5.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 56 + var5.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 57 + int var6 = var5.subWidth * var5.subHeight; // L: 58 + byte[] var7 = FriendLoginUpdate.SpriteBuffer_pixels[0]; // L: 59 + var5.pixels = new int[var6]; // L: 60 + + for (int var8 = 0; var8 < var6; ++var8) { // L: 61 + var5.pixels[var8] = NetFileRequest.SpriteBuffer_spritePalette[var7[var8] & 255]; } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 + ArchiveDiskActionHandler.method5813(); // L: 62 + return var5; // L: 65 } } - @ObfuscatedName("o") + @ObfuscatedName("hn") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1259408823" + descriptor = "(I)Z", + garbageValue = "144596898" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 - if (var4 == null) { // L: 24 - var4 = new ChatChannel(); // L: 25 - Messages.Messages_channels.put(var0, var4); // L: 26 - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 - Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 - Messages.Messages_queue.add(var5); // L: 30 - Client.chatCycle = Client.cycleCntr; // L: 31 - } // L: 32 + static boolean method36() { + return (Client.drawPlayerNames & 8) != 0; // L: 4857 + } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index e114dfda0c..58ff80498e 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,306 +1,54 @@ -import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("bq") public class class65 { - @ObfuscatedName("l") - static final BigInteger field861; + @ObfuscatedName("b") + static final BigInteger field863; @ObfuscatedName("n") - static final BigInteger field862; + static final BigInteger field864; + @ObfuscatedName("bx") + static String field868; static { - field861 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field862 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field863 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field864 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("v") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-685134646" + descriptor = "(Lky;Lgf;IIZI)V", + garbageValue = "1206801353" ) - public static boolean method1875() { - long var0 = WorldMapSprite.method4989(); // L: 42 - int var2 = (int)(var0 - NetCache.field3976); // L: 43 - NetCache.field3976 = var0; // L: 44 - if (var2 > 200) { // L: 45 - var2 = 200; - } - - NetCache.NetCache_loadTime += var2; // L: 46 - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 - return true; - } else if (NetCache.NetCache_socket == null) { // L: 48 - return false; - } else { - try { - if (NetCache.NetCache_loadTime > 30000) { // L: 50 - throw new IOException(); - } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 - var4 = new Buffer(4); // L: 53 - var4.writeByte(1); // L: 54 - var4.writeMedium((int)var3.key); // L: 55 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 - var4 = new Buffer(4); // L: 63 - var4.writeByte(0); // L: 64 - var4.writeMedium((int)var3.key); // L: 65 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 - var3.removeDual(); // L: 67 - NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 - --NetCache.NetCache_pendingWritesCount; // L: 69 - ++NetCache.NetCache_pendingResponsesCount; // L: 70 - } - - for (int var15 = 0; var15 < 100; ++var15) { // L: 72 - int var16 = NetCache.NetCache_socket.available(); // L: 73 - if (var16 < 0) { // L: 74 - throw new IOException(); - } - - if (var16 == 0) { // L: 75 - break; - } - - NetCache.NetCache_loadTime = 0; // L: 76 - byte var5 = 0; // L: 77 - if (NetCache.NetCache_currentResponse == null) { // L: 78 - var5 = 8; - } else if (NetCache.field3990 == 0) { // L: 79 - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { // L: 80 - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 - if (var6 > var16) { // L: 82 - var6 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 - if (NetCache.field3999 != 0) { // L: 84 - for (var7 = 0; var7 < var6; ++var7) { // L: 85 - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3999; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 - break; - } - - if (NetCache.NetCache_currentResponse == null) { // L: 89 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 - long var11 = (long)(var8 + (var7 << 16)); // L: 95 - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 - ClanChannel.field1673 = true; // L: 97 - if (var13 == null) { // L: 98 - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 - ClanChannel.field1673 = false; // L: 100 - } - - if (var13 == null) { // L: 102 - throw new IOException(); // L: 103 - } - - int var14 = var9 == 0 ? 5 : 9; // L: 105 - NetCache.NetCache_currentResponse = var13; // L: 106 - class291.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + NetCache.NetCache_currentResponse.padding); // L: 107 - class291.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 - class291.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 - NetCache.field3990 = 8; // L: 110 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 - } else if (NetCache.field3990 == 0) { // L: 114 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 - NetCache.field3990 = 1; // L: 116 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 - } else { - NetCache.NetCache_currentResponse = null; // L: 121 - } - } - } else { - var6 = class291.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; // L: 127 - var7 = 512 - NetCache.field3990; // L: 128 - if (var7 > var6 - class291.NetCache_responseArchiveBuffer.offset) { // L: 129 - var7 = var6 - class291.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { // L: 130 - var7 = var16; - } - - NetCache.NetCache_socket.read(class291.NetCache_responseArchiveBuffer.array, class291.NetCache_responseArchiveBuffer.offset, var7); // L: 131 - if (NetCache.field3999 != 0) { // L: 132 - for (var8 = 0; var8 < var7; ++var8) { // L: 133 - var10000 = class291.NetCache_responseArchiveBuffer.array; - var10001 = class291.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3999; - } - } - - var22 = class291.NetCache_responseArchiveBuffer; // L: 135 - var22.offset += var7; - NetCache.field3990 += var7; // L: 136 - if (var6 == class291.NetCache_responseArchiveBuffer.offset) { // L: 137 - if (NetCache.NetCache_currentResponse.key == 16711935L) { // L: 138 - class122.NetCache_reference = class291.NetCache_responseArchiveBuffer; // L: 139 - - for (var8 = 0; var8 < 256; ++var8) { // L: 140 - Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 - if (var17 != null) { // L: 142 - class122.NetCache_reference.offset = var8 * 8 + 5; // L: 143 - var10 = class122.NetCache_reference.readInt(); // L: 144 - int var18 = class122.NetCache_reference.readInt(); // L: 145 - var17.loadIndex(var10, var18); // L: 146 - } - } - } else { - NetCache.NetCache_crc.reset(); // L: 151 - NetCache.NetCache_crc.update(class291.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 - var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 - if (var8 != NetCache.NetCache_currentResponse.crc) { // L: 154 - try { - NetCache.NetCache_socket.close(); // L: 156 - } catch (Exception var20) { // L: 158 - } - - ++NetCache.NetCache_crcMismatches; // L: 159 - NetCache.NetCache_socket = null; // L: 160 - NetCache.field3999 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 - return false; // L: 162 - } - - NetCache.NetCache_crcMismatches = 0; // L: 164 - NetCache.NetCache_ioExceptions = 0; // L: 165 - NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), class291.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, ClanChannel.field1673); // L: 166 - } - - NetCache.NetCache_currentResponse.remove(); // L: 168 - if (ClanChannel.field1673) { // L: 169 - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; // L: 170 - } - - NetCache.field3990 = 0; // L: 171 - NetCache.NetCache_currentResponse = null; // L: 172 - class291.NetCache_responseArchiveBuffer = null; // L: 173 - } else { - if (NetCache.field3990 != 512) { // L: 175 - break; - } - - NetCache.field3990 = 0; - } - } - } - - return true; // L: 179 - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); // L: 183 - } catch (Exception var19) { // L: 185 - } - - ++NetCache.NetCache_ioExceptions; // L: 186 - NetCache.NetCache_socket = null; // L: 187 - return false; // L: 188 + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 11004 + byte var6 = -1; // L: 11005 + String var7 = null; // L: 11006 + if (var5 != null && var5[var3] != null) { // L: 11007 + if (var3 == 0) { // L: 11008 + var6 = 33; + } else if (var3 == 1) { // L: 11009 + var6 = 34; + } else if (var3 == 2) { // L: 11010 + var6 = 35; + } else if (var3 == 3) { // L: 11011 + var6 = 36; + } else { + var6 = 37; // L: 11012 } - } - } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIIB)J", - garbageValue = "126" - ) - static long method1867(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Ljt;", - garbageValue = "-381402387" - ) - static PacketBufferNode method1876() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "138595425" - ) - public static int[] method1869() { - int[] var0 = new int[KeyHandler.field132]; // L: 240 - - for (int var1 = 0; var1 < KeyHandler.field132; ++var1) { // L: 241 - var0[var1] = KeyHandler.field139[var1]; // L: 242 + var7 = var5[var3]; // L: 11013 + } else if (var3 == 4) { // L: 11016 + var6 = 37; // L: 11017 + var7 = "Drop"; // L: 11018 } - return var0; // L: 244 - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "([Lkn;IIIZI)V", - garbageValue = "561334145" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10170 - Widget var6 = var0[var5]; // L: 10171 - if (var6 != null && var6.parentId == var1) { // L: 10172 10173 - class116.alignWidgetSize(var6, var2, var3, var4); // L: 10174 - class162.alignWidgetPosition(var6, var2, var3); // L: 10175 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10176 - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { // L: 10177 - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10178 - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { // L: 10179 - var6.scrollY = 0; - } - - if (var6.type == 0) { // L: 10180 - GrandExchangeEvents.revalidateWidgetScroll(var0, var6, var4); - } - } + if (var6 != -1 && var7 != null) { // L: 11021 + class28.insertMenuItem(var7, UserComparator9.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 11022 } - } // L: 10182 + } // L: 11024 } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java index 45dec549ee..d0cc127716 100644 --- a/runescape-client/src/main/java/class67.java +++ b/runescape-client/src/main/java/class67.java @@ -1,190 +1,80 @@ -import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("bk") public class class67 { + @ObfuscatedName("sk") + @ObfuscatedGetter( + intValue = -19074661 + ) + static int field881; @ObfuscatedName("v") - static final BigInteger field875; - @ObfuscatedName("o") - static final BigInteger field878; + static final BigInteger field882; + @ObfuscatedName("c") + static final BigInteger field880; static { - field875 = new BigInteger("10001", 16); // L: 6 - field878 = new BigInteger("a297f6692a7a1d8b2786f93cf85ef1d85f2a702a6f04b4503c079d0c3970d7a7bda84292dd1c8249b1cd8d0eb0fe10e16ad2d42a7fbbb321f4f5603afec3f13a03d534b8e2233ba479c346208306d2d816ef9f8f1ee69896d2cd1f3dfcb7d8e5987ed6e9412f962811bfbfb59b689ce506438d4f3c8dfb5c95c1670ad4d2e767", 16); // L: 7 + field882 = new BigInteger("10001", 16); // L: 6 + field880 = new BigInteger("a297f6692a7a1d8b2786f93cf85ef1d85f2a702a6f04b4503c079d0c3970d7a7bda84292dd1c8249b1cd8d0eb0fe10e16ad2d42a7fbbb321f4f5603afec3f13a03d534b8e2233ba479c346208306d2d816ef9f8f1ee69896d2cd1f3dfcb7d8e5987ed6e9412f962811bfbfb59b689ce506438d4f3c8dfb5c95c1670ad4d2e767", 16); // L: 7 } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Lgz;", - garbageValue = "-61" + descriptor = "(III)I", + garbageValue = "-309865537" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 - if (var1 != null) { // L: 93 - return var1; + static int method1910(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 + if (var2 == null) { // L: 29 + return 0; + } else if (var1 == -1) { // L: 30 + return 0; } else { - byte[] var2 = WorldMapID.ItemDefinition_archive.takeFile(10, var0); // L: 94 - var1 = new ItemComposition(); // L: 95 - var1.id = var0; // L: 96 - if (var2 != null) { // L: 97 - var1.decode(new Buffer(var2)); - } + int var3 = 0; // L: 31 - var1.post(); // L: 98 - if (var1.noteTemplate != -1) { // L: 99 - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { // L: 100 - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { // L: 101 - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!HealthBar.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 - var1.name = "Members object"; // L: 103 - var1.isTradable = false; // L: 104 - - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 105 - var1.groundActions[var3] = null; // L: 106 - } - - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 108 - if (var3 != 4) { // L: 109 - var1.inventoryActions[var3] = null; // L: 110 - } - } - - var1.shiftClickIndex = -2; // L: 113 - var1.team = 0; // L: 114 - if (var1.params != null) { // L: 115 - boolean var6 = false; // L: 116 - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 117 - ParamComposition var5 = class182.getParamDefinition((int)var4.key); // L: 118 - if (var5.autoDisable) { // L: 119 - var4.remove(); - } else { - var6 = true; // L: 120 - } - } - - if (!var6) { // L: 122 - var1.params = null; - } + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 } } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 125 - return var1; // L: 126 + return var3; // L: 35 } } - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-945554584" + descriptor = "(II)I", + garbageValue = "822904825" ) - public static byte[] method1878() { - byte[] var0 = new byte[24]; // L: 222 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 224 - JagexCache.JagexCache_randomDat.readFully(var0); // L: 225 - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 226 227 228 - } - - if (var1 >= 24) { - throw new IOException(); // L: 230 - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { // L: 233 - var0[var2] = -1; - } - } - - return var0; // L: 235 + public static int method1909(int var0) { + --var0; // L: 50 + var0 |= var0 >>> 1; // L: 51 + var0 |= var0 >>> 2; // L: 52 + var0 |= var0 >>> 4; // L: 53 + var0 |= var0 >>> 8; // L: 54 + var0 |= var0 >>> 16; // L: 55 + return var0 + 1; // L: 56 } - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIB)Z", - garbageValue = "0" + descriptor = "(Lky;II)V", + garbageValue = "1726042020" ) - static final boolean method1879(byte[] var0, int var1, int var2) { - boolean var3 = true; // L: 249 - Buffer var4 = new Buffer(var0); // L: 250 - int var5 = -1; // L: 251 - - label71: - while (true) { - int var6 = var4.method7775(); // L: 253 - if (var6 == 0) { // L: 254 - return var3; // L: 285 - } - - var5 += var6; // L: 255 - int var7 = 0; // L: 256 - boolean var8 = false; // L: 257 - - while (true) { - int var9; - while (!var8) { // L: 259 - var9 = var4.readUShortSmart(); // L: 265 - if (var9 == 0) { // L: 266 - continue label71; - } - - var7 += var9 - 1; // L: 267 - int var10 = var7 & 63; // L: 268 - int var11 = var7 >> 6 & 63; // L: 269 - int var12 = var4.readUnsignedByte() >> 2; // L: 270 - int var13 = var11 + var1; // L: 271 - int var14 = var10 + var2; // L: 272 - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 273 - ObjectComposition var15 = class116.getObjectDefinition(var5); // L: 274 - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 275 - if (!var15.needsModelFiles()) { // L: 276 - ++Client.field543; // L: 277 - var3 = false; // L: 278 - } - - var8 = true; // L: 280 - } - } - } - - var9 = var4.readUShortSmart(); // L: 260 - if (var9 == 0) { // L: 261 - break; - } - - var4.readUnsignedByte(); // L: 262 - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IZIB)V", - garbageValue = "12" - ) - public static final void method1881(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { // L: 49 - SecureRandomFuture.field949 = var0; // L: 50 - PcmPlayer.PcmPlayer_stereo = var1; // L: 51 - class33.field237 = var2; // L: 52 + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3415 == null) { // L: 1020 + throw new RuntimeException(); // L: 1021 } else { - throw new IllegalArgumentException(); + if (var0.field3484 == null) { // L: 1023 + var0.field3484 = new int[var0.field3415.length]; // L: 1024 + } + + var0.field3484[var1] = Integer.MAX_VALUE; // L: 1026 } - } // L: 53 + } // L: 1027 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 00a4be2fe6..8feffb7ab9 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,90 +1,210 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("f") +@ObfuscatedName("l") public class class7 { - @ObfuscatedName("bf") - @ObfuscatedGetter( - intValue = 1881203141 - ) - static int field27; @ObfuscatedName("v") - ExecutorService field25; - @ObfuscatedName("o") - Future field24; - @ObfuscatedName("h") + ExecutorService field20; + @ObfuscatedName("c") + Future field18; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lpi;" ) - final Buffer field23; - @ObfuscatedName("g") + final Buffer field19; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lf;" ) - final class3 field26; + final class3 field17; @ObfuscatedSignature( - descriptor = "(Lpd;Lg;)V" + descriptor = "(Lpi;Lf;)V" ) public class7(Buffer var1, class3 var2) { - this.field25 = Executors.newSingleThreadExecutor(); // L: 10 - this.field23 = var1; // L: 16 - this.field26 = var2; // L: 17 - this.method51(); // L: 18 - } // L: 19 + this.field20 = Executors.newSingleThreadExecutor(); // L: 10 + this.field19 = var1; + this.field17 = var2; + this.method42(); // L: 18 + } @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "521214923" + garbageValue = "-254090586" ) - public boolean method42() { - return this.field24.isDone(); // L: 22 + public boolean method43() { + return this.field18.isDone(); } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "979398206" + descriptor = "(B)V", + garbageValue = "67" ) - public void method43() { - this.field25.shutdown(); // L: 26 - this.field25 = null; // L: 27 - } // L: 28 + public void method47() { + this.field20.shutdown(); // L: 26 + this.field20 = null; + } - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Lpd;", - garbageValue = "-2131615831" + descriptor = "(I)Lpi;", + garbageValue = "-2056850231" ) - public Buffer method44() { + public Buffer method45() { try { - return (Buffer)this.field24.get(); // L: 32 + return (Buffer)this.field18.get(); } catch (Exception var2) { // L: 34 - return null; // L: 35 + return null; } } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1341828538" - ) - void method51() { - this.field24 = this.field25.submit(new class1(this, this.field23, this.field26)); // L: 40 - } // L: 41 - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-184151325" + descriptor = "(B)V", + garbageValue = "0" ) - public static int method53(int var0, int var1) { - int var2 = var0 >>> 31; // L: 96 - return (var0 + var2) / var1 - var2; // L: 97 + void method42() { + this.field18 = this.field20.submit(new class1(this, this.field19, this.field17)); // L: 40 + } // L: 41 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "6" + ) + static int method53(int var0, int var1) { + FloorOverlayDefinition var2 = Clock.method3349(var0); // L: 15 + if (var2 == null) { // L: 16 + return var1; // L: 17 + } else if (var2.secondaryRgb >= 0) { // L: 19 + return var2.secondaryRgb | -16777216; // L: 20 + } else { + int var3; + int var4; + byte var5; + int var7; + if (var2.texture >= 0) { // L: 22 + var4 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); // L: 24 + var5 = 96; // L: 25 + if (var4 == -2) { // L: 27 + var3 = 12345678; // L: 28 + } else if (var4 == -1) { // L: 31 + if (var5 < 0) { // L: 32 + var5 = 0; // L: 33 + } else if (var5 > 127) { // L: 35 + var5 = 127; // L: 36 + } + + var7 = 127 - var5; // L: 38 + var3 = var7; // L: 39 + } else { + var7 = var5 * (var4 & 127) / 128; // L: 42 + if (var7 < 2) { + var7 = 2; // L: 43 + } else if (var7 > 126) { // L: 44 + var7 = 126; + } + + var3 = var7 + (var4 & 65408); // L: 45 + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 48 + } else if (var2.primaryRgb == 16711935) { // L: 50 + return var1; // L: 51 + } else { + var3 = FontName.method7415(var2.hue, var2.saturation, var2.lightness); // L: 54 + var5 = 96; // L: 56 + if (var3 == -2) { // L: 58 + var4 = 12345678; // L: 59 + } else if (var3 == -1) { // L: 62 + if (var5 < 0) { // L: 63 + var5 = 0; // L: 64 + } else if (var5 > 127) { // L: 66 + var5 = 127; // L: 67 + } + + var7 = 127 - var5; // L: 69 + var4 = var7; // L: 70 + } else { + var7 = var5 * (var3 & 127) / 128; // L: 73 + if (var7 < 2) { // L: 74 + var7 = 2; + } else if (var7 > 126) { // L: 75 + var7 = 126; + } + + var4 = var7 + (var3 & 65408); // L: 76 + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 79 + } + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ILbd;ZI)I", + garbageValue = "17269568" + ) + static int method54(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 561 + Widget var4; + if (var0 >= 2000) { // L: 563 + var0 -= 1000; // L: 564 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 565 + var4 = class127.getWidget(var3); // L: 566 + } else { + var4 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 568 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 569 + Interpreter.Interpreter_intStackSize -= 4; // L: 570 + var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 571 + var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 572 + var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 573 + var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 574 + class346.invalidateWidget(var4); // L: 575 + class127.client.alignWidget(var4); // L: 576 + if (var3 != -1 && var4.type == 0) { // L: 577 + AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 578 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 580 + Interpreter.Interpreter_intStackSize -= 4; // L: 581 + var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 582 + var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 583 + var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 584 + var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 585 + class346.invalidateWidget(var4); // L: 586 + class127.client.alignWidget(var4); // L: 587 + if (var3 != -1 && var4.type == 0) { // L: 588 + AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 589 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 591 + boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 592 + if (var5 != var4.isHidden) { // L: 593 + var4.isHidden = var5; // L: 594 + class346.invalidateWidget(var4); // L: 595 + } + + return 1; // L: 597 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599 + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 600 + return 1; // L: 601 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 603 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 604 + return 1; // L: 605 + } else { + return 2; // L: 607 + } } } diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java index ecc7587b31..d4fae49ae5 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -2,168 +2,54 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cm") public class class78 { - @ObfuscatedName("z") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1805721740" + descriptor = "(IB)Lfs;", + garbageValue = "124" ) - protected static final void method2098() { - class4.clock.mark(); // L: 436 + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 + if (var1 != null) { // L: 30 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31 + var1 = new EnumComposition(); // L: 32 + if (var2 != null) { // L: 33 + var1.decode(new Buffer(var2)); + } - int var0; - for (var0 = 0; var0 < 32; ++var0) { // L: 437 - GameEngine.graphicsTickTimes[var0] = 0L; + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 } + } - for (var0 = 0; var0 < 32; ++var0) { // L: 438 - GameEngine.clientTickTimes[var0] = 0L; - } - - class134.gameCyclesToDo = 0; // L: 439 - } // L: 440 - - @ObfuscatedName("ks") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "126" + descriptor = "(II)V", + garbageValue = "-39348286" ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - SceneTilePaint.method4499(); // L: 11392 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11394 - if (var1.obj != null) { // L: 11395 - var1.set(); - } + static void method2081(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 } + } // L: 73 75 - int var3 = SoundCache.VarpDefinition_get(var0).type; // L: 11398 - if (var3 != 0) { // L: 11399 - int var2 = Varps.Varps_main[var0]; // L: 11400 - if (var3 == 1) { // L: 11401 - if (var2 == 1) { // L: 11402 - class175.method3439(0.9D); - } - - if (var2 == 2) { // L: 11403 - class175.method3439(0.8D); - } - - if (var2 == 3) { // L: 11404 - class175.method3439(0.7D); - } - - if (var2 == 4) { // L: 11405 - class175.method3439(0.6D); - } - } - - if (var3 == 3) { // L: 11407 - if (var2 == 0) { // L: 11408 - Tiles.method2040(255); - } - - if (var2 == 1) { // L: 11409 - Tiles.method2040(192); - } - - if (var2 == 2) { // L: 11410 - Tiles.method2040(128); - } - - if (var2 == 3) { // L: 11411 - Tiles.method2040(64); - } - - if (var2 == 4) { // L: 11412 - Tiles.method2040(0); - } - } - - if (var3 == 4) { // L: 11414 - if (var2 == 0) { // L: 11415 - class28.method424(127); - } - - if (var2 == 1) { // L: 11416 - class28.method424(96); - } - - if (var2 == 2) { // L: 11417 - class28.method424(64); - } - - if (var2 == 3) { // L: 11418 - class28.method424(32); - } - - if (var2 == 4) { // L: 11419 - class28.method424(0); - } - } - - if (var3 == 5) { // L: 11421 - Client.leftClickOpensMenu = var2; - } - - if (var3 == 6) { // L: 11422 - Client.chatEffects = var2; - } - - if (var3 == 9) { // L: 11423 - Client.field655 = var2; - } - - if (var3 == 10) { // L: 11424 - if (var2 == 0) { // L: 11425 - class21.method334(127); - } - - if (var2 == 1) { // L: 11426 - class21.method334(96); - } - - if (var2 == 2) { // L: 11427 - class21.method334(64); - } - - if (var2 == 3) { // L: 11428 - class21.method334(32); - } - - if (var2 == 4) { // L: 11429 - class21.method334(0); - } - } - - if (var3 == 17) { // L: 11431 - Client.followerIndex = var2 & 65535; // L: 11432 - } - - if (var3 == 18) { // L: 11434 - Client.playerAttackOption = (AttackOption)ChatChannel.findEnumerated(SoundSystem.method789(), var2); // L: 11435 - if (Client.playerAttackOption == null) { // L: 11436 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var3 == 19) { // L: 11438 - if (var2 == -1) { // L: 11439 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 11440 - } - } - - if (var3 == 22) { // L: 11442 - Client.npcAttackOption = (AttackOption)ChatChannel.findEnumerated(SoundSystem.method789(), var2); // L: 11443 - if (Client.npcAttackOption == null) { // L: 11444 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IZIB)V", + garbageValue = "2" + ) + public static final void method2082(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { // L: 45 + PcmPlayer.field268 = var0; // L: 46 + PcmPlayer.PcmPlayer_stereo = var1; // L: 47 + PcmPlayer.field295 = var2; // L: 48 + } else { + throw new IllegalArgumentException(); } - } // L: 11446 + } // L: 49 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 5f8f301470..5af61f3480 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("q") public class class8 { @ObfuscatedName("v") - final int field33; - @ObfuscatedName("o") - final int field32; - @ObfuscatedName("h") - final String field31; + final int field23; + @ObfuscatedName("c") + final int field24; + @ObfuscatedName("i") + final String field25; @ObfuscatedSignature( - descriptor = "(Lpd;)V" + descriptor = "(Lpi;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 } // L: 20 class8(int var1, int var2, String var3) { - this.field33 = var1; // L: 13 - this.field32 = var2; // L: 14 - this.field31 = var3; // L: 15 + this.field23 = var1; // L: 13 + this.field24 = var2; // L: 14 + this.field25 = var3; // L: 15 } // L: 16 @ObfuscatedName("v") - String method56() { - return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field31; // L: 23 + String method61() { + return Integer.toHexString(this.field23) + Integer.toHexString(this.field24) + this.field25; // L: 23 } - @ObfuscatedName("o") - int method57() { - return this.field32; // L: 27 + @ObfuscatedName("c") + int method56() { + return this.field24; // L: 27 } } diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java index 606b9b17f6..38bf79c2a3 100644 --- a/runescape-client/src/main/java/class82.java +++ b/runescape-client/src/main/java/class82.java @@ -3,82 +3,122 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cv") public enum class82 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcv;" ) - field1072(0, -1), - @ObfuscatedName("o") + field1055(0, -1), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcv;" ) - field1064(1, 1), - @ObfuscatedName("h") + field1053(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcv;" ) - field1065(2, 7), - @ObfuscatedName("g") + field1059(2, 7), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcv;" ) - field1069(3, 8), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lcn;" - ) - field1067(4, 9); - - @ObfuscatedName("rf") - static boolean field1070; + field1057(3, 8), @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -265282023 + @ObfuscatedSignature( + descriptor = "Lcv;" ) - static int field1071; + field1056(4, 9); + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 282017633 + intValue = -1351015755 ) - final int field1068; - @ObfuscatedName("d") + final int field1054; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1123667359 + intValue = -520596277 ) - final int field1063; + final int field1058; class82(int var3, int var4) { - this.field1068 = var3; // L: 20 - this.field1063 = var4; // L: 21 - } // L: 22 + this.field1054 = var3; + this.field1058 = var4; + } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1063; // L: 26 + return this.field1058; } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-71" - ) - public static void method2122() { - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 556 - } // L: 557 + @ObfuscatedName("v") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 + if (var0 % 37L == 0L) { // L: 17 + return null; + } else { + int var2 = 0; // L: 18 - @ObfuscatedName("lj") + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22 + ++var2; // L: 21 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 24 25 34 + long var6 = var0; // L: 26 + var0 /= 37L; // L: 27 + var8 = class349.base37Table[(int)(var6 - var0 * 37L)]; // L: 28 + if (var8 == '_') { // L: 29 + int var9 = var5.length() - 1; // L: 30 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31 + var8 = 160; // L: 32 + } + } + + var5.reverse(); // L: 36 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37 + return var5.toString(); // L: 38 + } + } else { + return null; + } + } + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-68" + descriptor = "(B)[Ljq;", + garbageValue = "0" ) - static void method2123(int var0) { - Client.oculusOrbState = var0; // L: 11902 - } // L: 11903 + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field3033, ServerPacket.field3053, ServerPacket.field3096, ServerPacket.field3026, ServerPacket.field3038, ServerPacket.field3028, ServerPacket.field3025, ServerPacket.field3030, ServerPacket.field3031, ServerPacket.field3027, ServerPacket.field3072, ServerPacket.field3116, ServerPacket.field3035, ServerPacket.field3036, ServerPacket.field3037, ServerPacket.field3128, ServerPacket.field3114, ServerPacket.field3111, ServerPacket.field3041, ServerPacket.field3042, ServerPacket.field3097, ServerPacket.field3044, ServerPacket.field3086, ServerPacket.field3047, ServerPacket.field3119, ServerPacket.field3048, ServerPacket.field3049, ServerPacket.field3050, ServerPacket.field3034, ServerPacket.field3052, ServerPacket.field3029, ServerPacket.field3023, ServerPacket.field3024, ServerPacket.field3056, ServerPacket.field3057, ServerPacket.field3058, ServerPacket.field3045, ServerPacket.field3060, ServerPacket.field3054, ServerPacket.field3062, ServerPacket.field3063, ServerPacket.field3064, ServerPacket.field3101, ServerPacket.field3066, ServerPacket.field3067, ServerPacket.field3068, ServerPacket.field3105, ServerPacket.field3070, ServerPacket.field3071, ServerPacket.field3120, ServerPacket.field3073, ServerPacket.field3079, ServerPacket.field3043, ServerPacket.field3076, ServerPacket.field3077, ServerPacket.field3078, ServerPacket.field3069, ServerPacket.field3080, ServerPacket.field3081, ServerPacket.field3115, ServerPacket.field3083, ServerPacket.field3084, ServerPacket.field3085, ServerPacket.field3061, ServerPacket.field3087, ServerPacket.field3046, ServerPacket.field3089, ServerPacket.field3090, ServerPacket.field3091, ServerPacket.field3092, ServerPacket.field3093, ServerPacket.field3094, ServerPacket.field3051, ServerPacket.field3095, ServerPacket.field3032, ServerPacket.field3040, ServerPacket.field3099, ServerPacket.field3100, ServerPacket.field3074, ServerPacket.field3102, ServerPacket.field3088, ServerPacket.field3103, ServerPacket.field3075, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3109, ServerPacket.field3110, ServerPacket.field3055, ServerPacket.field3112, ServerPacket.field3113, ServerPacket.field3039, ServerPacket.field3059, ServerPacket.field3104, ServerPacket.field3117, ServerPacket.field3118, ServerPacket.field3082, ServerPacket.field3098, ServerPacket.field3121, ServerPacket.field3122, ServerPacket.field3123, ServerPacket.field3124, ServerPacket.field3125, ServerPacket.field3126}; // L: 113 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "54" + ) + public static int method2102(int var0, int var1) { + int var2 = var0 >>> 31; // L: 85 + return (var0 + var2) / var1 - var2; // L: 86 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "542795153" + ) + public static final void method2104() { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 75 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 76 + } // L: 77 } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 1e6817cc38..1060b47626 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -3,119 +3,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cs") public enum class83 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcs;" ) - field1081(0, -1), - @ObfuscatedName("o") + field1064(0, -1), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcs;" ) - field1074(1, 2), - @ObfuscatedName("h") + field1066(1, 2), + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcs;" ) - field1075(2, 3), - @ObfuscatedName("g") + field1062(2, 3), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcs;" ) - field1076(3, 4), - @ObfuscatedName("l") + field1061(3, 4), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcs;" ) - field1077(4, 5), + field1067(4, 5), @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Lcs;" ) - field1078(5, 6); + field1065(5, 6); - @ObfuscatedName("rl") + @ObfuscatedName("uk") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Llu;" ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("d") + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1515440803 + intValue = -106805987 ) - final int field1079; - @ObfuscatedName("f") + final int field1060; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 79198917 + intValue = -672454085 ) - final int field1073; + final int field1063; class83(int var3, int var4) { - this.field1079 = var3; - this.field1073 = var4; + this.field1060 = var3; // L: 21 + this.field1063 = var4; // L: 22 } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1073; // L: 27 + return this.field1063; // L: 26 } - @ObfuscatedName("o") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lpy;II)V", - garbageValue = "-2074244777" + descriptor = "(ILky;IIIII[FI)Lky;", + garbageValue = "-511868196" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; // L: 71 - Players.Players_pendingUpdateCount = 0; // L: 72 - UserComparator8.method2575(var0); // L: 73 - - for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75 - int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76 - Player var5 = Client.players[var4]; // L: 77 - int var6 = var0.readUnsignedByte(); // L: 78 - if ((var6 & 64) != 0) { // L: 79 - var6 += var0.readUnsignedByte() << 8; - } - - HealthBarUpdate.method2213(var0, var4, var5, var6); // L: 80 - } - - if (var0.offset - var2 != var1) { // L: 83 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 84 - } - } // L: 86 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)Lqv;", - garbageValue = "-122" - ) - public static PrivateChatMode method2124(int var0) { - PrivateChatMode[] var1 = Canvas.method389(); // L: 20 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 - PrivateChatMode var3 = var1[var2]; // L: 22 - if (var0 == var3.field4737) { - return var3; // L: 24 - } - } - - return null; // L: 28 + static Widget method2111(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { + Widget var8 = new Widget(); // L: 890 + var8.type = var0; // L: 891 + var8.parentId = var1.id; // L: 892 + var8.childIndex = var2; // L: 893 + var8.isIf3 = true; // L: 894 + var8.xAlignment = var3; // L: 895 + var8.yAlignment = var4; // L: 896 + var8.widthAlignment = var5; // L: 897 + var8.heightAlignment = var6; // L: 898 + var8.rawX = (int)(var7[0] * (float)var1.width); // L: 899 + var8.rawY = (int)(var7[1] * (float)var1.height); // L: 900 + var8.rawWidth = (int)(var7[2] * (float)var1.width); // L: 901 + var8.rawHeight = (int)((float)var1.height * var7[3]); // L: 902 + return var8; // L: 903 } } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 8e3490f8de..1444db218d 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -3,344 +3,913 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("o") public class class9 implements MouseWheel { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Lo;" ) - static final class9 field43; - @ObfuscatedName("o") + static final class9 field28; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Lo;" ) - public static final class9 field44; - @ObfuscatedName("h") + public static final class9 field37; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lr;" - ) - static final class9 field37; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lr;" - ) - static final class9 field36; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Lo;" ) static final class9 field38; - @ObfuscatedName("bt") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lo;" + ) + static final class9 field29; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lo;" + ) + static final class9 field30; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1883426091 + intValue = -1242087125 ) static int field35; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = 1206861129 - ) - static int field34; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1164332207 + intValue = 1758617613 ) - int field39; - @ObfuscatedName("d") - String field40; - @ObfuscatedName("f") - boolean field41; - @ObfuscatedName("u") - boolean field42; + int field31; + @ObfuscatedName("s") + String field32; + @ObfuscatedName("l") + boolean field27; + @ObfuscatedName("q") + boolean field34; static { - field43 = new class9(0, "POST", true, true); // L: 6 - field44 = new class9(1, "GET", true, false); // L: 7 - field37 = new class9(2, "PUT", false, true); // L: 8 - field36 = new class9(3, "PATCH", false, true); // L: 9 - field38 = new class9(4, "DELETE", false, true); // L: 10 + field28 = new class9(0, "POST", true, true); // L: 6 + field37 = new class9(1, "GET", true, false); // L: 7 + field38 = new class9(2, "PUT", false, true); // L: 8 + field29 = new class9(3, "PATCH", false, true); // L: 9 + field30 = new class9(4, "DELETE", false, true); // L: 10 } class9(int var1, String var2, boolean var3, boolean var4) { - this.field39 = var1; // L: 17 - this.field40 = var2; // L: 18 - this.field41 = var3; // L: 19 - this.field42 = var4; // L: 20 + this.field31 = var1; // L: 17 + this.field32 = var2; // L: 18 + this.field27 = var3; // L: 19 + this.field34 = var4; // L: 20 } // L: 21 @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-101" - ) - boolean method65() { - return this.field41; // L: 24 - } - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "15" + garbageValue = "16" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field39; // L: 37 + return this.field31; // L: 36 } - @ObfuscatedName("h") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "5017" + ) + boolean method63() { + return this.field27; // L: 24 + } + + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-259330959" + garbageValue = "1928506926" ) - String method73() { - return this.field40; // L: 28 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "112" - ) - boolean method67() { - return this.field42; // L: 32 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lfj;", - garbageValue = "-2110640851" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 - if (var1 != null) { // L: 63 - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 - var1 = new NPCComposition(); // L: 65 - var1.id = var0; // L: 66 - if (var2 != null) { // L: 67 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 68 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 - return var1; // L: 70 - } + String method62() { + return this.field32; // L: 28 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpy;II)Z", - garbageValue = "-1970074857" + descriptor = "(I)Z", + garbageValue = "905166088" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 378 - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { // L: 379 - if (var0.readBits(1) != 0) { // L: 380 - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); // L: 381 - var4 = var0.readBits(13); // L: 382 - boolean var12 = var0.readBits(1) == 1; // L: 383 - if (var12) { // L: 384 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { // L: 385 - throw new RuntimeException(); // L: 386 - } else { - Player var11 = Client.players[var1] = new Player(); // L: 388 - var11.index = var1; // L: 389 - if (Players.field1289[var1] != null) { // L: 390 - var11.read(Players.field1289[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; // L: 391 - var11.targetIndex = Players.Players_targetIndices[var1]; // L: 392 - var7 = Players.Players_regions[var1]; // L: 393 - var8 = var7 >> 28; // L: 394 - var9 = var7 >> 14 & 255; // L: 395 - var10 = var7 & 255; // L: 396 - var11.pathTraversed[0] = Players.field1285[var1]; // L: 397 - var11.plane = (byte)var8; // L: 398 - var11.resetPath((var9 << 13) + var3 - ApproximateRouteStrategy.baseX, (var10 << 13) + var4 - class250.baseY); // L: 399 - var11.field1109 = false; // L: 400 - return true; // L: 401 - } - } else if (var2 == 1) { // L: 403 - var3 = var0.readBits(2); // L: 404 - var4 = Players.Players_regions[var1]; // L: 405 - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 406 - return false; // L: 407 - } else { - int var5; - int var6; - if (var2 == 2) { // L: 409 - var3 = var0.readBits(5); // L: 410 - var4 = var3 >> 3; // L: 411 - var5 = var3 & 7; // L: 412 - var6 = Players.Players_regions[var1]; // L: 413 - var7 = (var6 >> 28) + var4 & 3; // L: 414 - var8 = var6 >> 14 & 255; // L: 415 - var9 = var6 & 255; // L: 416 - if (var5 == 0) { // L: 417 - --var8; // L: 418 - --var9; // L: 419 - } - - if (var5 == 1) { // L: 421 - --var9; - } - - if (var5 == 2) { // L: 422 - ++var8; // L: 423 - --var9; // L: 424 - } - - if (var5 == 3) { // L: 426 - --var8; - } - - if (var5 == 4) { // L: 427 - ++var8; - } - - if (var5 == 5) { // L: 428 - --var8; // L: 429 - ++var9; // L: 430 - } - - if (var5 == 6) { // L: 432 - ++var9; - } - - if (var5 == 7) { // L: 433 - ++var8; // L: 434 - ++var9; // L: 435 - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 437 - return false; // L: 438 - } else { - var3 = var0.readBits(18); // L: 440 - var4 = var3 >> 16; // L: 441 - var5 = var3 >> 8 & 255; // L: 442 - var6 = var3 & 255; // L: 443 - var7 = Players.Players_regions[var1]; // L: 444 - var8 = (var7 >> 28) + var4 & 3; // L: 445 - var9 = var5 + (var7 >> 14) & 255; // L: 446 - var10 = var7 + var6 & 255; // L: 447 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 448 - return false; // L: 449 - } - } + boolean method66() { + return this.field34; // L: 32 } - @ObfuscatedName("fq") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-118" + descriptor = "(ZZI)Lqq;", + garbageValue = "1901588068" ) - static final void method64() { - if (Client.logoutTimer > 0) { // L: 2649 - GameObject.logOut(); // L: 2650 + static IndexedSprite method73(boolean var0, boolean var1) { + return var0 ? (var1 ? ParamComposition.field1983 : class54.options_buttons_2Sprite) : (var1 ? class93.field1254 : WorldMapSection2.options_buttons_0Sprite); // L: 236 + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1522440534" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { // L: 8803 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 8804 + Client.mouseCrossX = var6; // L: 9123 + Client.mouseCrossY = var7; // L: 9124 + Client.mouseCrossColor = 2; // L: 9125 + Client.mouseCrossState = 0; // L: 9126 + Client.destinationX = var0; // L: 9127 + Client.destinationY = var1; // L: 9128 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 9130 + var8.packetBuffer.method7710(class432.selectedItemSlot); // L: 9131 + var8.packetBuffer.method7710(Varcs.selectedItemId); // L: 9132 + var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9133 + var8.packetBuffer.writeShort(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9134 + var8.packetBuffer.writeShort(var3); // L: 9135 + var8.packetBuffer.method7723(TaskHandler.selectedItemWidget); // L: 9136 + var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 9137 + Client.packetWriter.addNode(var8); // L: 9138 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 9053 + Client.mouseCrossY = var7; // L: 9054 + Client.mouseCrossColor = 2; // L: 9055 + Client.mouseCrossState = 0; // L: 9056 + Client.destinationX = var0; // L: 9057 + Client.destinationY = var1; // L: 9058 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 9059 + var8.packetBuffer.method7711(Client.selectedSpellItemId); // L: 9060 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9061 + var8.packetBuffer.method7712(VarcInt.baseY + var1); // L: 9062 + var8.packetBuffer.method7711(Client.selectedSpellChildIndex); // L: 9063 + var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9064 + var8.packetBuffer.method7723(Timer.selectedSpellWidget); // L: 9065 + var8.packetBuffer.method7710(var3); // L: 9066 + Client.packetWriter.addNode(var8); // L: 9067 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 9573 + Client.mouseCrossY = var7; // L: 9574 + Client.mouseCrossColor = 2; // L: 9575 + Client.mouseCrossState = 0; // L: 9576 + Client.destinationX = var0; // L: 9577 + Client.destinationY = var1; // L: 9578 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2914, Client.packetWriter.isaacCipher); // L: 9580 + var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 9581 + var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9582 + var8.packetBuffer.writeShort(var3); // L: 9583 + var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9584 + Client.packetWriter.addNode(var8); // L: 9585 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 9189 + Client.mouseCrossY = var7; // L: 9190 + Client.mouseCrossColor = 2; // L: 9191 + Client.mouseCrossState = 0; // L: 9192 + Client.destinationX = var0; // L: 9193 + Client.destinationY = var1; // L: 9194 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 9196 + var8.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9197 + var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9198 + var8.packetBuffer.method7712(var3); // L: 9199 + var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9200 + Client.packetWriter.addNode(var8); // L: 9201 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8870 + Client.mouseCrossY = var7; // L: 8871 + Client.mouseCrossColor = 2; // L: 8872 + Client.mouseCrossState = 0; // L: 8873 + Client.destinationX = var0; // L: 8874 + Client.destinationY = var1; // L: 8875 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2927, Client.packetWriter.isaacCipher); // L: 8877 + var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8878 + var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8879 + var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 8880 + var8.packetBuffer.method7711(var3); // L: 8881 + Client.packetWriter.addNode(var8); // L: 8882 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8844 + Client.mouseCrossY = var7; // L: 8845 + Client.mouseCrossColor = 2; // L: 8846 + Client.mouseCrossState = 0; // L: 8847 + Client.destinationX = var0; // L: 8848 + Client.destinationY = var1; // L: 8849 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 8851 + var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8852 + var8.packetBuffer.method7712(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8853 + var8.packetBuffer.method7711(var3); // L: 8854 + var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 8855 + Client.packetWriter.addNode(var8); // L: 8856 } else { - Client.timer.method6595(); // L: 2653 - InterfaceParent.updateGameState(40); // L: 2654 - BuddyRankComparator.field1378 = Client.packetWriter.getSocket(); // L: 2655 - Client.packetWriter.removeSocket(); // L: 2656 - } - } // L: 2651 2657 - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1705130221" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3453 - Interpreter.clientPreferences.method2254(!Interpreter.clientPreferences.method2255()); // L: 3454 - if (Interpreter.clientPreferences.method2255()) { // L: 3455 - Login.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3456 + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 9034 + if (var13 != null) { // L: 9035 + Client.mouseCrossX = var6; // L: 9036 + Client.mouseCrossY = var7; // L: 9037 + Client.mouseCrossColor = 2; // L: 9038 + Client.mouseCrossState = 0; // L: 9039 + Client.destinationX = var0; // L: 9040 + Client.destinationY = var1; // L: 9041 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9043 + var9.packetBuffer.method7710(var3); // L: 9044 + var9.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 9045 + var9.packetBuffer.method7712(Varcs.selectedItemId); // L: 9046 + var9.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9047 + var9.packetBuffer.method7711(class432.selectedItemSlot); // L: 9048 + Client.packetWriter.addNode(var9); // L: 9049 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 9165 + if (var13 != null) { // L: 9166 + Client.mouseCrossX = var6; // L: 9167 + Client.mouseCrossY = var7; // L: 9168 + Client.mouseCrossColor = 2; // L: 9169 + Client.mouseCrossState = 0; // L: 9170 + Client.destinationX = var0; // L: 9171 + Client.destinationY = var1; // L: 9172 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 9173 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9174 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9175 + var9.packetBuffer.method7710(var3); // L: 9176 + var9.packetBuffer.method7721(Timer.selectedSpellWidget); // L: 9177 + var9.packetBuffer.method7711(Client.selectedSpellItemId); // L: 9178 + Client.packetWriter.addNode(var9); // L: 9179 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 9332 + if (var13 != null) { // L: 9333 + Client.mouseCrossX = var6; // L: 9334 + Client.mouseCrossY = var7; // L: 9335 + Client.mouseCrossColor = 2; // L: 9336 + Client.mouseCrossState = 0; // L: 9337 + Client.destinationX = var0; // L: 9338 + Client.destinationY = var1; // L: 9339 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2981, Client.packetWriter.isaacCipher); // L: 9341 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9342 + var9.packetBuffer.method7710(var3); // L: 9343 + Client.packetWriter.addNode(var9); // L: 9344 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8950 + if (var13 != null) { // L: 8951 + Client.mouseCrossX = var6; // L: 8952 + Client.mouseCrossY = var7; // L: 8953 + Client.mouseCrossColor = 2; // L: 8954 + Client.mouseCrossState = 0; // L: 8955 + Client.destinationX = var0; // L: 8956 + Client.destinationY = var1; // L: 8957 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 8959 + var9.packetBuffer.writeShort(var3); // L: 8960 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8961 + Client.packetWriter.addNode(var9); // L: 8962 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 9070 + if (var13 != null) { // L: 9071 + Client.mouseCrossX = var6; // L: 9072 + Client.mouseCrossY = var7; // L: 9073 + Client.mouseCrossColor = 2; // L: 9074 + Client.mouseCrossState = 0; // L: 9075 + Client.destinationX = var0; // L: 9076 + Client.destinationY = var1; // L: 9077 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 9079 + var9.packetBuffer.method7710(var3); // L: 9080 + var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9081 + Client.packetWriter.addNode(var9); // L: 9082 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8991 + if (var13 != null) { // L: 8992 + Client.mouseCrossX = var6; // L: 8993 + Client.mouseCrossY = var7; // L: 8994 + Client.mouseCrossColor = 2; // L: 8995 + Client.mouseCrossState = 0; // L: 8996 + Client.destinationX = var0; // L: 8997 + Client.destinationY = var1; // L: 8998 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2940, Client.packetWriter.isaacCipher); // L: 9000 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9001 + var9.packetBuffer.method7710(var3); // L: 9002 + Client.packetWriter.addNode(var9); // L: 9003 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 9494 + if (var13 != null) { // L: 9495 + Client.mouseCrossX = var6; // L: 9496 + Client.mouseCrossY = var7; // L: 9497 + Client.mouseCrossColor = 2; // L: 9498 + Client.mouseCrossState = 0; // L: 9499 + Client.destinationX = var0; // L: 9500 + Client.destinationY = var1; // L: 9501 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2924, Client.packetWriter.isaacCipher); // L: 9503 + var9.packetBuffer.method7710(var3); // L: 9504 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9505 + Client.packetWriter.addNode(var9); // L: 9506 + } } else { - Login.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3459 + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 9442 + if (var15 != null) { // L: 9443 + Client.mouseCrossX = var6; // L: 9444 + Client.mouseCrossY = var7; // L: 9445 + Client.mouseCrossColor = 2; // L: 9446 + Client.mouseCrossState = 0; // L: 9447 + Client.destinationX = var0; // L: 9448 + Client.destinationY = var1; // L: 9449 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2956, Client.packetWriter.isaacCipher); // L: 9451 + var9.packetBuffer.method7712(Varcs.selectedItemId); // L: 9452 + var9.packetBuffer.writeShort(var3); // L: 9453 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9454 + var9.packetBuffer.method7711(class432.selectedItemSlot); // L: 9455 + var9.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 9456 + Client.packetWriter.addNode(var9); // L: 9457 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 9541 + if (var15 != null) { // L: 9542 + Client.mouseCrossX = var6; // L: 9543 + Client.mouseCrossY = var7; // L: 9544 + Client.mouseCrossColor = 2; // L: 9545 + Client.mouseCrossState = 0; // L: 9546 + Client.destinationX = var0; // L: 9547 + Client.destinationY = var1; // L: 9548 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 9549 + var9.packetBuffer.method7710(Client.selectedSpellChildIndex); // L: 9550 + var9.packetBuffer.method7711(var3); // L: 9551 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9552 + var9.packetBuffer.writeInt(Timer.selectedSpellWidget); // L: 9553 + var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9554 + Client.packetWriter.addNode(var9); // L: 9555 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8805 + Client.mouseCrossY = var7; // L: 8806 + Client.mouseCrossColor = 2; // L: 8807 + Client.mouseCrossState = 0; // L: 8808 + Client.destinationX = var0; // L: 8809 + Client.destinationY = var1; // L: 8810 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2955, Client.packetWriter.isaacCipher); // L: 8812 + var8.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8813 + var8.packetBuffer.method7711(class432.selectedItemSlot); // L: 8814 + var8.packetBuffer.method7711(var3); // L: 8815 + var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8816 + var8.packetBuffer.method7712(VarcInt.baseY + var1); // L: 8817 + var8.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 8818 + var8.packetBuffer.writeShort(Varcs.selectedItemId); // L: 8819 + Client.packetWriter.addNode(var8); // L: 8820 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8885 + Client.mouseCrossY = var7; // L: 8886 + Client.mouseCrossColor = 2; // L: 8887 + Client.mouseCrossState = 0; // L: 8888 + Client.destinationX = var0; // L: 8889 + Client.destinationY = var1; // L: 8890 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 8891 + var8.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 8892 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8893 + var8.packetBuffer.method7710(var3); // L: 8894 + var8.packetBuffer.writeInt(Timer.selectedSpellWidget); // L: 8895 + var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 8896 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8897 + var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8898 + Client.packetWriter.addNode(var8); // L: 8899 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 9348 + Client.mouseCrossY = var7; // L: 9349 + Client.mouseCrossColor = 2; // L: 9350 + Client.mouseCrossState = 0; // L: 9351 + Client.destinationX = var0; // L: 9352 + Client.destinationY = var1; // L: 9353 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2933, Client.packetWriter.isaacCipher); // L: 9355 + var8.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9356 + var8.packetBuffer.method7712(var3); // L: 9357 + var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9358 + var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9359 + Client.packetWriter.addNode(var8); // L: 9360 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 9379 + Client.mouseCrossY = var7; // L: 9380 + Client.mouseCrossColor = 2; // L: 9381 + Client.mouseCrossState = 0; // L: 9382 + Client.destinationX = var0; // L: 9383 + Client.destinationY = var1; // L: 9384 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2915, Client.packetWriter.isaacCipher); // L: 9386 + var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9387 + var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9388 + var8.packetBuffer.writeShort(var3); // L: 9389 + var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9390 + Client.packetWriter.addNode(var8); // L: 9391 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8919 + Client.mouseCrossY = var7; // L: 8920 + Client.mouseCrossColor = 2; // L: 8921 + Client.mouseCrossState = 0; // L: 8922 + Client.destinationX = var0; // L: 8923 + Client.destinationY = var1; // L: 8924 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2951, Client.packetWriter.isaacCipher); // L: 8926 + var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8927 + var8.packetBuffer.writeShort(var3); // L: 8928 + var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8929 + var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 8930 + Client.packetWriter.addNode(var8); // L: 8931 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 9526 + Client.mouseCrossY = var7; // L: 9527 + Client.mouseCrossColor = 2; // L: 9528 + Client.mouseCrossState = 0; // L: 9529 + Client.destinationX = var0; // L: 9530 + Client.destinationY = var1; // L: 9531 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2942, Client.packetWriter.isaacCipher); // L: 9533 + var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9534 + var8.packetBuffer.writeShort(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9535 + var8.packetBuffer.method7712(VarcInt.baseY + var1); // L: 9536 + var8.packetBuffer.method7712(var3); // L: 9537 + Client.packetWriter.addNode(var8); // L: 9538 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 9229 + Client.mouseCrossY = var7; // L: 9230 + Client.mouseCrossColor = 2; // L: 9231 + Client.mouseCrossState = 0; // L: 9232 + Client.destinationX = var0; // L: 9233 + Client.destinationY = var1; // L: 9234 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2920, Client.packetWriter.isaacCipher); // L: 9236 + var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9237 + var8.packetBuffer.method7712(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9238 + var8.packetBuffer.method7710(VarcInt.baseY + var1); // L: 9239 + var8.packetBuffer.writeShort(var3); // L: 9240 + Client.packetWriter.addNode(var8); // L: 9241 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8823 + ArchiveLoader.scene.setViewportWalking(); // L: 8824 + } else { + ArchiveLoader.scene.menuOpen(class18.Client_plane, var0, var1, true); // L: 8827 + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = class127.getWidget(var1); // L: 8966 + if (var16 != null) { // L: 8967 + boolean var11 = true; // L: 8968 + if (var16.contentType > 0) { // L: 8969 + var11 = ModeWhere.method6100(var16); + } + + if (var11) { // L: 8970 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 8972 + var10.packetBuffer.writeInt(var1); // L: 8973 + Client.packetWriter.addNode(var10); // L: 8974 + } + } + } else { + if (var2 == 25) { + var16 = ItemComposition.getWidgetChild(var1, var0); // L: 8831 + if (var16 != null) { // L: 8832 + FriendSystem.Widget_runOnTargetLeave(); // L: 8833 + Renderable.selectSpell(var1, var0, WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var16)), var16.itemId); // L: 8834 + Client.isItemSelected = 0; // L: 8835 + Client.selectedSpellActionName = class152.Widget_getSpellActionName(var16); // L: 8836 + if (Client.selectedSpellActionName == null) { // L: 8837 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8838 + Client.selectedSpellName = var16.dataText + UserComparator9.colorStartTag(16777215); + } else { + Client.selectedSpellName = UserComparator9.colorStartTag(65280) + var16.spellName + UserComparator9.colorStartTag(16777215); // L: 8839 + } + } + + return; // L: 8841 + } + + if (var2 == 26) { + class20.method294(); // L: 9020 + } else { + int var12; + Widget var14; + if (var2 == 28) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 9205 + var8.packetBuffer.writeInt(var1); // L: 9206 + Client.packetWriter.addNode(var8); // L: 9207 + var14 = class127.getWidget(var1); // L: 9208 + if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9209 + var12 = var14.cs1Instructions[0][1]; // L: 9210 + Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; // L: 9211 + WorldMapLabel.changeGameOptions(var12); // L: 9212 + } + } else if (var2 == 29) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 9560 + var8.packetBuffer.writeInt(var1); // L: 9561 + Client.packetWriter.addNode(var8); // L: 9562 + var14 = class127.getWidget(var1); // L: 9563 + if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9564 + var12 = var14.cs1Instructions[0][1]; // L: 9565 + if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { // L: 9566 + Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; // L: 9567 + WorldMapLabel.changeGameOptions(var12); // L: 9568 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 9394 + class268.resumePauseWidget(var1, var0); // L: 9395 + Client.meslayerContinueWidget = ItemComposition.getWidgetChild(var1, var0); // L: 9396 + class346.invalidateWidget(Client.meslayerContinueWidget); // L: 9397 + } + } else if (var2 == 31) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 9319 + var8.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 9320 + var8.packetBuffer.method7710(class432.selectedItemSlot); // L: 9321 + var8.packetBuffer.method7721(var1); // L: 9322 + var8.packetBuffer.writeShort(var3); // L: 9323 + var8.packetBuffer.writeShort(var0); // L: 9324 + var8.packetBuffer.method7710(Varcs.selectedItemId); // L: 9325 + Client.packetWriter.addNode(var8); // L: 9326 + Client.field610 = 0; // L: 9327 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9328 + Client.field611 = var0; // L: 9329 + } else if (var2 == 32) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2959, Client.packetWriter.isaacCipher); // L: 9153 + var8.packetBuffer.method7711(var3); // L: 9154 + var8.packetBuffer.writeIntME(Timer.selectedSpellWidget); // L: 9155 + var8.packetBuffer.method7711(var0); // L: 9156 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9157 + var8.packetBuffer.writeInt(var1); // L: 9158 + Client.packetWriter.addNode(var8); // L: 9159 + Client.field610 = 0; // L: 9160 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9161 + Client.field611 = var0; // L: 9162 + } else if (var2 == 33) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 9260 + var8.packetBuffer.writeShort(var3); // L: 9261 + var8.packetBuffer.writeShort(var0); // L: 9262 + var8.packetBuffer.method7721(var1); // L: 9263 + Client.packetWriter.addNode(var8); // L: 9264 + Client.field610 = 0; // L: 9265 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9266 + Client.field611 = var0; // L: 9267 + } else if (var2 == 34) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9589 + var8.packetBuffer.method7721(var1); // L: 9590 + var8.packetBuffer.writeShort(var0); // L: 9591 + var8.packetBuffer.writeShort(var3); // L: 9592 + Client.packetWriter.addNode(var8); // L: 9593 + Client.field610 = 0; // L: 9594 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9595 + Client.field611 = var0; // L: 9596 + } else if (var2 == 35) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 9462 + var8.packetBuffer.writeShort(var3); // L: 9463 + var8.packetBuffer.writeShort(var0); // L: 9464 + var8.packetBuffer.method7721(var1); // L: 9465 + Client.packetWriter.addNode(var8); // L: 9466 + Client.field610 = 0; // L: 9467 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9468 + Client.field611 = var0; // L: 9469 + } else if (var2 == 36) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 9113 + var8.packetBuffer.method7710(var3); // L: 9114 + var8.packetBuffer.method7721(var1); // L: 9115 + var8.packetBuffer.method7712(var0); // L: 9116 + Client.packetWriter.addNode(var8); // L: 9117 + Client.field610 = 0; // L: 9118 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9119 + Client.field611 = var0; // L: 9120 + } else if (var2 == 37) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 8860 + var8.packetBuffer.writeIntME(var1); // L: 8861 + var8.packetBuffer.writeShort(var3); // L: 8862 + var8.packetBuffer.method7712(var0); // L: 8863 + Client.packetWriter.addNode(var8); // L: 8864 + Client.field610 = 0; // L: 8865 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 8866 + Client.field611 = var0; // L: 8867 + } else { + if (var2 == 38) { + FriendSystem.Widget_runOnTargetLeave(); // L: 8979 + var16 = class127.getWidget(var1); // L: 8980 + Client.isItemSelected = 1; // L: 8981 + class432.selectedItemSlot = var0; // L: 8982 + TaskHandler.selectedItemWidget = var1; // L: 8983 + Varcs.selectedItemId = var3; // L: 8984 + class346.invalidateWidget(var16); // L: 8985 + Client.selectedItemName = UserComparator9.colorStartTag(16748608) + class19.ItemDefinition_get(var3).name + UserComparator9.colorStartTag(16777215); // L: 8986 + if (Client.selectedItemName == null) { // L: 8987 + Client.selectedItemName = "null"; + } + + return; // L: 8988 + } + + if (var2 == 39) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2922, Client.packetWriter.isaacCipher); // L: 9024 + var8.packetBuffer.writeInt(var1); // L: 9025 + var8.packetBuffer.method7711(var0); // L: 9026 + var8.packetBuffer.method7710(var3); // L: 9027 + Client.packetWriter.addNode(var8); // L: 9028 + Client.field610 = 0; // L: 9029 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9030 + Client.field611 = var0; // L: 9031 + } else if (var2 == 40) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 9142 + var8.packetBuffer.writeIntME(var1); // L: 9143 + var8.packetBuffer.writeShort(var0); // L: 9144 + var8.packetBuffer.method7711(var3); // L: 9145 + Client.packetWriter.addNode(var8); // L: 9146 + Client.field610 = 0; // L: 9147 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9148 + Client.field611 = var0; // L: 9149 + } else if (var2 == 41) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2921, Client.packetWriter.isaacCipher); // L: 9432 + var8.packetBuffer.method7711(var3); // L: 9433 + var8.packetBuffer.method7721(var1); // L: 9434 + var8.packetBuffer.method7712(var0); // L: 9435 + Client.packetWriter.addNode(var8); // L: 9436 + Client.field610 = 0; // L: 9437 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9438 + Client.field611 = var0; // L: 9439 + } else if (var2 == 42) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); // L: 9484 + var8.packetBuffer.method7712(var0); // L: 9485 + var8.packetBuffer.writeInt(var1); // L: 9486 + var8.packetBuffer.method7710(var3); // L: 9487 + Client.packetWriter.addNode(var8); // L: 9488 + Client.field610 = 0; // L: 9489 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9490 + Client.field611 = var0; // L: 9491 + } else if (var2 == 43) { + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2938, Client.packetWriter.isaacCipher); // L: 9473 + var8.packetBuffer.method7712(var0); // L: 9474 + var8.packetBuffer.method7712(var3); // L: 9475 + var8.packetBuffer.writeInt(var1); // L: 9476 + Client.packetWriter.addNode(var8); // L: 9477 + Client.field610 = 0; // L: 9478 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9479 + Client.field611 = var0; // L: 9480 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 9286 + if (var15 != null) { // L: 9287 + Client.mouseCrossX = var6; // L: 9288 + Client.mouseCrossY = var7; // L: 9289 + Client.mouseCrossColor = 2; // L: 9290 + Client.mouseCrossState = 0; // L: 9291 + Client.destinationX = var0; // L: 9292 + Client.destinationY = var1; // L: 9293 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9295 + var9.packetBuffer.method7710(var3); // L: 9296 + var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9297 + Client.packetWriter.addNode(var9); // L: 9298 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8934 + if (var15 != null) { // L: 8935 + Client.mouseCrossX = var6; // L: 8936 + Client.mouseCrossY = var7; // L: 8937 + Client.mouseCrossColor = 2; // L: 8938 + Client.mouseCrossState = 0; // L: 8939 + Client.destinationX = var0; // L: 8940 + Client.destinationY = var1; // L: 8941 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2957, Client.packetWriter.isaacCipher); // L: 8943 + var9.packetBuffer.method7710(var3); // L: 8944 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8945 + Client.packetWriter.addNode(var9); // L: 8946 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 9086 + if (var15 != null) { // L: 9087 + Client.mouseCrossX = var6; // L: 9088 + Client.mouseCrossY = var7; // L: 9089 + Client.mouseCrossColor = 2; // L: 9090 + Client.mouseCrossState = 0; // L: 9091 + Client.destinationX = var0; // L: 9092 + Client.destinationY = var1; // L: 9093 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2964, Client.packetWriter.isaacCipher); // L: 9095 + var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9096 + var9.packetBuffer.method7711(var3); // L: 9097 + Client.packetWriter.addNode(var9); // L: 9098 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 9510 + if (var15 != null) { // L: 9511 + Client.mouseCrossX = var6; // L: 9512 + Client.mouseCrossY = var7; // L: 9513 + Client.mouseCrossColor = 2; // L: 9514 + Client.mouseCrossState = 0; // L: 9515 + Client.destinationX = var0; // L: 9516 + Client.destinationY = var1; // L: 9517 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 9519 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9520 + var9.packetBuffer.writeShort(var3); // L: 9521 + Client.packetWriter.addNode(var9); // L: 9522 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 9415 + if (var15 != null) { // L: 9416 + Client.mouseCrossX = var6; // L: 9417 + Client.mouseCrossY = var7; // L: 9418 + Client.mouseCrossColor = 2; // L: 9419 + Client.mouseCrossState = 0; // L: 9420 + Client.destinationX = var0; // L: 9421 + Client.destinationY = var1; // L: 9422 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 9424 + var9.packetBuffer.writeShort(var3); // L: 9425 + var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9426 + Client.packetWriter.addNode(var9); // L: 9427 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 9270 + if (var15 != null) { // L: 9271 + Client.mouseCrossX = var6; // L: 9272 + Client.mouseCrossY = var7; // L: 9273 + Client.mouseCrossColor = 2; // L: 9274 + Client.mouseCrossState = 0; // L: 9275 + Client.destinationX = var0; // L: 9276 + Client.destinationY = var1; // L: 9277 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 9279 + var9.packetBuffer.method7712(var3); // L: 9280 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9281 + Client.packetWriter.addNode(var9); // L: 9282 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 9363 + if (var15 != null) { // L: 9364 + Client.mouseCrossX = var6; // L: 9365 + Client.mouseCrossY = var7; // L: 9366 + Client.mouseCrossColor = 2; // L: 9367 + Client.mouseCrossState = 0; // L: 9368 + Client.destinationX = var0; // L: 9369 + Client.destinationY = var1; // L: 9370 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 9372 + var9.packetBuffer.writeShort(var3); // L: 9373 + var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9374 + Client.packetWriter.addNode(var9); // L: 9375 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 9302 + if (var15 != null) { // L: 9303 + Client.mouseCrossX = var6; // L: 9304 + Client.mouseCrossY = var7; // L: 9305 + Client.mouseCrossColor = 2; // L: 9306 + Client.mouseCrossState = 0; // L: 9307 + Client.destinationX = var0; // L: 9308 + Client.destinationY = var1; // L: 9309 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 9311 + var9.packetBuffer.method7712(var3); // L: 9312 + var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9313 + Client.packetWriter.addNode(var9); // L: 9314 + } + } else if (var2 != 1007 && var2 != 57) { + if (var2 == 58) { + var16 = ItemComposition.getWidgetChild(var1, var0); // L: 9401 + if (var16 != null) { // L: 9402 + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2894, Client.packetWriter.isaacCipher); // L: 9404 + var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9405 + var9.packetBuffer.writeIntME(Timer.selectedSpellWidget); // L: 9406 + var9.packetBuffer.method7711(var16.itemId); // L: 9407 + var9.packetBuffer.method7712(Client.selectedSpellChildIndex); // L: 9408 + var9.packetBuffer.writeInt(var1); // L: 9409 + var9.packetBuffer.method7711(var0); // L: 9410 + Client.packetWriter.addNode(var9); // L: 9411 + } + } else if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 9244 + Client.mouseCrossY = var7; // L: 9245 + Client.mouseCrossColor = 2; // L: 9246 + Client.mouseCrossState = 0; // L: 9247 + Client.destinationX = var0; // L: 9248 + Client.destinationY = var1; // L: 9249 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 9251 + var8.packetBuffer.method7710(var3); // L: 9252 + var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9253 + var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9254 + var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9255 + Client.packetWriter.addNode(var8); // L: 9256 + } else if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 9102 + Client.mouseCrossY = var7; // L: 9103 + Client.mouseCrossColor = 2; // L: 9104 + Client.mouseCrossState = 0; // L: 9105 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2949, Client.packetWriter.isaacCipher); // L: 9107 + var8.packetBuffer.method7712(var3); // L: 9108 + Client.packetWriter.addNode(var8); // L: 9109 + } else if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8902 + Client.mouseCrossY = var7; // L: 8903 + Client.mouseCrossColor = 2; // L: 8904 + Client.mouseCrossState = 0; // L: 8905 + var13 = Client.npcs[var3]; // L: 8906 + if (var13 != null) { // L: 8907 + NPCComposition var17 = var13.definition; // L: 8908 + if (var17.transforms != null) { // L: 8909 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8910 + var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 8912 + var10.packetBuffer.method7710(var17.id); // L: 8913 + Client.packetWriter.addNode(var10); // L: 8914 + } + } + } else if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 9219 + Client.mouseCrossY = var7; // L: 9220 + Client.mouseCrossColor = 2; // L: 9221 + Client.mouseCrossState = 0; // L: 9222 + var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 9224 + var8.packetBuffer.method7711(var3); // L: 9225 + Client.packetWriter.addNode(var8); // L: 9226 + } else if (var2 == 1005) { + var16 = class127.getWidget(var1); // L: 9007 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 9008 + Actor.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class19.ItemDefinition_get(var3).name); + } else { + var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 9011 + var9.packetBuffer.method7711(var3); // L: 9012 + Client.packetWriter.addNode(var9); // L: 9013 + } + + Client.field610 = 0; // L: 9015 + GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9016 + Client.field611 = var0; // L: 9017 + } else if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) { + ScriptFrame.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9216 + } + } else { + var16 = ItemComposition.getWidgetChild(var1, var0); // L: 9183 + if (var16 != null) { // L: 9184 + WorldMapLabelSize.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9185 + } + } + } + } + } + } } } - if (var0.equalsIgnoreCase("displayfps")) { // L: 3462 - Interpreter.clientPreferences.method2271(); + if (Client.isItemSelected != 0) { // L: 9598 + Client.isItemSelected = 0; // L: 9599 + class346.invalidateWidget(class127.getWidget(TaskHandler.selectedItemWidget)); // L: 9600 } - if (var0.equalsIgnoreCase("renderself")) { // L: 3463 - Client.renderSelf = !Client.renderSelf; + if (Client.isSpellSelected) { // L: 9602 + FriendSystem.Widget_runOnTargetLeave(); } - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; // L: 3464 + if (GrandExchangeOfferAgeComparator.field4011 != null && Client.field610 == 0) { // L: 9603 + class346.invalidateWidget(GrandExchangeOfferAgeComparator.field4011); } - if (Client.staffModLevel >= 2) { // L: 3465 - if (var0.equalsIgnoreCase("errortest")) { // L: 3466 - throw new RuntimeException(); - } + } // L: 9604 - if (var0.equalsIgnoreCase("showcoord")) { // L: 3467 - ClanChannel.worldMap.showCoord = !ClanChannel.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3468 - Interpreter.clientPreferences.method2265(true); - } - - if (var0.equalsIgnoreCase("fpsoff")) { // L: 3469 - Interpreter.clientPreferences.method2265(false); - } - - if (var0.equalsIgnoreCase("gc")) { // L: 3470 - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3471 - method64(); - } - } - - PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 3474 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3475 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3476 - Client.packetWriter.addNode(var1); // L: 3477 - } // L: 3478 - - @ObfuscatedName("kp") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-117" + descriptor = "(IIIIIIB)V", + garbageValue = "-53" ) - static final void method85() { - PacketBufferNode var0 = ItemContainer.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 11486 - Client.packetWriter.addNode(var0); // L: 11487 - Interpreter.field838 = true; // L: 11488 + static final void method74(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 10698 + int var7 = var3 - var1; // L: 10699 + int var8 = var6 >= 0 ? var6 : -var6; // L: 10700 + int var9 = var7 >= 0 ? var7 : -var7; // L: 10701 + int var10 = var8; // L: 10702 + if (var8 < var9) { // L: 10703 + var10 = var9; + } - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11489 - if (var1.type == 0 || var1.type == 3) { // L: 11490 - class20.closeInterface(var1, true); + if (var10 != 0) { // L: 10704 + int var11 = (var6 << 16) / var10; // L: 10705 + int var12 = (var7 << 16) / var10; // L: 10706 + if (var12 <= var11) { // L: 10707 + var11 = -var11; + } else { + var12 = -var12; // L: 10708 } - } - if (Client.meslayerContinueWidget != null) { // L: 11492 - class290.invalidateWidget(Client.meslayerContinueWidget); // L: 11493 - Client.meslayerContinueWidget = null; // L: 11494 + int var13 = var5 * var12 >> 17; // L: 10709 + int var14 = var5 * var12 + 1 >> 17; // L: 10710 + int var15 = var5 * var11 >> 17; // L: 10711 + int var16 = var5 * var11 + 1 >> 17; // L: 10712 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10713 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10714 + int var17 = var0 + var13; // L: 10715 + int var18 = var0 - var14; // L: 10716 + int var19 = var0 + var6 - var14; // L: 10717 + int var20 = var0 + var13 + var6; // L: 10718 + int var21 = var15 + var1; // L: 10719 + int var22 = var1 - var16; // L: 10720 + int var23 = var7 + var1 - var16; // L: 10721 + int var24 = var7 + var15 + var1; // L: 10722 + Rasterizer3D.method4673(var17, var18, var19); // L: 10723 + Rasterizer3D.method4617(var21, var22, var23, var17, var18, var19, var4); // L: 10724 + Rasterizer3D.method4673(var17, var19, var20); // L: 10725 + Rasterizer3D.method4617(var21, var23, var24, var17, var19, var20, var4); // L: 10726 } - - Interpreter.field838 = false; // L: 11496 - } // L: 11497 + } // L: 10727 } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index b67621e40a..78f0e7a6e3 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -1,75 +1,31 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cr") public class class92 { - @ObfuscatedName("nl") - @ObfuscatedGetter( - intValue = -26736591 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "[Lqq;" ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; - @ObfuscatedName("v") - public static final int method2373(double var0, double var2, double var4) { - double var6 = var4; // L: 9 - double var8 = var4; // L: 10 - double var10 = var4; // L: 11 - if (0.0D != var2) { // L: 12 - double var12; - if (var4 < 0.5D) { // L: 14 - var12 = var4 * (var2 + 1.0D); - } else { - var12 = var4 + var2 - var4 * var2; // L: 15 - } + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "367687944" + ) + static final void method2362() { + int var0 = Players.Players_count; // L: 3908 + int[] var1 = Players.Players_indices; // L: 3909 - double var14 = 2.0D * var4 - var12; // L: 16 - double var16 = 0.3333333333333333D + var0; // L: 17 - if (var16 > 1.0D) { // L: 18 - --var16; - } - - double var20 = var0 - 0.3333333333333333D; // L: 20 - if (var20 < 0.0D) { // L: 21 - ++var20; - } - - if (6.0D * var16 < 1.0D) { // L: 22 - var6 = var14 + var16 * (var12 - var14) * 6.0D; - } else if (var16 * 2.0D < 1.0D) { // L: 23 - var6 = var12; - } else if (var16 * 3.0D < 2.0D) { // L: 24 - var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; - } else { - var6 = var14; // L: 25 - } - - if (6.0D * var0 < 1.0D) { // L: 26 - var8 = var14 + 6.0D * (var12 - var14) * var0; - } else if (2.0D * var0 < 1.0D) { // L: 27 - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; // L: 28 - } else { - var8 = var14; // L: 29 - } - - if (6.0D * var20 < 1.0D) { // L: 30 - var10 = var14 + var20 * (var12 - var14) * 6.0D; - } else if (2.0D * var20 < 1.0D) { // L: 31 - var10 = var12; - } else if (3.0D * var20 < 2.0D) { // L: 32 - var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; - } else { - var10 = var14; // L: 33 + for (int var2 = 0; var2 < var0; ++var2) { // L: 3910 + Player var3 = Client.players[var1[var2]]; // L: 3911 + if (var3 != null) { // L: 3912 + class149.updateActorSequence(var3, 1); // L: 3913 } } - int var22 = (int)(256.0D * var6); // L: 35 - int var13 = (int)(256.0D * var8); // L: 36 - int var23 = (int)(var10 * 256.0D); // L: 37 - int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 - return var15; // L: 39 - } + } // L: 3916 } diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java index 31ab570ccb..365c7d1b80 100644 --- a/runescape-client/src/main/java/class93.java +++ b/runescape-client/src/main/java/class93.java @@ -2,69 +2,160 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("cq") public class class93 { + @ObfuscatedName("ti") + @ObfuscatedGetter( + intValue = -1393536385 + ) + static int field1253; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lqq;" + ) + static IndexedSprite field1254; + @ObfuscatedName("or") + @ObfuscatedGetter( + intValue = 1900010659 + ) + static int field1252; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -173893491 + intValue = 479487429 ) - int field1268; - @ObfuscatedName("o") + int field1251; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 857086019 + intValue = 1483191049 ) - int field1270; - @ObfuscatedName("h") + int field1248; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1746673401 + intValue = 1476000165 ) - int field1269; - @ObfuscatedName("g") + int field1247; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1363211349 + intValue = -602846795 ) - int field1271; + int field1250; class93(int var1, int var2, int var3, int var4) { - this.field1268 = var1; // L: 10 - this.field1270 = var2; // L: 11 - this.field1269 = var3; // L: 12 - this.field1271 = var4; // L: 13 - } // L: 14 + this.field1251 = var1; + this.field1248 = var2; + this.field1247 = var3; // L: 12 + this.field1250 = var4; // L: 13 + } @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "70" + ) + int method2370() { + return this.field1251; // L: 17 + } + + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-375409696" + garbageValue = "194991061" ) - int method2381() { - return this.field1268; // L: 17 + int method2380() { + return this.field1248; // L: 21 } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-72" + descriptor = "(I)I", + garbageValue = "1753372833" ) - int method2376() { - return this.field1270; // L: 21 + int method2372() { + return this.field1247; // L: 25 } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-122" + descriptor = "(I)I", + garbageValue = "1314673051" ) - int method2377() { - return this.field1269; // L: 25 + int method2373() { + return this.field1250; } - @ObfuscatedName("g") + @ObfuscatedName("v") + public static final void method2384(long var0) { + if (var0 > 0L) { // L: 9 + if (0L == var0 % 10L) { // L: 10 + long var2 = var0 - 1L; // L: 11 + + try { + Thread.sleep(var2); // L: 14 + } catch (InterruptedException var8) { // L: 16 + } + + try { + Thread.sleep(1L); // L: 20 + } catch (InterruptedException var7) { // L: 22 + } + } else { + try { + Thread.sleep(var0); // L: 27 + } catch (InterruptedException var6) { // L: 29 + } + } + + } + } // L: 31 + + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;I)[Lqq;", + garbageValue = "18034657" ) - int method2378() { - return this.field1271; // L: 29 + public static IndexedSprite[] method2386(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 84 + int var4 = var0.getFileId(var3, var2); // L: 85 + byte[] var7 = var0.takeFile(var3, var4); // L: 90 + boolean var6; + if (var7 == null) { // L: 91 + var6 = false; // L: 92 + } else { + WorldMapArea.SpriteBuffer_decode(var7); // L: 95 + var6 = true; // L: 96 + } + + IndexedSprite[] var5; + if (!var6) { // L: 98 + var5 = null; // L: 99 + } else { + IndexedSprite[] var8 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 104 + + for (int var9 = 0; var9 < class451.SpriteBuffer_spriteCount; ++var9) { // L: 105 + IndexedSprite var10 = var8[var9] = new IndexedSprite(); // L: 106 + var10.width = class451.SpriteBuffer_spriteWidth; // L: 107 + var10.height = class451.SpriteBuffer_spriteHeight; // L: 108 + var10.xOffset = class451.SpriteBuffer_xOffsets[var9]; // L: 109 + var10.yOffset = class271.SpriteBuffer_yOffsets[var9]; // L: 110 + var10.subWidth = class451.SpriteBuffer_spriteWidths[var9]; // L: 111 + var10.subHeight = class451.SpriteBuffer_spriteHeights[var9]; // L: 112 + var10.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 113 + var10.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var9]; // L: 114 + } + + ArchiveDiskActionHandler.method5813(); // L: 116 + var5 = var8; // L: 119 + } + + return var5; // L: 121 } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(Lcb;II)V", + garbageValue = "-314734464" + ) + static final void method2376(Actor var0, int var1) { + VarbitComposition.worldToScreen(var0.x, var0.y, var1); // L: 5398 + } // L: 5399 }