From d4f6d17a25c5fb01f5d5ae1064dacc058fb55306 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:16:47 +0300 Subject: [PATCH 01/13] feat: revision 240 (initial copy of 239) --- protocol/osrs-240/build.gradle.kts | 14 + .../v240/ClientPacketDecoderServiceV240.kt | 25 + .../v240/GameClientProtProviderV240.kt | 16 + .../v240/GameServerProtProviderV240.kt | 16 + .../v240/ServerPacketDecoderServiceV240.kt | 31 + .../decoder/codec/buttons/If1ButtonDecoder.kt | 23 + .../decoder/codec/buttons/IfButtonDDecoder.kt | 34 + .../decoder/codec/buttons/IfButtonTDecoder.kt | 34 + .../decoder/codec/buttons/IfButtonXDecoder.kt | 31 + .../codec/buttons/IfScriptTriggerDecoder.kt | 33 + .../decoder/codec/buttons/IfSubOpDecoder.kt | 33 + ...ClanSettingsAddBannedFromChannelDecoder.kt | 29 + ...dClanSettingsSetMutedFromChannelDecoder.kt | 31 + .../clan/ClanChannelFullRequestDecoder.kt | 22 + .../codec/clan/ClanChannelKickUserDecoder.kt | 28 + .../clan/ClanSettingsFullRequestDecoder.kt | 22 + .../codec/events/EventAppletFocusDecoder.kt | 22 + .../events/EventCameraPositionDecoder.kt | 24 + .../codec/events/EventKeyboardDecoder.kt | 33 + .../codec/events/EventMouseClickV1Decoder.kt | 31 + .../codec/events/EventMouseClickV2Decoder.kt | 31 + .../codec/events/EventMouseMoveDecoder.kt | 96 ++ .../codec/events/EventMouseScrollDecoder.kt | 22 + .../events/EventNativeMouseMoveDecoder.kt | 93 ++ .../friendchat/FriendChatJoinLeaveDecoder.kt | 27 + .../codec/friendchat/FriendChatKickDecoder.kt | 22 + .../friendchat/FriendChatSetRankDecoder.kt | 24 + .../decoder/codec/locs/OpLoc1V2Decoder.kt | 31 + .../decoder/codec/locs/OpLoc2V2Decoder.kt | 31 + .../decoder/codec/locs/OpLoc3V2Decoder.kt | 31 + .../decoder/codec/locs/OpLoc4V2Decoder.kt | 31 + .../decoder/codec/locs/OpLoc5V2Decoder.kt | 31 + .../decoder/codec/locs/OpLoc6Decoder.kt | 20 + .../decoder/codec/locs/OpLocTDecoder.kt | 35 + .../codec/messaging/MessagePrivateDecoder.kt | 29 + .../codec/messaging/MessagePublicDecoder.kt | 66 + .../misc/client/ConnectionTelemetryDecoder.kt | 42 + .../client/DetectModifiedClientDecoder.kt | 22 + .../decoder/codec/misc/client/IdleDecoder.kt | 19 + .../misc/client/MapBuildCompleteDecoder.kt | 19 + .../MembershipPromotionEligibilityDecoder.kt | 26 + .../codec/misc/client/NoTimeoutDecoder.kt | 19 + .../codec/misc/client/RSevenStatusDecoder.kt | 22 + .../client/ReflectionCheckReplyDecoder.kt | 135 ++ .../codec/misc/client/SendPingReplyDecoder.kt | 28 + .../misc/client/SoundJingleEndDecoder.kt | 22 + .../codec/misc/client/WindowStatusDecoder.kt | 28 + .../codec/misc/user/BugReportDecoder.kt | 34 + .../codec/misc/user/ClickWorldMapDecoder.kt | 21 + .../codec/misc/user/ClientCheatDecoder.kt | 22 + .../codec/misc/user/CloseModalDecoder.kt | 19 + .../codec/misc/user/ExitFreecamDecoder.kt | 19 + .../codec/misc/user/HiscoreRequestDecoder.kt | 28 + .../codec/misc/user/IfCrmViewOpDecoder.kt | 33 + .../codec/misc/user/MoveGameClickDecoder.kt | 26 + .../misc/user/MoveMinimapClickDecoder.kt | 59 + .../codec/misc/user/SendSnapshotDecoder.kt | 28 + .../misc/user/SetChatFilterSettingsDecoder.kt | 28 + .../codec/misc/user/SetHeadingDecoder.kt | 20 + .../codec/misc/user/TeleportDecoder.kt | 28 + .../decoder/codec/npcs/OpNpc1V2Decoder.kt | 27 + .../decoder/codec/npcs/OpNpc2V2Decoder.kt | 27 + .../decoder/codec/npcs/OpNpc3V2Decoder.kt | 27 + .../decoder/codec/npcs/OpNpc4V2Decoder.kt | 27 + .../decoder/codec/npcs/OpNpc5V2Decoder.kt | 27 + .../decoder/codec/npcs/OpNpc6Decoder.kt | 20 + .../decoder/codec/npcs/OpNpcTDecoder.kt | 31 + .../decoder/codec/objs/OpObj1V2Decoder.kt | 31 + .../decoder/codec/objs/OpObj2V2Decoder.kt | 31 + .../decoder/codec/objs/OpObj3V2Decoder.kt | 31 + .../decoder/codec/objs/OpObj4V2Decoder.kt | 31 + .../decoder/codec/objs/OpObj5V2Decoder.kt | 31 + .../decoder/codec/objs/OpObj6Decoder.kt | 26 + .../decoder/codec/objs/OpObjTDecoder.kt | 35 + .../decoder/codec/players/OpPlayer1Decoder.kt | 25 + .../decoder/codec/players/OpPlayer2Decoder.kt | 25 + .../decoder/codec/players/OpPlayer3Decoder.kt | 25 + .../decoder/codec/players/OpPlayer4Decoder.kt | 25 + .../decoder/codec/players/OpPlayer5Decoder.kt | 25 + .../decoder/codec/players/OpPlayer6Decoder.kt | 25 + .../decoder/codec/players/OpPlayer7Decoder.kt | 25 + .../decoder/codec/players/OpPlayer8Decoder.kt | 25 + .../decoder/codec/players/OpPlayerTDecoder.kt | 31 + .../resumed/ResumePCountDialogDecoder.kt | 22 + .../resumed/ResumePCountDialogLongDecoder.kt | 22 + .../codec/resumed/ResumePNameDialogDecoder.kt | 22 + .../codec/resumed/ResumePObjDialogDecoder.kt | 22 + .../resumed/ResumePStringDialogDecoder.kt | 22 + .../codec/resumed/ResumePauseButtonDecoder.kt | 25 + .../codec/social/FriendListAddDecoder.kt | 22 + .../codec/social/FriendListDelDecoder.kt | 22 + .../codec/social/IgnoreListAddDecoder.kt | 22 + .../codec/social/IgnoreListDelDecoder.kt | 22 + .../worldentities/OpWorldEntity1Decoder.kt | 25 + .../worldentities/OpWorldEntity2Decoder.kt | 25 + .../worldentities/OpWorldEntity3Decoder.kt | 25 + .../worldentities/OpWorldEntity4Decoder.kt | 25 + .../worldentities/OpWorldEntity5Decoder.kt | 25 + .../worldentities/OpWorldEntity6Decoder.kt | 20 + .../worldentities/OpWorldEntityTDecoder.kt | 31 + .../prot/ClientMessageDecoderRepository.kt | 201 +++ .../incoming/decoder/prot/GameClientProt.kt | 170 +++ .../incoming/decoder/prot/GameClientProtId.kt | 105 ++ .../codec/camera/CamLookAtCyclesDecoder.kt | 32 + .../codec/camera/CamLookAtV2Decoder.kt | 30 + .../codec/camera/CamLookAtV3Decoder.kt | 32 + .../decoder/codec/camera/CamModeDecoder.kt | 24 + .../codec/camera/CamMoveToArcV2Decoder.kt | 36 + .../codec/camera/CamMoveToArcV3Decoder.kt | 38 + .../codec/camera/CamMoveToCyclesV2Decoder.kt | 32 + .../codec/camera/CamMoveToCyclesV3Decoder.kt | 34 + .../codec/camera/CamMoveToV2Decoder.kt | 30 + .../codec/camera/CamMoveToV3Decoder.kt | 32 + .../decoder/codec/camera/CamResetDecoder.kt | 21 + .../decoder/codec/camera/CamRotateBy.kt | 30 + .../camera/CamRotateToCoordinateV2Decoder.kt | 30 + .../camera/CamRotateToCoordinateV3Decoder.kt | 34 + .../codec/camera/CamRotateToDecoder.kt | 30 + .../decoder/codec/camera/CamShakeDecoder.kt | 30 + .../decoder/codec/camera/CamSkyboxDecoder.kt | 22 + .../codec/camera/CamSmoothResetDecoder.kt | 30 + .../codec/camera/CamTargetV3Decoder.kt | 37 + .../codec/camera/CamTargetV4Decoder.kt | 30 + .../decoder/codec/camera/CamUnlockDecoder.kt | 22 + .../decoder/codec/camera/OculusSyncDecoder.kt | 22 + .../codec/clan/ClanChannelDeltaDecoder.kt | 111 ++ .../codec/clan/ClanChannelFullDecoder.kt | 89 ++ .../codec/clan/ClanSettingsDeltaDecoder.kt | 202 +++ .../codec/clan/ClanSettingsFullDecoder.kt | 176 +++ .../codec/clan/MessageClanChannelDecoder.kt | 37 + .../clan/MessageClanChannelSystemDecoder.kt | 33 + .../decoder/codec/clan/VarClanDecoder.kt | 24 + .../codec/clan/VarClanDisableDecoder.kt | 21 + .../codec/clan/VarClanEnableDecoder.kt | 21 + .../friendchat/MessageFriendChannelDecoder.kt | 38 + .../UpdateFriendChatChannelFullV2Decoder.kt | 54 + ...pdateFriendChatChannelSingleUserDecoder.kt | 41 + .../decoder/codec/group/GroupFullDecoder.kt | 42 + .../decoder/codec/group/GroupVarDecoder.kt | 43 + .../decoder/codec/group/GroupVarIntDecoder.kt | 32 + .../codec/group/GroupVarLongDecoder.kt | 32 + .../codec/info/NpcInfoLargeV5Decoder.kt | 28 + .../codec/info/NpcInfoSmallV5Decoder.kt | 28 + .../decoder/codec/info/PlayerInfoDecoder.kt | 22 + .../codec/info/SetNpcUpdateOriginDecoder.kt | 38 + .../codec/info/WorldEntityInfoV7Decoder.kt | 112 ++ .../codec/interfaces/IfClearInvDecoder.kt | 24 + .../codec/interfaces/IfCloseSubDecoder.kt | 26 + .../codec/interfaces/IfMoveSubDecoder.kt | 28 + .../codec/interfaces/IfOpenSubDecoder.kt | 28 + .../codec/interfaces/IfOpenTopDecoder.kt | 22 + .../codec/interfaces/IfResyncV2Decoder.kt | 64 + .../codec/interfaces/IfSetAngleDecoder.kt | 30 + .../codec/interfaces/IfSetAnimDecoder.kt | 26 + .../codec/interfaces/IfSetColourDecoder.kt | 26 + .../codec/interfaces/IfSetEventsV2Decoder.kt | 32 + .../codec/interfaces/IfSetHideDecoder.kt | 26 + .../codec/interfaces/IfSetModelV2Decoder.kt | 26 + .../interfaces/IfSetNpcHeadActiveDecoder.kt | 26 + .../codec/interfaces/IfSetNpcHeadDecoder.kt | 26 + .../codec/interfaces/IfSetObjectDecoder.kt | 28 + .../interfaces/IfSetPlayerHeadDecoder.kt | 24 + .../IfSetPlayerModelBaseColourDecoder.kt | 28 + .../IfSetPlayerModelBodyTypeDecoder.kt | 26 + .../interfaces/IfSetPlayerModelObjDecoder.kt | 26 + .../interfaces/IfSetPlayerModelSelfDecoder.kt | 26 + .../codec/interfaces/IfSetPositionDecoder.kt | 28 + .../interfaces/IfSetRotateSpeedDecoder.kt | 28 + .../codec/interfaces/IfSetScrollPosDecoder.kt | 26 + .../codec/interfaces/IfSetTextDecoder.kt | 26 + .../decoder/codec/inv/UpdateInvFullDecoder.kt | 39 + .../codec/inv/UpdateInvPartialDecoder.kt | 45 + .../codec/inv/UpdateInvStopTransmitDecoder.kt | 20 + .../decoder/codec/logout/LogoutDecoder.kt | 21 + .../codec/logout/LogoutTransferDecoder.kt | 28 + .../codec/logout/LogoutWithReasonDecoder.kt | 22 + .../codec/map/RebuildRegionV2Decoder.kt | 49 + .../codec/map/RebuildWorldEntityV4Decoder.kt | 52 + .../decoder/codec/map/ReconnectDecoder.kt | 45 + .../codec/map/StaticRebuildV2Decoder.kt | 119 ++ .../codec/misc/client/HideLocOpsDecoder.kt | 22 + .../codec/misc/client/HideNpcOpsDecoder.kt | 22 + .../codec/misc/client/HideObjOpsDecoder.kt | 22 + .../codec/misc/client/HintArrowDecoder.kt | 55 + .../codec/misc/client/HiscoreReplyDecoder.kt | 78 ++ .../codec/misc/client/MinimapToggleDecoder.kt | 22 + .../misc/client/PacketGroupEndDecoder.kt | 21 + .../misc/client/PacketGroupStartDecoder.kt | 26 + .../misc/client/ReflectionCheckerDecoder.kt | 123 ++ .../codec/misc/client/ResetAnimsDecoder.kt | 21 + .../client/ResetInteractionModeDecoder.kt | 24 + .../codec/misc/client/SendPingDecoder.kt | 26 + .../codec/misc/client/ServerTickEndDecoder.kt | 21 + .../misc/client/SetHeatmapEnabledDecoder.kt | 22 + .../misc/client/SetInteractionModeDecoder.kt | 28 + .../codec/misc/client/SiteSettingsDecoder.kt | 24 + .../misc/client/UpdateRebootTimerV2Decoder.kt | 32 + .../codec/misc/client/UpdateUid192Decoder.kt | 31 + .../codec/misc/client/UrlOpenDecoder.kt | 26 + .../codec/misc/player/AccountFlagsDecoder.kt | 24 + .../misc/player/ChatFilterSettingsDecoder.kt | 24 + .../ChatFilterSettingsPrivateChatDecoder.kt | 24 + .../codec/misc/player/MessageGameDecoder.kt | 40 + .../misc/player/RunClientScriptDecoder.kt | 58 + .../codec/misc/player/SetMapFlagV2Decoder.kt | 21 + .../codec/misc/player/SetPlayerOpDecoder.kt | 26 + .../player/TriggerOnDialogAbortDecoder.kt | 21 + .../misc/player/UpdateRunEnergyDecoder.kt | 24 + .../misc/player/UpdateRunWeightDecoder.kt | 24 + .../codec/misc/player/UpdateStatV2Decoder.kt | 28 + .../player/UpdateStockMarketSlotDecoder.kt | 47 + .../misc/player/UpdateTradingPostDecoder.kt | 57 + .../codec/social/FriendListLoadedDecoder.kt | 21 + .../codec/social/MessagePrivateDecoder.kt | 35 + .../codec/social/MessagePrivateEchoDecoder.kt | 29 + .../codec/social/UpdateFriendListDecoder.kt | 64 + .../codec/social/UpdateIgnoreListDecoder.kt | 47 + .../codec/sound/AmbientSoundStartDecoder.kt | 24 + .../codec/sound/AmbientSoundStopDecoder.kt | 22 + .../decoder/codec/sound/MidiJingleDecoder.kt | 24 + .../codec/sound/MidiSongStopDecoder.kt | 24 + .../decoder/codec/sound/MidiSongV2Decoder.kt | 30 + .../sound/MidiSongWithSecondaryDecoder.kt | 32 + .../decoder/codec/sound/MidiSwapDecoder.kt | 28 + .../decoder/codec/sound/SynthSoundDecoder.kt | 28 + .../codec/specific/AnimSpecificDecoder.kt | 24 + .../codec/specific/LocAnimSpecificDecoder.kt | 28 + .../codec/specific/MapAnimSpecificDecoder.kt | 29 + .../codec/specific/NpcAnimSpecificDecoder.kt | 26 + .../specific/NpcHeadIconSpecificDecoder.kt | 28 + .../specific/NpcSpotAnimSpecificDecoder.kt | 31 + .../codec/specific/ObjAddSpecificDecoder.kt | 38 + .../codec/specific/ObjCountSpecificDecoder.kt | 29 + .../specific/ObjCustomiseSpecificDecoder.kt | 37 + .../codec/specific/ObjDelSpecificDecoder.kt | 27 + .../specific/ObjEnabledOpsSpecificDecoder.kt | 28 + .../specific/ObjUncustomiseSpecificDecoder.kt | 27 + .../specific/PlayerSpotAnimSpecificDecoder.kt | 31 + .../specific/ProjAnimSpecificV4Decoder.kt | 43 + .../codec/unknown/UnknownStringDecoder.kt | 22 + .../decoder/codec/varp/VarpLargeDecoder.kt | 24 + .../decoder/codec/varp/VarpResetDecoder.kt | 21 + .../decoder/codec/varp/VarpSmallDecoder.kt | 24 + .../decoder/codec/varp/VarpSyncDecoder.kt | 21 + .../worldentity/SetActiveWorldV2Decoder.kt | 38 + .../header/UpdateZoneFullFollowsDecoder.kt | 26 + .../UpdateZonePartialEnclosedDecoder.kt | 71 + .../header/UpdateZonePartialFollowsDecoder.kt | 26 + .../zone/payload/LocAddChangeV2Decoder.kt | 45 + .../codec/zone/payload/LocAnimDecoder.kt | 28 + .../codec/zone/payload/LocDelDecoder.kt | 26 + .../codec/zone/payload/LocMergeDecoder.kt | 42 + .../codec/zone/payload/MapAnimDecoder.kt | 29 + .../zone/payload/MapProjAnimV2Decoder.kt | 44 + .../codec/zone/payload/ObjAddDecoder.kt | 38 + .../codec/zone/payload/ObjCountDecoder.kt | 29 + .../codec/zone/payload/ObjCustomiseDecoder.kt | 38 + .../codec/zone/payload/ObjDelDecoder.kt | 27 + .../zone/payload/ObjEnabledOpsDecoder.kt | 28 + .../zone/payload/ObjUncustomiseDecoder.kt | 28 + .../zone/payload/ScriptedProjAddDecoder.kt | 57 + .../zone/payload/ScriptedProjChangeDecoder.kt | 37 + .../codec/zone/payload/SoundAreaDecoder.kt | 33 + .../outgoing/decoder/prot/GameServerProt.kt | 218 +++ .../outgoing/decoder/prot/GameServerProtId.kt | 153 +++ .../prot/ServerMessageDecoderRepository.kt | 337 +++++ .../model/info/npcinfo/NpcInfoClient.kt | 1035 +++++++++++++++ .../model/info/playerinfo/PlayerInfoClient.kt | 1180 +++++++++++++++++ .../worldentityinfo/WorldEntityInfoClient.kt | 649 +++++++++ 269 files changed, 12677 insertions(+) create mode 100644 protocol/osrs-240/build.gradle.kts create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ClientPacketDecoderServiceV240.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameClientProtProviderV240.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameServerProtProviderV240.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ServerPacketDecoderServiceV240.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseClickV1Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/IdleDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ExitFreecamDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListAddDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListDelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProt.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamModeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamResetDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateBy.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSkyboxDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV4Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelSingleUserDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupFullDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarIntDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarLongDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/ReconnectDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideLocOpsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/FriendListLoadedDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStartDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStopDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt diff --git a/protocol/osrs-240/build.gradle.kts b/protocol/osrs-240/build.gradle.kts new file mode 100644 index 000000000..f47018b25 --- /dev/null +++ b/protocol/osrs-240/build.gradle.kts @@ -0,0 +1,14 @@ +dependencies { + implementation(platform(rootProject.libs.netty.bom)) + implementation(rootProject.libs.netty.buffer) + implementation(rootProject.libs.netty.transport) + implementation(rootProject.libs.netty.handler) + implementation(rootProject.libs.rsprot.buffer) + implementation(rootProject.libs.rsprot.compression) + implementation(rootProject.libs.rsprot.protocol) + implementation(rootProject.libs.rsprot.crypto) + implementation(platform(rootProject.libs.log4j.bom)) + implementation(rootProject.libs.bundles.log4j) + implementation(projects.protocol) + implementation(projects.cache.cacheApi) +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ClientPacketDecoderServiceV240.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ClientPacketDecoderServiceV240.kt new file mode 100644 index 000000000..76e28fdac --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ClientPacketDecoderServiceV240.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240 + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.message.IncomingMessage +import net.rsprox.protocol.ClientPacketDecoder +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.ClientMessageDecoderRepository + +public class ClientPacketDecoderServiceV240( + huffmanCodec: HuffmanCodec, +) : ClientPacketDecoder { + @OptIn(ExperimentalStdlibApi::class) + private val repository = ClientMessageDecoderRepository.build(huffmanCodec) + + override fun decode( + opcode: Int, + payload: JagByteBuf, + session: Session, + ): IncomingMessage { + return repository + .getDecoder(opcode) + .decode(payload, session) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameClientProtProviderV240.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameClientProtProviderV240.kt new file mode 100644 index 000000000..6bee36811 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameClientProtProviderV240.kt @@ -0,0 +1,16 @@ +package net.rsprox.protocol.v240 + +import net.rsprox.protocol.ProtProvider +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt +import kotlin.enums.EnumEntries + +public data object GameClientProtProviderV240 : ProtProvider { + override fun get(opcode: Int): GameClientProt { + return GameClientProt.entries.firstOrNull { it.opcode == opcode } + ?: throw IllegalArgumentException("Unknown game client prot: $opcode") + } + + override fun allProts(): EnumEntries { + return GameClientProt.entries + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameServerProtProviderV240.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameServerProtProviderV240.kt new file mode 100644 index 000000000..75bb0cbd0 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/GameServerProtProviderV240.kt @@ -0,0 +1,16 @@ +package net.rsprox.protocol.v240 + +import net.rsprox.protocol.ProtProvider +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt +import kotlin.enums.EnumEntries + +public data object GameServerProtProviderV240 : ProtProvider { + override fun get(opcode: Int): GameServerProt { + return GameServerProt.entries.firstOrNull { it.opcode == opcode } + ?: throw IllegalArgumentException("Unknown game server prot: $opcode") + } + + override fun allProts(): EnumEntries { + return GameServerProt.entries + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ServerPacketDecoderServiceV240.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ServerPacketDecoderServiceV240.kt new file mode 100644 index 000000000..dba87e506 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/ServerPacketDecoderServiceV240.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240 + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.message.IncomingMessage +import net.rsprox.cache.api.CacheProvider +import net.rsprox.protocol.ServerPacketDecoder +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.ServerMessageDecoderRepository + +public class ServerPacketDecoderServiceV240( + huffmanCodec: HuffmanCodec, + cache: CacheProvider, +) : ServerPacketDecoder { + @OptIn(ExperimentalStdlibApi::class) + private val repository = + ServerMessageDecoderRepository.build( + huffmanCodec, + cache, + ) + + override fun decode( + opcode: Int, + payload: JagByteBuf, + session: Session, + ): IncomingMessage { + return repository + .getDecoder(opcode) + .decode(payload, session) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt new file mode 100644 index 000000000..ac88af431 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/If1ButtonDecoder.kt @@ -0,0 +1,23 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.buttons.If1Button +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class If1ButtonDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_BUTTON + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): If1Button { + val combinedId = buffer.gCombinedId() + return If1Button(combinedId) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt new file mode 100644 index 000000000..a1ad7c181 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt @@ -0,0 +1,34 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.buttons.IfButtonD +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class IfButtonDDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_BUTTOND + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfButtonD { + val selectedCombinedId = buffer.gCombinedIdAlt1() + val selectedObj = buffer.g2Alt1() + val selectedSub = buffer.g2Alt3() + val targetCombinedId = buffer.gCombinedId() + val targetObj = buffer.g2Alt2() + val targetSub = buffer.g2Alt2() + return IfButtonD( + selectedCombinedId, + selectedSub, + selectedObj, + targetCombinedId, + targetSub, + targetObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt new file mode 100644 index 000000000..8d05f4102 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt @@ -0,0 +1,34 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.buttons.IfButtonT +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class IfButtonTDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_BUTTONT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfButtonT { + val targetCombinedId = buffer.gCombinedId() + val selectedSub = buffer.g2Alt2() + val targetObj = buffer.g2Alt3() + val targetSub = buffer.g2Alt1() + val selectedObj = buffer.g2Alt2() + val selectedCombinedId = buffer.gCombinedIdAlt2() + return IfButtonT( + selectedCombinedId, + selectedSub, + selectedObj, + targetCombinedId, + targetSub, + targetObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt new file mode 100644 index 000000000..71770b09f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonXDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.buttons.If3Button +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class IfButtonXDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_BUTTONX + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): If3Button { + val combinedId = buffer.gCombinedId() + val sub = buffer.g2() + val obj = buffer.g2() + val op = buffer.g1() + return If3Button( + combinedId, + sub, + obj, + op, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt new file mode 100644 index 000000000..d3e095ff8 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt @@ -0,0 +1,33 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.extensions.toByteArray +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.buttons.IfScriptTrigger +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class IfScriptTriggerDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_SCRIPT_TRIGGER + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfScriptTrigger { + // Function is method(int combinedId, int sub, int obj, int crc, Object[] args) + val sub = buffer.g2Alt3() + val obj = buffer.g2() + val combinedId = buffer.gCombinedIdAlt1() + val crc = buffer.g4Alt1() + val bytes = buffer.buffer.toByteArray() + return IfScriptTrigger( + combinedId, + sub, + obj, + crc, + bytes, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt new file mode 100644 index 000000000..e4049b38a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfSubOpDecoder.kt @@ -0,0 +1,33 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.buttons.IfSubOp +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class IfSubOpDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_SUBOP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSubOp { + val combinedId = buffer.gCombinedId() + val sub = buffer.g2() + val obj = buffer.g2() + val op = buffer.g1() + val subop = buffer.g1() + return IfSubOp( + combinedId, + sub, + obj, + op, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt new file mode 100644 index 000000000..680572ef4 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsAddBannedFromChannelDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.clan.AffinedClanSettingsAddBannedFromChannel +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class AffinedClanSettingsAddBannedFromChannelDecoder : + ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): AffinedClanSettingsAddBannedFromChannel { + val clanId = buffer.g1() + val memberIndex = buffer.g2() + val name = buffer.gjstr() + return AffinedClanSettingsAddBannedFromChannel( + name, + clanId, + memberIndex, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt new file mode 100644 index 000000000..efddfeea3 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/AffinedClanSettingsSetMutedFromChannelDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.clan.AffinedClanSettingsSetMutedFromChannel +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class AffinedClanSettingsSetMutedFromChannelDecoder : + ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): AffinedClanSettingsSetMutedFromChannel { + val clanId = buffer.g1() + val memberIndex = buffer.g2() + val muted = buffer.g1() == 1 + val name = buffer.gjstr() + return AffinedClanSettingsSetMutedFromChannel( + name, + clanId, + memberIndex, + muted, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt new file mode 100644 index 000000000..d1db337ef --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelFullRequestDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.clan.ClanChannelFullRequest +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ClanChannelFullRequestDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CLANCHANNEL_FULL_REQUEST + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanChannelFullRequest { + val clanId = buffer.g1s() + return ClanChannelFullRequest(clanId) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt new file mode 100644 index 000000000..a98f3f8da --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanChannelKickUserDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.clan.ClanChannelKickUser +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ClanChannelKickUserDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CLANCHANNEL_KICKUSER + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanChannelKickUser { + val clanId = buffer.g1() + val memberIndex = buffer.g2() + val name = buffer.gjstr() + return ClanChannelKickUser( + name, + clanId, + memberIndex, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt new file mode 100644 index 000000000..00c4b40dc --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/clan/ClanSettingsFullRequestDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.clan.ClanSettingsFullRequest +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ClanSettingsFullRequestDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CLANSETTINGS_FULL_REQUEST + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanSettingsFullRequest { + val clanId = buffer.g1s() + return ClanSettingsFullRequest(clanId) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt new file mode 100644 index 000000000..24f9ac887 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventAppletFocusDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventAppletFocus +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class EventAppletFocusDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_APPLET_FOCUS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventAppletFocus { + val inFocus = buffer.g1() == 1 + return EventAppletFocus(inFocus) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt new file mode 100644 index 000000000..6efe88426 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventCameraPosition +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class EventCameraPositionDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_CAMERA_POSITION + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventCameraPosition { + val angleX = buffer.g2Alt1() + val angleY = buffer.g2Alt3() + return EventCameraPosition( + angleX, + angleY, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt new file mode 100644 index 000000000..0831008a5 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventKeyboardDecoder.kt @@ -0,0 +1,33 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventKeyboard +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class EventKeyboardDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_KEYBOARD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventKeyboard { + val count = buffer.readableBytes() / 4 + val keys = ByteArray(count) + var lastTransmittedKeyPress: Int = -1 + for (i in 0.. { + override val prot: ClientProt = GameClientProt.EVENT_MOUSE_CLICK_V1 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventMouseClickV1 { + val packed = buffer.g2() + val rightClick = packed and 0x1 != 0 + val lastTransmittedMouseClick = packed ushr 1 + val x = buffer.g2() + val y = buffer.g2() + return EventMouseClickV1( + lastTransmittedMouseClick, + rightClick, + x, + y, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt new file mode 100644 index 000000000..e5400b871 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseClickV2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventMouseClickV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class EventMouseClickV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_MOUSE_CLICK_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventMouseClickV2 { + val x = buffer.g2Alt2() + val packed = buffer.g2Alt3() + val y = buffer.g2Alt2() + val code = buffer.g1Alt3() + val rightClick = packed and 0x1 != 0 + val lastTransmittedMouseClick = packed ushr 1 + return EventMouseClickV2( + lastTransmittedMouseClick, + code, + rightClick, + x, + y, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt new file mode 100644 index 000000000..d1035af10 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseMoveDecoder.kt @@ -0,0 +1,96 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventMouseMove +import net.rsprox.protocol.game.incoming.model.events.util.MouseMovements +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Suppress("DuplicatedCode") +@Consistent +public class EventMouseMoveDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_MOUSE_MOVE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventMouseMove { + val stepExcess = buffer.g1() + val endExcess = buffer.g1() + val array = threadLocalArray.get() + var count = 0 + while (buffer.isReadable) { + var packed = buffer.g1() + var x: Int + var y: Int + var timeSinceLastMovement: Int + var delta: Boolean + if (packed and 0xE0 == 0xE0) { + timeSinceLastMovement = packed and 0x1f shl 8 or buffer.g1() + val packed = buffer.g4() + if (packed == Int.MIN_VALUE) { + x = -1 + y = -1 + } else { + x = packed and 0xFFFF + y = packed ushr 16 and 0xFFFF + } + delta = false + } else if (packed and 0xC0 == 0xC0) { + timeSinceLastMovement = packed and 0x3f + + val packed = buffer.g4() + if (packed == Int.MIN_VALUE) { + x = -1 + y = -1 + } else { + x = packed and 0xFFFF + y = packed ushr 16 and 0xFFFF + } + delta = false + } else if (packed and 0x80 == 0x80) { + timeSinceLastMovement = packed and 0x7f + x = buffer.g1() - 128 + y = buffer.g1() - 128 + delta = true + } else { + packed = (packed shl 8) or (buffer.g1()) + timeSinceLastMovement = (packed ushr 12) and 0x7 + x = ((packed shr 6) and 0x3F) - 32 + y = (packed and 0x3F) - 32 + delta = true + } + val change = + MouseMovements.MousePosChange.pack( + timeSinceLastMovement, + x, + y, + delta, + ) + array[count++] = change + } + val slice = array.copyOf(count) + return EventMouseMove( + stepExcess, + endExcess, + MouseMovements(slice), + ) + } + + private companion object { + /** + * Utilizing a thread-local initial long array, as the number of + * mouse movements is unknown (relies on remaining bytes in buffer, + * which in turn uses compression methods so each entry can be 2-4 bytes). + * As Netty's threads decode this, a thread-local implementation is + * perfectly safe to utilize, and will save us some memory in return. + */ + private val threadLocalArray = + ThreadLocal.withInitial { + LongArray(128) + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt new file mode 100644 index 000000000..3179bff45 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventMouseScrollDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventMouseScroll +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class EventMouseScrollDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_MOUSE_SCROLL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventMouseScroll { + val rotation = buffer.g2s() + return EventMouseScroll(rotation) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt new file mode 100644 index 000000000..3db3ce33c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventNativeMouseMoveDecoder.kt @@ -0,0 +1,93 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.events + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.events.EventNativeMouseMove +import net.rsprox.protocol.game.incoming.model.events.util.MouseMovements +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Suppress("DuplicatedCode") +@Consistent +public class EventNativeMouseMoveDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EVENT_NATIVE_MOUSE_MOVE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): EventNativeMouseMove { + val stepExcess = buffer.g1() + val endExcess = buffer.g1() + val array = threadLocalArray.get() + var count = 0 + while (buffer.isReadable) { + var packed = buffer.g1() + var x: Int + var y: Int + var timeSinceLastMovement: Int + var delta: Boolean + if (packed and 0xE0 == 0xE0) { + timeSinceLastMovement = packed and 0x1f shl 8 or buffer.g1() + y = buffer.g2s() + x = buffer.g2s() + delta = false + if (x == 0 && y == -0x8000) { + x = -1 + y = -1 + } + } else if (packed and 0xC0 == 0xC0) { + timeSinceLastMovement = packed and 0x3f + y = buffer.g2s() + x = buffer.g2s() + delta = false + if (x == 0 && y == -0x8000) { + x = -1 + y = -1 + } + } else if (packed and 0x80 == 0x80) { + timeSinceLastMovement = packed and 0x7f + x = buffer.g1() - 128 + y = buffer.g1() - 128 + delta = true + } else { + packed = (packed shl 8) or (buffer.g1()) + timeSinceLastMovement = (packed ushr 12) and 0x7 + x = ((packed shr 6) and 0x3F) - 32 + y = (packed and 0x3F) - 32 + delta = true + } + val lastMouseButton = buffer.g1() + val change = + MouseMovements.MousePosChange.pack( + timeSinceLastMovement, + x, + y, + delta, + lastMouseButton, + ) + array[count++] = change + } + val slice = array.copyOf(count) + return EventNativeMouseMove( + stepExcess, + endExcess, + MouseMovements(slice), + ) + } + + private companion object { + /** + * Utilizing a thread-local initial long array, as the number of + * mouse movements is unknown (relies on remaining bytes in buffer, + * which in turn uses compression methods so each entry can be 2-4 bytes). + * As Netty's threads decode this, a thread-local implementation is + * perfectly safe to utilize, and will save us some memory in return. + */ + private val threadLocalArray = + ThreadLocal.withInitial { + LongArray(128) + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt new file mode 100644 index 000000000..9adb4d7d5 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatJoinLeaveDecoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.friendchat + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatJoinLeave +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class FriendChatJoinLeaveDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.FRIENDCHAT_JOIN_LEAVE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): FriendChatJoinLeave { + val name = + if (!buffer.isReadable) { + null + } else { + buffer.gjstr() + } + return FriendChatJoinLeave(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt new file mode 100644 index 000000000..7b7a47138 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatKickDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.friendchat + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatKick +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class FriendChatKickDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.FRIENDCHAT_KICK + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): FriendChatKick { + val name = buffer.gjstr() + return FriendChatKick(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt new file mode 100644 index 000000000..dd8f7fba8 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.friendchat + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.friendchat.FriendChatSetRank +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class FriendChatSetRankDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.FRIENDCHAT_SETRANK + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): FriendChatSetRank { + val rank = buffer.g1Alt3() + val name = buffer.gjstr() + return FriendChatSetRank( + name, + rank, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt new file mode 100644 index 000000000..8d87aa957 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLocV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLoc1V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOC1_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLocV2 { + val z = buffer.g2Alt2() + val x = buffer.g2Alt1() + val controlKey = buffer.g1Alt1() == 1 + val subop = buffer.g1Alt1() + val id = buffer.g2() + return OpLocV2( + id, + x, + z, + controlKey, + 1, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt new file mode 100644 index 000000000..a3dbca4db --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLocV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLoc2V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOC2_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLocV2 { + val z = buffer.g2Alt3() + val id = buffer.g2Alt3() + val x = buffer.g2() + val subop = buffer.g1Alt2() + val controlKey = buffer.g1() == 1 + return OpLocV2( + id, + x, + z, + controlKey, + 2, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt new file mode 100644 index 000000000..e2a5fd129 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLocV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLoc3V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOC3_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLocV2 { + val id = buffer.g2Alt2() + val subop = buffer.g1Alt3() + val controlKey = buffer.g1() == 1 + val z = buffer.g2Alt3() + val x = buffer.g2Alt2() + return OpLocV2( + id, + x, + z, + controlKey, + 3, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt new file mode 100644 index 000000000..ce3ddbb8d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLocV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLoc4V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOC4_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLocV2 { + val controlKey = buffer.g1Alt1() == 1 + val x = buffer.g2Alt1() + val id = buffer.g2Alt3() + val subop = buffer.g1Alt2() + val z = buffer.g2() + return OpLocV2( + id, + x, + z, + controlKey, + 4, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt new file mode 100644 index 000000000..446f4d964 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLocV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLoc5V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOC5_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLocV2 { + val z = buffer.g2Alt3() + val x = buffer.g2Alt1() + val controlKey = buffer.g1Alt1() == 1 + val subop = buffer.g1Alt2() + val id = buffer.g2() + return OpLocV2( + id, + x, + z, + controlKey, + 5, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt new file mode 100644 index 000000000..b6e9d6328 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc6Decoder.kt @@ -0,0 +1,20 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLoc6 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLoc6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOC6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLoc6 { + val id = buffer.g2Alt1() + return OpLoc6(id) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt new file mode 100644 index 000000000..adff25fcd --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt @@ -0,0 +1,35 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.locs.OpLocT +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpLocTDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPLOCT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpLocT { + val controlKey = buffer.g1Alt2() == 1 + val selectedSub = buffer.g2Alt2() + val id = buffer.g2Alt1() + val selectedCombinedId = buffer.gCombinedIdAlt1() + val z = buffer.g2Alt3() + val x = buffer.g2Alt1() + val selectedObj = buffer.g2Alt1() + return OpLocT( + id, + x, + z, + controlKey, + selectedCombinedId, + selectedSub, + selectedObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt new file mode 100644 index 000000000..b8acbc6cf --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePrivateDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.messaging + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.messaging.MessagePrivate +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +internal class MessagePrivateDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.MESSAGE_PRIVATE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessagePrivate { + val name = buffer.gjstr() + val message = huffmanCodec.decode(buffer) + return MessagePrivate( + name, + message, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt new file mode 100644 index 000000000..3b5736dfe --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/messaging/MessagePublicDecoder.kt @@ -0,0 +1,66 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.messaging + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.messaging.MessagePublic +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +internal class MessagePublicDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.MESSAGE_PUBLIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessagePublic { + val type = buffer.g1() + val colour = buffer.g1() + val effect = buffer.g1() + val patternArray = + if (colour in 13..20) { + ByteArray(colour - 12) { + buffer.g1().toByte() + } + } else { + null + } + val hasTrailingByte = type == CLAN_MAIN_CHANNEL_TYPE + val huffmanSlice = + if (hasTrailingByte) { + buffer.buffer.readSlice(buffer.readableBytes() - 1) + } else { + buffer.buffer + } + val message = huffmanCodec.decode(huffmanSlice) + val clanType = + if (hasTrailingByte) { + buffer.g1() + } else { + -1 + } + val pattern = + if (patternArray != null) { + MessagePublic.MessageColourPattern(patternArray) + } else { + null + } + return MessagePublic( + type, + colour, + effect, + message, + pattern, + clanType, + ) + } + + private companion object { + private const val CLAN_MAIN_CHANNEL_TYPE: Int = 3 + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt new file mode 100644 index 000000000..84cba8937 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ConnectionTelemetryDecoder.kt @@ -0,0 +1,42 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.ConnectionTelemetry +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ConnectionTelemetryDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CONNECTION_TELEMETRY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ConnectionTelemetry { + val connectionLostDuration = buffer.g2() + val loginDuration = buffer.g2() + val unusedDuration = buffer.g2() + check(unusedDuration == 0) { + "Unknown duration detected: $unusedDuration" + } + val clientState = buffer.g2() + val unused1 = buffer.g2() + check(unused1 == 0) { + "Unused1 property value detected: $unused1" + } + val loginCount = buffer.g2() + val unused2 = buffer.g2() + check(unused2 == 0) { + "Unused2 property value detected: $unused2" + } + return ConnectionTelemetry( + connectionLostDuration, + loginDuration, + clientState, + loginCount, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt new file mode 100644 index 000000000..80195209c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/DetectModifiedClientDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.DetectModifiedClient +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class DetectModifiedClientDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.DETECT_MODIFIED_CLIENT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): DetectModifiedClient { + val code = buffer.g4() + return DetectModifiedClient(code) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/IdleDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/IdleDecoder.kt new file mode 100644 index 000000000..e51e0a14d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/IdleDecoder.kt @@ -0,0 +1,19 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.Idle +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class IdleDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IDLE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): Idle = Idle +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt new file mode 100644 index 000000000..f4c4fb8ab --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MapBuildCompleteDecoder.kt @@ -0,0 +1,19 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.MapBuildComplete +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class MapBuildCompleteDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.MAP_BUILD_COMPLETE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MapBuildComplete = MapBuildComplete +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt new file mode 100644 index 000000000..1933b1331 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/MembershipPromotionEligibilityDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.MembershipPromotionEligibility +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class MembershipPromotionEligibilityDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.MEMBERSHIP_PROMOTION_ELIGIBILITY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MembershipPromotionEligibility { + val eligibleForIntroductoryPrice = buffer.g1() + val eligibleForTrialPurchase = buffer.g1() + return MembershipPromotionEligibility( + eligibleForIntroductoryPrice, + eligibleForTrialPurchase, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt new file mode 100644 index 000000000..7aea4ad13 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/NoTimeoutDecoder.kt @@ -0,0 +1,19 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.NoTimeout +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class NoTimeoutDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.NO_TIMEOUT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NoTimeout = NoTimeout +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt new file mode 100644 index 000000000..13f3b95d8 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/RSevenStatusDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.RSevenStatus +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class RSevenStatusDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RSEVEN_STATUS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): RSevenStatus { + val packed = buffer.g1() + return RSevenStatus(packed) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt new file mode 100644 index 000000000..cf96b31ce --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/ReflectionCheckReplyDecoder.kt @@ -0,0 +1,135 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.extensions.checkCRC32 +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.ReflectionCheckReply +import net.rsprox.protocol.game.incoming.model.misc.client.ReflectionCheckReply.ErrorResult +import net.rsprox.protocol.reflection.ReflectionCheck +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getReflectionChecks +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt +import java.io.IOException +import java.io.InvalidClassException +import java.io.OptionalDataException +import java.io.StreamCorruptedException +import java.lang.reflect.InvocationTargetException + +@Consistent +internal class ReflectionCheckReplyDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.REFLECTION_CHECK_REPLY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ReflectionCheckReply { + val id = buffer.g4() + val checks = session.getReflectionChecks().remove(id) + checkNotNull(checks) { + "Unable to link reflection check reply to request: $id" + } + val results = ArrayList>(checks.size) + for (check in checks) { + val opcode = buffer.g1s() + if (opcode < 0) { + results += + if (opcode <= -10) { + val throwable = getExecutionThrowableClass(opcode) + ErrorResult( + check, + ErrorResult.ThrowableResultType.ExecutionThrowable(throwable), + ) + } else { + val throwable = getConstructionThrowableClass(opcode) + ErrorResult( + check, + ErrorResult.ThrowableResultType.ConstructionThrowable(throwable), + ) + } + continue + } + when (check) { + is ReflectionCheck.GetFieldValue -> { + val result = buffer.g4() + results += ReflectionCheckReply.GetFieldValueResult(check, result) + } + is ReflectionCheck.SetFieldValue -> { + results += ReflectionCheckReply.SetFieldValueResult(check) + } + is ReflectionCheck.GetFieldModifiers -> { + val modifiers = buffer.g4() + results += ReflectionCheckReply.GetFieldModifiersResult(check, modifiers) + } + is ReflectionCheck.InvokeMethod -> { + results += + when (opcode) { + 0 -> ReflectionCheckReply.InvokeMethodResult(check, ReflectionCheckReply.NullReturnValue) + 1 -> + ReflectionCheckReply.InvokeMethodResult( + check, + ReflectionCheckReply.NumberReturnValue(buffer.g8()), + ) + 2 -> + ReflectionCheckReply.InvokeMethodResult( + check, + ReflectionCheckReply.StringReturnValue(buffer.gjstr()), + ) + 4 -> ReflectionCheckReply.InvokeMethodResult(check, ReflectionCheckReply.UnknownReturnValue) + else -> throw IllegalStateException("Unknown opcode for method invocation: $opcode") + } + } + is ReflectionCheck.GetMethodModifiers -> { + val modifiers = buffer.g4() + results += ReflectionCheckReply.GetMethodModifiersResult(check, modifiers) + } + } + } + buffer.readerIndex(buffer.writerIndex()) + if (!buffer.buffer.checkCRC32()) { + throw IllegalStateException("CRC mismatch!") + } + return ReflectionCheckReply( + id, + results, + ) + } + + /** + * Gets the throwable class corresponding to each opcode during the reflection check execution. + * @param opcode the opcode value + * @return the throwable class corresponding to that opcode + */ + private fun getExecutionThrowableClass(opcode: Int): Class = + when (opcode) { + -10 -> ClassNotFoundException::class.java + -11 -> InvalidClassException::class.java + -12 -> StreamCorruptedException::class.java + -13 -> OptionalDataException::class.java + -14 -> IllegalAccessException::class.java + -15 -> IllegalArgumentException::class.java + -16 -> InvocationTargetException::class.java + -17 -> SecurityException::class.java + -18 -> IOException::class.java + -19 -> NullPointerException::class.java + -20 -> Exception::class.java + -21 -> Throwable::class.java + else -> throw IllegalArgumentException("Unknown execution throwable opcode: $opcode") + } + + /** + * Gets the throwable class corresponding to each opcode during the reflection check construction. + * @param opcode the opcode value + * @return the throwable class corresponding to that opcode + */ + private fun getConstructionThrowableClass(opcode: Int): Class = + when (opcode) { + -1 -> ClassNotFoundException::class.java + -2 -> SecurityException::class.java + -3 -> NullPointerException::class.java + -4 -> Exception::class.java + -5 -> Throwable::class.java + else -> throw IllegalArgumentException("Unknown construction throwable opcode: $opcode") + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt new file mode 100644 index 000000000..075f6e12f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.SendPingReply +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class SendPingReplyDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.SEND_PING_REPLY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SendPingReply { + val value1 = buffer.g4Alt3() + val value2 = buffer.g4() + val fps = buffer.g1Alt1() + val gcPercentTime = buffer.g1Alt2() + return SendPingReply( + fps, + gcPercentTime, + value1, + value2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt new file mode 100644 index 000000000..4ded97785 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SoundJingleEndDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.SoundJingleEnd +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class SoundJingleEndDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.SOUND_JINGLEEND + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SoundJingleEnd { + val jingle = buffer.g4() + return SoundJingleEnd(jingle) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt new file mode 100644 index 000000000..970b502ee --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/WindowStatusDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.client.WindowStatus +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class WindowStatusDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.WINDOW_STATUS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): WindowStatus { + val windowMode = buffer.g1() + val frameWidth = buffer.g2() + val frameHeight = buffer.g2() + return WindowStatus( + windowMode, + frameWidth, + frameHeight, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt new file mode 100644 index 000000000..8b43a0958 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/BugReportDecoder.kt @@ -0,0 +1,34 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.BugReport +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class BugReportDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.BUG_REPORT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): BugReport { + val description = buffer.gjstr() + val type = buffer.g1Alt3() + val instructions = buffer.gjstr() + check(description.length <= 500) { + "Bug report description length cannot exceed 500 characters." + } + check(instructions.length <= 500) { + "Bug report instructions length cannot exceed 500 characters." + } + return BugReport( + type, + description, + instructions, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt new file mode 100644 index 000000000..c37f5813f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClickWorldMapDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.incoming.model.misc.user.ClickWorldMap +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class ClickWorldMapDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CLICKWORLDMAP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClickWorldMap { + val packed = buffer.g4Alt1() + return ClickWorldMap(CoordGrid(packed)) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt new file mode 100644 index 000000000..be88f4589 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.ClientCheat +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ClientCheatDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CLIENT_CHEAT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClientCheat { + val command = buffer.gjstr() + return ClientCheat(command) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt new file mode 100644 index 000000000..bd4f3af5f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/CloseModalDecoder.kt @@ -0,0 +1,19 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.CloseModal +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class CloseModalDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.CLOSE_MODAL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CloseModal = CloseModal +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ExitFreecamDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ExitFreecamDecoder.kt new file mode 100644 index 000000000..03a06032d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ExitFreecamDecoder.kt @@ -0,0 +1,19 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.ExitFreecam +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ExitFreecamDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.EXIT_FREECAM + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ExitFreecam = ExitFreecam +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt new file mode 100644 index 000000000..8de9b2ccb --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/HiscoreRequestDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.HiscoreRequest +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class HiscoreRequestDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.HISCORE_REQUEST + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): HiscoreRequest { + val requestId = buffer.g1() + val type = buffer.g1() + val name = buffer.gjstr() + return HiscoreRequest( + type, + requestId, + name, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt new file mode 100644 index 000000000..3aef5da22 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt @@ -0,0 +1,33 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.IfCrmViewOp +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class IfCrmViewOpDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IF_CRMVIEW_OP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfCrmViewOp { + val combinedId = buffer.gCombinedIdAlt2() + val serverTarget = buffer.g4() + val behaviour1 = buffer.g4Alt2() + val behaviour3 = buffer.g4Alt2() + val behaviour2 = buffer.g4Alt1() + val sub = buffer.g2Alt1() + return IfCrmViewOp( + serverTarget, + combinedId, + sub, + behaviour1, + behaviour2, + behaviour3, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt new file mode 100644 index 000000000..68d819218 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.MoveGameClick +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class MoveGameClickDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.MOVE_GAMECLICK + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MoveGameClick { + val x = buffer.g2Alt1() + val z = buffer.g2Alt1() + val keyCombination = buffer.g1Alt3() + return MoveGameClick( + x, + z, + keyCombination, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt new file mode 100644 index 000000000..5311577c9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt @@ -0,0 +1,59 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.MoveMinimapClick +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class MoveMinimapClickDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.MOVE_MINIMAPCLICK + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MoveMinimapClick { + // The x, z and keyCombination get scrambled between revisions + val x = buffer.g2Alt1() + val z = buffer.g2Alt1() + val keyCombination = buffer.g1Alt3() + + // The arguments below are consistent across revisions + val minimapWidth = buffer.g1() + val minimapHeight = buffer.g1() + val cameraAngleY = buffer.g2() + val checkpoint1 = buffer.g1() + check(checkpoint1 == 57) { + "Invalid checkpoint 1: $checkpoint1" + } + val checkpoint2 = buffer.g1() + check(checkpoint2 == 0) { + "Invalid checkpoint 2: $checkpoint2" + } + val checkpoint3 = buffer.g1() + check(checkpoint3 == 0) { + "Invalid checkpoint 3: $checkpoint3" + } + val checkpoint4 = buffer.g1() + check(checkpoint4 == 89) { + "Invalid checkpoint 4: $checkpoint4" + } + val fineX = buffer.g2() + val fineZ = buffer.g2() + val checkpoint5 = buffer.g1() + check(checkpoint5 == 63) { + "Invalid checkpoint 5: $checkpoint5" + } + return MoveMinimapClick( + x, + z, + keyCombination, + minimapWidth, + minimapHeight, + cameraAngleY, + fineX, + fineZ, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt new file mode 100644 index 000000000..fb8d900d2 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SendSnapshotDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.SendSnapshot +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class SendSnapshotDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.SEND_SNAPSHOT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SendSnapshot { + val name = buffer.gjstr() + val ruleId = buffer.g1() + val mute = buffer.g1() == 1 + return SendSnapshot( + name, + ruleId, + mute, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt new file mode 100644 index 000000000..b4328fd92 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetChatFilterSettingsDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.SetChatFilterSettings +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class SetChatFilterSettingsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.SET_CHATFILTERSETTINGS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetChatFilterSettings { + val publicChatFilter = buffer.g1() + val privateChatFilter = buffer.g1() + val tradeChatFilter = buffer.g1() + return SetChatFilterSettings( + publicChatFilter, + privateChatFilter, + tradeChatFilter, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt new file mode 100644 index 000000000..41b3c3e9d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt @@ -0,0 +1,20 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.SetHeading +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class SetHeadingDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.SET_HEADING + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetHeading { + val heading = buffer.g1() + return SetHeading(heading) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt new file mode 100644 index 000000000..d9f57916b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.misc.user.Teleport +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class TeleportDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.TELEPORT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): Teleport { + val oculusSyncValue = buffer.g4() + val level = buffer.g1Alt1() + val z = buffer.g2() + val x = buffer.g2Alt2() + return Teleport( + oculusSyncValue, + x, + z, + level, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt new file mode 100644 index 000000000..fb31a75d3 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpc1V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPC1_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpcV2 { + val index = buffer.g2Alt1() + val subop = buffer.g1Alt2() + val controlKey = buffer.g1Alt3() == 1 + return OpNpcV2( + index, + controlKey, + 1, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt new file mode 100644 index 000000000..4d1dd25ed --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpc2V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPC2_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpcV2 { + val index = buffer.g2Alt3() + val subop = buffer.g1Alt2() + val controlKey = buffer.g1Alt3() == 1 + return OpNpcV2( + index, + controlKey, + 2, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt new file mode 100644 index 000000000..bb031bf2f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpc3V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPC3_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpcV2 { + val controlKey = buffer.g1Alt2() == 1 + val subop = buffer.g1Alt3() + val index = buffer.g2Alt2() + return OpNpcV2( + index, + controlKey, + 3, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt new file mode 100644 index 000000000..629719279 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpc4V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPC4_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpcV2 { + val subop = buffer.g1Alt1() + val index = buffer.g2() + val controlKey = buffer.g1Alt2() == 1 + return OpNpcV2( + index, + controlKey, + 4, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt new file mode 100644 index 000000000..91d5331b3 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpcV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpc5V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPC5_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpcV2 { + val subop = buffer.g1Alt1() + val controlKey = buffer.g1Alt2() == 1 + val index = buffer.g2Alt2() + return OpNpcV2( + index, + controlKey, + 5, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt new file mode 100644 index 000000000..64d013778 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt @@ -0,0 +1,20 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpc6 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpc6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPC6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpc6 { + val id = buffer.g2() + return OpNpc6(id) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt new file mode 100644 index 000000000..031dda607 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.npcs.OpNpcT +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpNpcTDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPNPCT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpNpcT { + val controlKey = buffer.g1Alt2() == 1 + val selectedSub = buffer.g2() + val index = buffer.g2Alt2() + val selectedObj = buffer.g2() + val selectedCombinedId = buffer.gCombinedId() + return OpNpcT( + index, + controlKey, + selectedCombinedId, + selectedSub, + selectedObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt new file mode 100644 index 000000000..b5d7c2e0b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObjV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObj1V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJ1_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObjV2 { + val id = buffer.g2Alt2() + val subop = buffer.g1Alt3() + val z = buffer.g2Alt2() + val controlKey = buffer.g1Alt3() == 1 + val x = buffer.g2() + return OpObjV2( + id, + x, + z, + controlKey, + 1, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt new file mode 100644 index 000000000..2d386378b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObjV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObj2V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJ2_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObjV2 { + val controlKey = buffer.g1Alt1() == 1 + val subop = buffer.g1Alt3() + val z = buffer.g2() + val id = buffer.g2Alt1() + val x = buffer.g2Alt3() + return OpObjV2( + id, + x, + z, + controlKey, + 2, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt new file mode 100644 index 000000000..28c9cc668 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObjV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObj3V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJ3_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObjV2 { + val controlKey = buffer.g1Alt1() == 1 + val x = buffer.g2Alt1() + val id = buffer.g2Alt3() + val subop = buffer.g1Alt1() + val z = buffer.g2Alt2() + return OpObjV2( + id, + x, + z, + controlKey, + 3, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt new file mode 100644 index 000000000..e2d969abd --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObjV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObj4V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJ4_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObjV2 { + val subop = buffer.g1Alt3() + val id = buffer.g2() + val x = buffer.g2() + val z = buffer.g2Alt1() + val controlKey = buffer.g1Alt2() == 1 + return OpObjV2( + id, + x, + z, + controlKey, + 4, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt new file mode 100644 index 000000000..2c56c81dc --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObjV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObj5V2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJ5_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObjV2 { + val subop = buffer.g1Alt2() + val x = buffer.g2Alt2() + val id = buffer.g2() + val z = buffer.g2Alt3() + val controlKey = buffer.g1Alt1() == 1 + return OpObjV2( + id, + x, + z, + controlKey, + 5, + subop, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt new file mode 100644 index 000000000..8e862ab9e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObj6 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObj6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJ6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObj6 { + val z = buffer.g2Alt2() + val id = buffer.g2Alt1() + val x = buffer.g2Alt1() + return OpObj6( + id, + x, + z, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt new file mode 100644 index 000000000..cb459b93e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt @@ -0,0 +1,35 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.objs.OpObjT +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpObjTDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPOBJT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpObjT { + val selectedObj = buffer.g2Alt1() + val id = buffer.g2Alt2() + val x = buffer.g2() + val selectedCombinedId = buffer.gCombinedIdAlt2() + val controlKey = buffer.g1() == 1 + val selectedSub = buffer.g2Alt1() + val z = buffer.g2() + return OpObjT( + id, + x, + z, + controlKey, + selectedCombinedId, + selectedSub, + selectedObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt new file mode 100644 index 000000000..255706022 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer1Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER1 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val controlKey = buffer.g1Alt3() == 1 + val index = buffer.g2Alt1() + return OpPlayer( + index, + controlKey, + 1, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt new file mode 100644 index 000000000..afca05f4c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val index = buffer.g2Alt1() + val controlKey = buffer.g1Alt2() == 1 + return OpPlayer( + index, + controlKey, + 2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt new file mode 100644 index 000000000..6e794a631 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val controlKey = buffer.g1Alt2() == 1 + val index = buffer.g2Alt3() + return OpPlayer( + index, + controlKey, + 3, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt new file mode 100644 index 000000000..9f97fef27 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer4Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER4 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val index = buffer.g2() + val controlKey = buffer.g1() == 1 + return OpPlayer( + index, + controlKey, + 4, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt new file mode 100644 index 000000000..8565d3bf9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer5Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER5 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val controlKey = buffer.g1Alt3() == 1 + val index = buffer.g2() + return OpPlayer( + index, + controlKey, + 5, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt new file mode 100644 index 000000000..a5ff72d12 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val index = buffer.g2Alt3() + val controlKey = buffer.g1Alt3() == 1 + return OpPlayer( + index, + controlKey, + 6, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt new file mode 100644 index 000000000..e794e24d7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer7Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER7 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val controlKey = buffer.g1() == 1 + val index = buffer.g2() + return OpPlayer( + index, + controlKey, + 7, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt new file mode 100644 index 000000000..31b04a955 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayer8Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYER8 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayer { + val index = buffer.g2() + val controlKey = buffer.g1Alt2() == 1 + return OpPlayer( + index, + controlKey, + 8, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt new file mode 100644 index 000000000..b9e0853a8 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.players + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.players.OpPlayerT +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpPlayerTDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPPLAYERT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpPlayerT { + val selectedSub = buffer.g2Alt2() + val controlKey = buffer.g1Alt1() == 1 + val selectedObj = buffer.g2Alt3() + val selectedCombinedId = buffer.gCombinedIdAlt2() + val index = buffer.g2() + return OpPlayerT( + index, + controlKey, + selectedCombinedId, + selectedSub, + selectedObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt new file mode 100644 index 000000000..dcce44e64 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialog +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ResumePCountDialogDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RESUME_P_COUNTDIALOG + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResumePCountDialog { + val count = buffer.g4() + return ResumePCountDialog(count) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt new file mode 100644 index 000000000..c6f0f799b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePCountDialogLongDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.resumed.ResumePCountDialogLong +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ResumePCountDialogLongDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RESUME_P_COUNTDIALOG_LONG + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResumePCountDialogLong { + val count = buffer.g8() + return ResumePCountDialogLong(count) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt new file mode 100644 index 000000000..2aef35317 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePNameDialogDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.resumed.ResumePNameDialog +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ResumePNameDialogDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RESUME_P_NAMEDIALOG + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResumePNameDialog { + val name = buffer.gjstr() + return ResumePNameDialog(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt new file mode 100644 index 000000000..907f2834a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePObjDialogDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.resumed.ResumePObjDialog +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ResumePObjDialogDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RESUME_P_OBJDIALOG + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResumePObjDialog { + val obj = buffer.g2() + return ResumePObjDialog(obj) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt new file mode 100644 index 000000000..559f16ee0 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePStringDialogDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.resumed.ResumePStringDialog +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class ResumePStringDialogDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RESUME_P_STRINGDIALOG + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResumePStringDialog { + val string = buffer.gjstr() + return ResumePStringDialog(string) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt new file mode 100644 index 000000000..3a89525d7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.resumed.ResumePauseButton +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class ResumePauseButtonDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.RESUME_PAUSEBUTTON + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResumePauseButton { + val combinedId = buffer.gCombinedIdAlt3() + val sub = buffer.g2() + return ResumePauseButton( + combinedId, + sub, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListAddDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListAddDecoder.kt new file mode 100644 index 000000000..d96dcb38e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListAddDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.social.FriendListAdd +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class FriendListAddDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.FRIENDLIST_ADD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): FriendListAdd { + val name = buffer.gjstr() + return FriendListAdd(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListDelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListDelDecoder.kt new file mode 100644 index 000000000..4c9c0b9cd --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/FriendListDelDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.social.FriendListDel +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class FriendListDelDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.FRIENDLIST_DEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): FriendListDel { + val name = buffer.gjstr() + return FriendListDel(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt new file mode 100644 index 000000000..764071725 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListAddDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.social.IgnoreListAdd +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class IgnoreListAddDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IGNORELIST_ADD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IgnoreListAdd { + val name = buffer.gjstr() + return IgnoreListAdd(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt new file mode 100644 index 000000000..b73ac90f9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/social/IgnoreListDelDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.social.IgnoreListDel +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +@Consistent +public class IgnoreListDelDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.IGNORELIST_DEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IgnoreListDel { + val name = buffer.gjstr() + return IgnoreListDel(name) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt new file mode 100644 index 000000000..30911c0b7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntity1Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITY1 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntity { + val index = buffer.g2Alt1() + val controlKey = buffer.g1Alt3() == 1 + return OpWorldEntity( + index, + controlKey, + 1, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt new file mode 100644 index 000000000..94bef6ef6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntity2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITY2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntity { + val index = buffer.g2Alt2() + val controlKey = buffer.g1Alt1() == 1 + return OpWorldEntity( + index, + controlKey, + 2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt new file mode 100644 index 000000000..5cb74901a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntity3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITY3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntity { + val index = buffer.g2() + val controlKey = buffer.g1Alt3() == 1 + return OpWorldEntity( + index, + controlKey, + 3, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt new file mode 100644 index 000000000..bf36224b6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntity4Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITY4 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntity { + val index = buffer.g2() + val controlKey = buffer.g1() == 1 + return OpWorldEntity( + index, + controlKey, + 4, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt new file mode 100644 index 000000000..54db91367 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt @@ -0,0 +1,25 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntity5Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITY5 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntity { + val controlKey = buffer.g1Alt1() == 1 + val index = buffer.g2Alt2() + return OpWorldEntity( + index, + controlKey, + 5, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt new file mode 100644 index 000000000..c13706e18 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt @@ -0,0 +1,20 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntity6 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntity6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITY6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntity6 { + val id = buffer.g2Alt3() + return OpWorldEntity6(id) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt new file mode 100644 index 000000000..d9ecccbe5 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntityT +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.incoming.decoder.prot.GameClientProt + +public class OpWorldEntityTDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameClientProt.OPWORLDENTITYT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OpWorldEntityT { + val index = buffer.g2Alt2() + val selectedCombinedId = buffer.gCombinedIdAlt2() + val selectedObj = buffer.g2Alt3() + val selectedSub = buffer.g2Alt3() + val controlKey = buffer.g1Alt2() == 1 + return OpWorldEntityT( + index, + controlKey, + selectedCombinedId, + selectedSub, + selectedObj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt new file mode 100644 index 000000000..8cae53124 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt @@ -0,0 +1,201 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.prot + +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ProtRepository +import net.rsprox.protocol.MessageDecoderRepository +import net.rsprox.protocol.MessageDecoderRepositoryBuilder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons.* +import net.rsprox.protocol.v240.game.incoming.decoder.codec.clan.AffinedClanSettingsAddBannedFromChannelDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.clan.AffinedClanSettingsSetMutedFromChannelDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.clan.ClanChannelFullRequestDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.clan.ClanChannelKickUserDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.clan.ClanSettingsFullRequestDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.events.* +import net.rsprox.protocol.v240.game.incoming.decoder.codec.friendchat.FriendChatJoinLeaveDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.friendchat.FriendChatKickDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.friendchat.FriendChatSetRankDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLoc1V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLoc2V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLoc3V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLoc4V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLoc5V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLoc6Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.locs.OpLocTDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.messaging.MessagePrivateDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.messaging.MessagePublicDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client.* +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.client.ReflectionCheckReplyDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.BugReportDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.ClickWorldMapDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.ClientCheatDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.CloseModalDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.ExitFreecamDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.HiscoreRequestDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.IfCrmViewOpDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.MoveGameClickDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.MoveMinimapClickDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.SendSnapshotDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.SetChatFilterSettingsDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.SetHeadingDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user.TeleportDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpc1V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpc2V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpc3V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpc4V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpc5V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpc6Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs.OpNpcTDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObj1V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObj2V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObj3V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObj4V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObj5V2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObj6Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.objs.OpObjTDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer1Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer3Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer4Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer5Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer6Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer7Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayer8Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.players.OpPlayerTDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed.ResumePCountDialogDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed.ResumePCountDialogLongDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed.ResumePNameDialogDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed.ResumePObjDialogDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed.ResumePStringDialogDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed.ResumePauseButtonDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.social.FriendListAddDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.social.FriendListDelDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.social.IgnoreListAddDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.social.IgnoreListDelDecoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntity1Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntity2Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntity3Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntity4Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntity5Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntity6Decoder +import net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities.OpWorldEntityTDecoder + +internal object ClientMessageDecoderRepository { + @ExperimentalStdlibApi + fun build(huffmanCodec: HuffmanCodec): MessageDecoderRepository { + val protRepository = ProtRepository.of() + val builder = + MessageDecoderRepositoryBuilder( + protRepository, + ).apply { + bind(If1ButtonDecoder()) + bind(IfButtonXDecoder()) + bind(IfSubOpDecoder()) + bind(IfButtonDDecoder()) + bind(IfButtonTDecoder()) + bind(IfScriptTriggerDecoder()) + + bind(OpNpc1V2Decoder()) + bind(OpNpc2V2Decoder()) + bind(OpNpc3V2Decoder()) + bind(OpNpc4V2Decoder()) + bind(OpNpc5V2Decoder()) + bind(OpNpc6Decoder()) + bind(OpNpcTDecoder()) + + bind(OpLoc1V2Decoder()) + bind(OpLoc2V2Decoder()) + bind(OpLoc3V2Decoder()) + bind(OpLoc4V2Decoder()) + bind(OpLoc5V2Decoder()) + bind(OpLoc6Decoder()) + bind(OpLocTDecoder()) + + bind(OpObj1V2Decoder()) + bind(OpObj2V2Decoder()) + bind(OpObj3V2Decoder()) + bind(OpObj4V2Decoder()) + bind(OpObj5V2Decoder()) + bind(OpObj6Decoder()) + bind(OpObjTDecoder()) + + bind(OpPlayer1Decoder()) + bind(OpPlayer2Decoder()) + bind(OpPlayer3Decoder()) + bind(OpPlayer4Decoder()) + bind(OpPlayer5Decoder()) + bind(OpPlayer6Decoder()) + bind(OpPlayer7Decoder()) + bind(OpPlayer8Decoder()) + bind(OpPlayerTDecoder()) + + bind(OpWorldEntity1Decoder()) + bind(OpWorldEntity2Decoder()) + bind(OpWorldEntity3Decoder()) + bind(OpWorldEntity4Decoder()) + bind(OpWorldEntity5Decoder()) + bind(OpWorldEntity6Decoder()) + bind(OpWorldEntityTDecoder()) + + bind(EventAppletFocusDecoder()) + bind(EventCameraPositionDecoder()) + bind(EventKeyboardDecoder()) + bind(EventMouseScrollDecoder()) + bind(EventMouseMoveDecoder()) + bind(EventNativeMouseMoveDecoder()) + bind(EventMouseClickV1Decoder()) + bind(EventMouseClickV2Decoder()) + + bind(ResumePauseButtonDecoder()) + bind(ResumePNameDialogDecoder()) + bind(ResumePStringDialogDecoder()) + bind(ResumePCountDialogDecoder()) + bind(ResumePCountDialogLongDecoder()) + bind(ResumePObjDialogDecoder()) + + bind(FriendChatKickDecoder()) + bind(FriendChatSetRankDecoder()) + bind(FriendChatJoinLeaveDecoder()) + + bind(ClanChannelFullRequestDecoder()) + bind(ClanSettingsFullRequestDecoder()) + bind(ClanChannelKickUserDecoder()) + bind(AffinedClanSettingsAddBannedFromChannelDecoder()) + bind(AffinedClanSettingsSetMutedFromChannelDecoder()) + + bind(FriendListAddDecoder()) + bind(FriendListDelDecoder()) + bind(IgnoreListAddDecoder()) + bind(IgnoreListDelDecoder()) + + bind(MessagePublicDecoder(huffmanCodec)) + bind(MessagePrivateDecoder(huffmanCodec)) + + bind(MoveGameClickDecoder()) + bind(MoveMinimapClickDecoder()) + bind(ClientCheatDecoder()) + bind(SetChatFilterSettingsDecoder()) + bind(SetHeadingDecoder()) + bind(ClickWorldMapDecoder()) + bind(ExitFreecamDecoder()) + bind(CloseModalDecoder()) + bind(TeleportDecoder()) + bind(BugReportDecoder()) + bind(SendSnapshotDecoder()) + bind(HiscoreRequestDecoder()) + bind(IfCrmViewOpDecoder()) + + bind(ConnectionTelemetryDecoder()) + bind(SendPingReplyDecoder()) + bind(DetectModifiedClientDecoder()) + bind(ReflectionCheckReplyDecoder()) + bind(NoTimeoutDecoder()) + bind(IdleDecoder()) + bind(MapBuildCompleteDecoder()) + bind(MembershipPromotionEligibilityDecoder()) + bind(SoundJingleEndDecoder()) + bind(WindowStatusDecoder()) + bind(RSevenStatusDecoder()) + } + return builder.build() + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProt.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProt.kt new file mode 100644 index 000000000..3b1ff122a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProt.kt @@ -0,0 +1,170 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.prot + +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.Prot + +public enum class GameClientProt( + override val opcode: Int, + override val size: Int, +) : ClientProt { + // If buttons + IF_BUTTON(GameClientProtId.IF_BUTTON, 4), + IF_BUTTONX(GameClientProtId.IF_BUTTONX, 9), + IF_SUBOP(GameClientProtId.IF_SUBOP, 10), + IF_BUTTOND(GameClientProtId.IF_BUTTOND, 16), + IF_BUTTONT(GameClientProtId.IF_BUTTONT, 16), + IF_SCRIPT_TRIGGER(GameClientProtId.IF_SCRIPT_TRIGGER, Prot.VAR_SHORT), + + // Op npc + OPNPC1_V2(GameClientProtId.OPNPC1_V2, 4), + OPNPC2_V2(GameClientProtId.OPNPC2_V2, 4), + OPNPC3_V2(GameClientProtId.OPNPC3_V2, 4), + OPNPC4_V2(GameClientProtId.OPNPC4_V2, 4), + OPNPC5_V2(GameClientProtId.OPNPC5_V2, 4), + OPNPC6(GameClientProtId.OPNPC6, 2), + OPNPCT(GameClientProtId.OPNPCT, 11), + + @Deprecated( + "Deprecated since inventory rework in revision 204, " + + "all usagesgo through OPNPCT now.", + replaceWith = ReplaceWith("OPNPCT"), + ) + OPNPCU(GameClientProtId.OPNPCU, 11), + + // Op loc + OPLOC1_V2(GameClientProtId.OPLOC1_V2, 8), + OPLOC2_V2(GameClientProtId.OPLOC2_V2, 8), + OPLOC3_V2(GameClientProtId.OPLOC3_V2, 8), + OPLOC4_V2(GameClientProtId.OPLOC4_V2, 8), + OPLOC5_V2(GameClientProtId.OPLOC5_V2, 8), + OPLOC6(GameClientProtId.OPLOC6, 2), + OPLOCT(GameClientProtId.OPLOCT, 15), + + @Deprecated( + "Deprecated since inventory rework in revision 204, " + + "all usagesgo through OPLOCT now.", + replaceWith = ReplaceWith("OPLOCT"), + ) + OPLOCU(GameClientProtId.OPLOCU, 15), + + // Op obj + OPOBJ1_V2(GameClientProtId.OPOBJ1_V2, 8), + OPOBJ2_V2(GameClientProtId.OPOBJ2_V2, 8), + OPOBJ3_V2(GameClientProtId.OPOBJ3_V2, 8), + OPOBJ4_V2(GameClientProtId.OPOBJ4_V2, 8), + OPOBJ5_V2(GameClientProtId.OPOBJ5_V2, 8), + OPOBJ6(GameClientProtId.OPOBJ6, 6), + OPOBJT(GameClientProtId.OPOBJT, 15), + + @Deprecated( + "Deprecated since inventory rework in revision 204, " + + "all usagesgo through OPOBJT now.", + replaceWith = ReplaceWith("OPOBJT"), + ) + OPOBJU(GameClientProtId.OPOBJU, 15), + + // Op player + OPPLAYER1(GameClientProtId.OPPLAYER1, 3), + OPPLAYER2(GameClientProtId.OPPLAYER2, 3), + OPPLAYER3(GameClientProtId.OPPLAYER3, 3), + OPPLAYER4(GameClientProtId.OPPLAYER4, 3), + OPPLAYER5(GameClientProtId.OPPLAYER5, 3), + OPPLAYER6(GameClientProtId.OPPLAYER6, 3), + OPPLAYER7(GameClientProtId.OPPLAYER7, 3), + OPPLAYER8(GameClientProtId.OPPLAYER8, 3), + OPPLAYERT(GameClientProtId.OPPLAYERT, 11), + + @Deprecated( + "Deprecated since inventory rework in revision 204, " + + "all usagesgo through OPPLAYERT now.", + replaceWith = ReplaceWith("OPPLAYERT"), + ) + OPPLAYERU(GameClientProtId.OPPLAYERU, 11), + + OPWORLDENTITY1(GameClientProtId.OPWORLDENTITY1, 3), + OPWORLDENTITY2(GameClientProtId.OPWORLDENTITY2, 3), + OPWORLDENTITY3(GameClientProtId.OPWORLDENTITY3, 3), + OPWORLDENTITY4(GameClientProtId.OPWORLDENTITY4, 3), + OPWORLDENTITY5(GameClientProtId.OPWORLDENTITY5, 3), + OPWORLDENTITY6(GameClientProtId.OPWORLDENTITY6, 2), + OPWORLDENTITYT(GameClientProtId.OPWORLDENTITYT, 11), + + @Deprecated( + "Deprecated since inventory rework in revision 204, " + + "all usages go through OPWORLDENTITYT now.", + replaceWith = ReplaceWith("OPWORLDENTITYT"), + ) + OPWORLDENTITYU(GameClientProtId.OPWORLDENTITYU, 11), + + // Events + EVENT_APPLET_FOCUS(GameClientProtId.EVENT_APPLET_FOCUS, 1), + EVENT_CAMERA_POSITION(GameClientProtId.EVENT_CAMERA_POSITION, 4), + EVENT_KEYBOARD(GameClientProtId.EVENT_KEYBOARD, Prot.VAR_SHORT), + EVENT_MOUSE_SCROLL(GameClientProtId.EVENT_MOUSE_SCROLL, 2), + EVENT_MOUSE_MOVE(GameClientProtId.EVENT_MOUSE_MOVE, Prot.VAR_BYTE), + EVENT_NATIVE_MOUSE_MOVE(GameClientProtId.EVENT_NATIVE_MOUSE_MOVE, Prot.VAR_BYTE), + EVENT_MOUSE_CLICK_V1(GameClientProtId.EVENT_MOUSE_CLICK_V1, 6), + EVENT_MOUSE_CLICK_V2(GameClientProtId.EVENT_MOUSE_CLICK_V2, 7), + + // Resume events + RESUME_PAUSEBUTTON(GameClientProtId.RESUME_PAUSEBUTTON, 6), + RESUME_P_NAMEDIALOG(GameClientProtId.RESUME_P_NAMEDIALOG, Prot.VAR_BYTE), + RESUME_P_STRINGDIALOG(GameClientProtId.RESUME_P_STRINGDIALOG, Prot.VAR_BYTE), + RESUME_P_COUNTDIALOG(GameClientProtId.RESUME_P_COUNTDIALOG, 4), + RESUME_P_COUNTDIALOG_LONG(GameClientProtId.RESUME_P_COUNTDIALOG_LONG, 8), + RESUME_P_OBJDIALOG(GameClientProtId.RESUME_P_OBJDIALOG, 2), + + // Friend chat packets + FRIENDCHAT_KICK(GameClientProtId.FRIENDCHAT_KICK, Prot.VAR_BYTE), + FRIENDCHAT_SETRANK(GameClientProtId.FRIENDCHAT_SETRANK, Prot.VAR_BYTE), + FRIENDCHAT_JOIN_LEAVE(GameClientProtId.FRIENDCHAT_JOIN_LEAVE, Prot.VAR_BYTE), + + // Clan packets + CLANCHANNEL_FULL_REQUEST(GameClientProtId.CLANCHANNEL_FULL_REQUEST, 1), + CLANSETTINGS_FULL_REQUEST(GameClientProtId.CLANSETTINGS_FULL_REQUEST, 1), + CLANCHANNEL_KICKUSER(GameClientProtId.CLANCHANNEL_KICKUSER, Prot.VAR_BYTE), + AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL( + GameClientProtId.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL, + Prot.VAR_BYTE, + ), + AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL(GameClientProtId.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL, Prot.VAR_BYTE), + + // Socials + FRIENDLIST_ADD(GameClientProtId.FRIENDLIST_ADD, Prot.VAR_BYTE), + FRIENDLIST_DEL(GameClientProtId.FRIENDLIST_DEL, Prot.VAR_BYTE), + IGNORELIST_ADD(GameClientProtId.IGNORELIST_ADD, Prot.VAR_BYTE), + IGNORELIST_DEL(GameClientProtId.IGNORELIST_DEL, Prot.VAR_BYTE), + + // Messaging + MESSAGE_PUBLIC(GameClientProtId.MESSAGE_PUBLIC, Prot.VAR_BYTE), + MESSAGE_PRIVATE(GameClientProtId.MESSAGE_PRIVATE, Prot.VAR_SHORT), + + // Misc. user packets + MOVE_GAMECLICK(GameClientProtId.MOVE_GAMECLICK, Prot.VAR_BYTE), + MOVE_MINIMAPCLICK(GameClientProtId.MOVE_MINIMAPCLICK, Prot.VAR_BYTE), + CLIENT_CHEAT(GameClientProtId.CLIENT_CHEAT, Prot.VAR_BYTE), + SET_CHATFILTERSETTINGS(GameClientProtId.SET_CHATFILTERSETTINGS, 3), + CLICKWORLDMAP(GameClientProtId.CLICKWORLDMAP, 4), + EXIT_FREECAM(GameClientProtId.EXIT_FREECAM, 0), + CLOSE_MODAL(GameClientProtId.CLOSE_MODAL, 0), + TELEPORT(GameClientProtId.TELEPORT, 9), + BUG_REPORT(GameClientProtId.BUG_REPORT, Prot.VAR_SHORT), + SEND_SNAPSHOT(GameClientProtId.SEND_SNAPSHOT, Prot.VAR_BYTE), + HISCORE_REQUEST(GameClientProtId.HISCORE_REQUEST, Prot.VAR_BYTE), + IF_CRMVIEW_OP(GameClientProtId.IF_CRMVIEW_OP, 22), + UPDATE_PLAYER_MODEL_V2(GameClientProtId.UPDATE_PLAYER_MODEL_V2, 26), + + // Misc. client packets + CONNECTION_TELEMETRY(GameClientProtId.CONNECTION_TELEMETRY, Prot.VAR_BYTE), + SEND_PING_REPLY(GameClientProtId.SEND_PING_REPLY, 10), + DETECT_MODIFIED_CLIENT(GameClientProtId.DETECT_MODIFIED_CLIENT, 4), + REFLECTION_CHECK_REPLY(GameClientProtId.REFLECTION_CHECK_REPLY, Prot.VAR_BYTE), + NO_TIMEOUT(GameClientProtId.NO_TIMEOUT, 0), + IDLE(GameClientProtId.IDLE, 0), + MAP_BUILD_COMPLETE(GameClientProtId.MAP_BUILD_COMPLETE, 0), + MEMBERSHIP_PROMOTION_ELIGIBILITY(GameClientProtId.MEMBERSHIP_PROMOTION_ELIGIBILITY, 2), + SOUND_JINGLEEND(GameClientProtId.SOUND_JINGLEEND, 4), + WINDOW_STATUS(GameClientProtId.WINDOW_STATUS, 5), + SET_HEADING(GameClientProtId.SET_HEADING, 1), + RSEVEN_STATUS(GameClientProtId.RSEVEN_STATUS, 1), +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt new file mode 100644 index 000000000..07a0e70da --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt @@ -0,0 +1,105 @@ +package net.rsprox.protocol.v240.game.incoming.decoder.prot + +internal object GameClientProtId { + const val OPNPC6 = 0 + const val SEND_PING_REPLY = 1 + const val CLANSETTINGS_FULL_REQUEST = 2 + const val OPPLAYER2 = 3 + const val IDLE = 4 + const val EXIT_FREECAM = 5 + const val EVENT_NATIVE_MOUSE_MOVE = 6 + const val OPOBJ3_V2 = 7 + const val EVENT_CAMERA_POSITION = 8 + const val IGNORELIST_DEL = 9 + const val WINDOW_STATUS = 10 + const val REFLECTION_CHECK_REPLY = 12 + const val OPNPC2_V2 = 13 + const val OPWORLDENTITY1 = 14 + const val OPLOC4_V2 = 15 + const val EVENT_MOUSE_SCROLL = 16 + const val HISCORE_REQUEST = 17 + const val OPNPC3_V2 = 19 + const val FRIENDCHAT_JOIN_LEAVE = 20 + const val OPPLAYER7 = 22 + const val OPNPCU = 23 + const val MAP_BUILD_COMPLETE = 24 + const val RESUME_P_NAMEDIALOG = 26 + const val IF_BUTTONT = 27 + const val FRIENDLIST_ADD = 28 + const val EVENT_APPLET_FOCUS = 29 + const val OPOBJ4_V2 = 31 + const val RESUME_P_OBJDIALOG = 32 + const val DETECT_MODIFIED_CLIENT = 33 + const val CLIENT_CHEAT = 34 + const val EVENT_MOUSE_CLICK_V2 = 35 + const val OPPLAYER4 = 37 + const val CLANCHANNEL_KICKUSER = 38 + const val SOUND_JINGLEEND = 39 + const val IF_SUBOP = 40 + const val OPOBJ5_V2 = 43 + const val SET_HEADING = 44 + const val OPNPC4_V2 = 45 + const val OPOBJ1_V2 = 46 + const val IF_BUTTONX = 47 + const val IF_BUTTOND = 48 + const val TELEPORT = 50 + const val IF_BUTTON = 51 + const val OPLOCU = 52 + const val OPPLAYER8 = 53 + const val EVENT_KEYBOARD = 54 + const val FRIENDCHAT_SETRANK = 55 + const val IF_SCRIPT_TRIGGER = 56 + const val OPPLAYER5 = 57 + const val OPOBJ6 = 58 + const val SET_CHATFILTERSETTINGS = 59 + const val SEND_SNAPSHOT = 60 + const val MEMBERSHIP_PROMOTION_ELIGIBILITY = 61 + const val OPLOCT = 62 + const val RESUME_P_COUNTDIALOG_LONG = 63 + const val RESUME_P_STRINGDIALOG = 64 + const val FRIENDLIST_DEL = 65 + const val EVENT_MOUSE_CLICK_V1 = 66 + const val MOVE_MINIMAPCLICK = 67 + const val MESSAGE_PUBLIC = 69 + const val OPPLAYER6 = 70 + const val OPWORLDENTITYT = 72 + const val OPLOC1_V2 = 73 + const val OPOBJ2_V2 = 74 + const val RESUME_P_COUNTDIALOG = 75 + const val OPOBJT = 76 + const val UPDATE_PLAYER_MODEL_V2 = 77 + const val OPLOC6 = 78 + const val OPPLAYERT = 79 + const val OPWORLDENTITY2 = 80 + const val IGNORELIST_ADD = 82 + const val OPWORLDENTITY4 = 83 + const val AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = 84 + const val OPNPC5_V2 = 85 + const val OPNPCT = 86 + const val OPPLAYERU = 87 + const val NO_TIMEOUT = 89 + const val OPWORLDENTITYU = 90 + const val IF_CRMVIEW_OP = 91 + const val OPPLAYER3 = 92 + const val OPPLAYER1 = 93 + const val CLOSE_MODAL = 95 + const val AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = 96 + const val CONNECTION_TELEMETRY = 97 + const val OPWORLDENTITY6 = 98 + const val CLICKWORLDMAP = 99 + const val OPWORLDENTITY3 = 100 + const val FRIENDCHAT_KICK = 101 + const val OPNPC1_V2 = 102 + const val OPLOC2_V2 = 103 + const val OPLOC3_V2 = 104 + const val RSEVEN_STATUS = 105 + const val OPWORLDENTITY5 = 106 + const val BUG_REPORT = 108 + const val EVENT_MOUSE_MOVE = 110 + const val MESSAGE_PRIVATE = 111 + const val CLANCHANNEL_FULL_REQUEST = 112 + const val OPOBJU = 113 + const val MOVE_GAMECLICK = 114 + const val RESUME_PAUSEBUTTON = 115 + const val OPLOC5_V2 = 116 +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt new file mode 100644 index 000000000..6fbc8b98c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamLookAtCycles +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamLookAtCyclesDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_LOOKAT_CYCLES + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamLookAtCycles { + val cycles = buffer.g2() + val heightRelative = buffer.g1Alt3() == 1 + val x = buffer.g2() + val easing = buffer.g1Alt2() + val z = buffer.g2() + val height = buffer.g2sAlt2() + return CamLookAtCycles( + x, + z, + height, + cycles, + easing, + heightRelative, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt new file mode 100644 index 000000000..7b5773441 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamLookAtV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamLookAtV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_LOOKAT_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamLookAtV2 { + val z = buffer.g2() + val height = buffer.g2Alt2() + val rate2 = buffer.g1() + val rate = buffer.g1Alt3() + val x = buffer.g2Alt1() + return CamLookAtV2( + x, + z, + height, + rate, + rate2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt new file mode 100644 index 000000000..0a6214001 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamLookAtV3 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamLookAtV3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_LOOKAT_V3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamLookAtV3 { + val heightRelative = buffer.g1Alt3() == 1 + val rate = buffer.g1Alt2() + val height = buffer.g2s() + val z = buffer.g2Alt3() + val x = buffer.g2() + val rate2 = buffer.g1Alt3() + return CamLookAtV3( + x, + z, + height, + rate, + rate2, + heightRelative, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamModeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamModeDecoder.kt new file mode 100644 index 000000000..8debaea31 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamModeDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMode +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamModeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MODE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMode { + val mode = buffer.g1() + return CamMode( + mode, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt new file mode 100644 index 000000000..7bb4ff361 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt @@ -0,0 +1,36 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToArcV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamMoveToArcV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MOVETO_ARC_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMoveToArcV2 { + val cycles = buffer.g2Alt3() + val destinationZ = buffer.g2Alt2() + val centerZ = buffer.g2Alt2() + val height = buffer.g2() + val easing = buffer.g1Alt2() + val destinationX = buffer.g2Alt2() + val ignoreTerrain = buffer.g1Alt3() == 1 + val centerX = buffer.g2Alt1() + return CamMoveToArcV2( + centerX, + centerZ, + destinationX, + destinationZ, + height, + cycles, + ignoreTerrain, + easing, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt new file mode 100644 index 000000000..7b7757b93 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToArcV3 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamMoveToArcV3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MOVETO_ARC_V3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMoveToArcV3 { + val centerX = buffer.g2Alt1() + val destinationZ = buffer.g2() + val centerZ = buffer.g2Alt2() + val height = buffer.g2sAlt1() + val ignoreTerrain = buffer.g1Alt1() == 1 + val easing = buffer.g1Alt2() + val destinationX = buffer.g2Alt1() + val heightRelative = buffer.g1Alt1() == 1 + val cycles = buffer.g2Alt2() + return CamMoveToArcV3( + centerX, + centerZ, + destinationX, + destinationZ, + height, + cycles, + ignoreTerrain, + easing, + heightRelative, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt new file mode 100644 index 000000000..10f6e98fd --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToCyclesV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamMoveToCyclesV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MOVETO_CYCLES_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMoveToCyclesV2 { + val cycles = buffer.g2Alt3() + val x = buffer.g2() + val easing = buffer.g1Alt1() + val height = buffer.g2Alt2() + val z = buffer.g2Alt3() + val ignoreTerrain = buffer.g1Alt3() == 1 + return CamMoveToCyclesV2( + x, + z, + height, + cycles, + ignoreTerrain, + easing, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt new file mode 100644 index 000000000..21f3fbc64 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt @@ -0,0 +1,34 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToCyclesV3 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamMoveToCyclesV3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MOVETO_CYCLES_V3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMoveToCyclesV3 { + val ignoreTerrain = buffer.g1() == 1 + val x = buffer.g2Alt2() + val cycles = buffer.g2Alt1() + val easing = buffer.g1Alt2() + val heightRelative = buffer.g1Alt1() == 1 + val z = buffer.g2() + val height = buffer.g2sAlt2() + return CamMoveToCyclesV3( + x, + z, + height, + cycles, + ignoreTerrain, + easing, + heightRelative, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt new file mode 100644 index 000000000..50a317b7e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamMoveToV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MOVETO_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMoveToV2 { + val x = buffer.g2Alt1() + val rate = buffer.g1Alt2() + val height = buffer.g2Alt1() + val rate2 = buffer.g1Alt2() + val z = buffer.g2() + return CamMoveToV2( + x, + z, + height, + rate, + rate2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt new file mode 100644 index 000000000..956d094d8 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamMoveToV3 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamMoveToV3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_MOVETO_V3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamMoveToV3 { + val z = buffer.g2() + val heightRelative = buffer.g1() == 1 + val rate = buffer.g1() + val height = buffer.g2sAlt2() + val x = buffer.g2Alt1() + val rate2 = buffer.g1Alt1() + return CamMoveToV3( + x, + z, + height, + rate, + rate2, + heightRelative, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamResetDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamResetDecoder.kt new file mode 100644 index 000000000..6f0d1091e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamResetDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamReset +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamResetDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_RESET + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamReset { + return CamReset + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateBy.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateBy.kt new file mode 100644 index 000000000..714bf397d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateBy.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamRotateBy +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamRotateBy : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_ROTATEBY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamRotateBy { + val yAngle = buffer.g2() + val xAngle = buffer.g2() + val duration = buffer.g2() + val function = buffer.g1() + return CamRotateBy( + xAngle, + yAngle, + duration, + function, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt new file mode 100644 index 000000000..48f9e161e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamRotateToCoordinateV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamRotateToCoordinateV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_ROTATETO_COORDINATE_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamRotateToCoordinateV2 { + val cycles = buffer.g2() + val z = buffer.g2() + val height = buffer.g2() + val easing = buffer.g1Alt1() + val x = buffer.g2Alt3() + return CamRotateToCoordinateV2( + x, + z, + height, + cycles, + easing, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV3Decoder.kt new file mode 100644 index 000000000..ec1165bf2 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV3Decoder.kt @@ -0,0 +1,34 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamRotateToCoordinateV3 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamRotateToCoordinateV3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_ROTATETO_COORDINATE_V3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamRotateToCoordinateV3 { + val trackTarget = buffer.g1Alt1() == 1 + val z = buffer.g2Alt1() + val heightRelative = buffer.g1() == 1 + val x = buffer.g2Alt3() + val cycles = buffer.g2Alt1() + val height = buffer.g2sAlt3() + val easing = buffer.g1() + return CamRotateToCoordinateV3( + x, + z, + height, + cycles, + easing, + heightRelative, + trackTarget, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt new file mode 100644 index 000000000..c1627dfef --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToDecoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamRotateTo +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamRotateToDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_ROTATETO + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamRotateTo { + val yAngle = buffer.g2() + val xAngle = buffer.g2() + val duration = buffer.g2() + val function = buffer.g1() + return CamRotateTo( + xAngle, + yAngle, + duration, + function, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt new file mode 100644 index 000000000..b4c3ca9cb --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamShakeDecoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamShake +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamShakeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_SHAKE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamShake { + val type = buffer.g1() + val randomAmount = buffer.g1() + val sineAmount = buffer.g1() + val sineFrequency = buffer.g1() + return CamShake( + type, + randomAmount, + sineAmount, + sineFrequency, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSkyboxDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSkyboxDecoder.kt new file mode 100644 index 000000000..9fd5d2db8 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSkyboxDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamSkybox +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamSkyboxDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_SKYBOX + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamSkybox { + val model = buffer.g4Alt2() + return CamSkybox( + model, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt new file mode 100644 index 000000000..b27685f55 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamSmoothResetDecoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamSmoothReset +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamSmoothResetDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_SMOOTHRESET + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamSmoothReset { + val cameraMoveConstantSpeed = buffer.g1() + val cameraMoveProportionalSpeed = buffer.g1() + val cameraLookConstantSpeed = buffer.g1() + val cameraLookProportionalSpeed = buffer.g1() + return CamSmoothReset( + cameraMoveConstantSpeed, + cameraMoveProportionalSpeed, + cameraLookConstantSpeed, + cameraLookProportionalSpeed, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt new file mode 100644 index 000000000..bd474fb88 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV3Decoder.kt @@ -0,0 +1,37 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamTargetV3 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class CamTargetV3Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_TARGET_V3 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamTargetV3 { + val type = buffer.g1() + var worldEntityIndex = buffer.g2s() + // 237 made toplevel/root world into id 0 + // but because our transcriber handles all revisions, we need it to be a uniform value + // within logic processing. + if (worldEntityIndex == 0) { + worldEntityIndex = -1 + } + val targetIndex = buffer.g2() + return CamTargetV3( + when (type) { + 0 -> CamTargetV3.PlayerCamTarget(worldEntityIndex, if (targetIndex == 65535) -1 else targetIndex) + 1 -> CamTargetV3.NpcCamTarget(worldEntityIndex, if (targetIndex == 65535) -1 else targetIndex) + 2 -> CamTargetV3.WorldEntityTarget(worldEntityIndex, if (targetIndex == 65535) -1 else targetIndex) + else -> throw IllegalStateException("Unknown type: $type") + }, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV4Decoder.kt new file mode 100644 index 000000000..0af3bbf05 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamTargetV4Decoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.camera.CamTargetV4 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamTargetV4Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_TARGET_V4 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamTargetV4 { + val value = buffer.g4() + val type = buffer.g1Alt2() + return CamTargetV4( + when (type) { + 0 -> CamTargetV4.PlayerCamTarget(if (value == 65535) -1 else value) + 1 -> CamTargetV4.NpcCamTarget(if (value == 65535) -1 else value) + 2 -> CamTargetV4.WorldEntityTarget(if (value == 65535) -1 else value) + 3 -> CamTargetV4.CoordGridTarget(CoordGrid(value)) + else -> throw IllegalStateException("Unknown type: $type") + }, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt new file mode 100644 index 000000000..6c677be41 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.CamUnlock +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class CamUnlockDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CAM_UNLOCK + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): CamUnlock { + val unlock = buffer.g1() == 1 + return CamUnlock( + unlock, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt new file mode 100644 index 000000000..363a8db15 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/OculusSyncDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.camera.OculusSync +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class OculusSyncDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OCULUS_SYNC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): OculusSync { + val value = buffer.g4() + return OculusSync(value) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt new file mode 100644 index 000000000..023f5468c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelDeltaDecoder.kt @@ -0,0 +1,111 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.ClanChannelDelta +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ClanChannelDeltaDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CLANCHANNEL_DELTA + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanChannelDelta { + val clanType = buffer.g1() + val clanHash = buffer.g8() + val updateNum = buffer.g8() + val events = + buildList { + while (buffer.isReadable) { + when (val opcode = buffer.g1()) { + 0 -> break + 1 -> { + buffer.skipRead(1) + // TODO: Should name be nullable? + val name = buffer.gjstrnull() ?: "" + val world = buffer.g2() + val rank = buffer.g1() + add( + ClanChannelDelta.ClanChannelDeltaAddUserEvent( + name, + world, + rank, + ), + ) + } + 2 -> { + val index = buffer.g2() + val rank = buffer.g1() + val world = buffer.g2() + buffer.skipRead(8) + val name = buffer.gjstr() + add( + ClanChannelDelta.ClanChannelDeltaUpdateUserDetailsEvent( + index, + name, + rank, + world, + ), + ) + } + 3 -> { + val index = buffer.g2() + buffer.skipRead(1) + buffer.skipRead(1) + add( + ClanChannelDelta.ClanChannelDeltaDeleteUserEvent( + index, + ), + ) + } + 4 -> { + val name = buffer.gjstrnull() + if (name != null) { + buffer.skipRead(1) + val talkRank = buffer.g1() + val kickRank = buffer.g1() + add( + ClanChannelDelta.ClanChannelDeltaUpdateBaseSettingsEvent( + name, + talkRank, + kickRank, + ), + ) + } else { + add(ClanChannelDelta.ClanChannelDeltaUpdateBaseSettingsEvent()) + } + } + 5 -> { + buffer.skipRead(1) + val index = buffer.g2() + val rank = buffer.g1() + val world = buffer.g2() + buffer.skipRead(8) + val name = buffer.gjstr() + buffer.skipRead(1) + add( + ClanChannelDelta.ClanChannelDeltaUpdateUserDetailsV2Event( + index, + name, + rank, + world, + ), + ) + } + else -> throw IllegalStateException("Unknown clanchannel delta update: $opcode") + } + } + } + return ClanChannelDelta( + clanType, + clanHash, + updateNum, + events, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt new file mode 100644 index 000000000..31b6b1749 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanChannelFullDecoder.kt @@ -0,0 +1,89 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.Base37 +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.ClanChannelFull +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ClanChannelFullDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CLANCHANNEL_FULL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanChannelFull { + val clanType = buffer.g1() + if (!buffer.isReadable) { + return ClanChannelFull( + clanType, + ClanChannelFull.ClanChannelFullLeaveUpdate, + ) + } + val flags = buffer.g1() + val version = + if (flags and ClanChannelFull.FLAG_HAS_VERSION != 0) { + buffer.g1() + } else { + ClanChannelFull.DEFAULT_OLDSCHOOL_VERSION + } + val clanHash = buffer.g8() + val updateNum = buffer.g8() + val clanName = buffer.gjstr() + val discardedBoolean = buffer.gboolean() + val kickRank = buffer.g1() + val talkRank = buffer.g1() + val memberCount = buffer.g2() + val base37 = flags and ClanChannelFull.FLAG_USE_BASE_37_NAMES != 0 + val displayNames = flags and ClanChannelFull.FLAG_USE_DISPLAY_NAMES != 0 + check(base37 || displayNames) { + "Unexpected behavior: Names not included in packet." + } + val members = + buildList { + for (i in 0..= 3) { + buffer.gboolean() + } else { + false + } + add( + ClanChannelFull.ClanMember( + checkNotNull(name), + rank, + world, + discardedMemberBoolean, + ), + ) + } + } + return ClanChannelFull( + clanType, + ClanChannelFull.ClanChannelFullJoinUpdate( + clanHash, + updateNum, + clanName, + discardedBoolean, + kickRank, + talkRank, + members, + version, + base37, + ), + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt new file mode 100644 index 000000000..ceee32e65 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsDeltaDecoder.kt @@ -0,0 +1,202 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.ClanSettingsDelta +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ClanSettingsDeltaDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CLANSETTINGS_DELTA + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanSettingsDelta { + val clanType = buffer.g1() + val owner = buffer.g8() + val updateNum = buffer.g4() + val updates = + buildList { + while (buffer.isReadable) { + when (val opcode = buffer.g1()) { + 0 -> break + 1 -> { + val hashOpcode = buffer.g1() + val hash = + if (hashOpcode != 0xFF) { + buffer.readerIndex(buffer.readerIndex() - 1) + buffer.g8() + } else { + -1L + } + val name = buffer.gjstrnull() + add( + ClanSettingsDelta.ClanSettingsDeltaAddMemberV1Update( + hash, + name, + ), + ) + } + 2 -> { + val index = buffer.g2() + val rank = buffer.g1() + add( + ClanSettingsDelta.ClanSettingsDeltaSetMemberRankUpdate( + index, + rank, + ), + ) + } + 3 -> { + val hashOpcode = buffer.g1() + val hash = + if (hashOpcode != 0xFF) { + buffer.readerIndex(buffer.readerIndex() - 1) + buffer.g8() + } else { + -1L + } + val name = buffer.gjstrnull() + add( + ClanSettingsDelta.ClanSettingsDeltaAddBannedUpdate( + hash, + name, + ), + ) + } + 4 -> { + val allowUnaffined = buffer.g1() == 1 + val talkRank = buffer.g1() + val kickRank = buffer.g1() + val lootshareRank = buffer.g1() + val coinshareRank = buffer.g1() + add( + ClanSettingsDelta.ClanSettingsDeltaBaseSettingsUpdate( + allowUnaffined, + talkRank, + kickRank, + lootshareRank, + coinshareRank, + ), + ) + } + 5 -> { + val index = buffer.g2() + add(ClanSettingsDelta.ClanSettingsDeltaDeleteMemberUpdate(index)) + } + 6 -> { + val index = buffer.g2() + add(ClanSettingsDelta.ClanSettingsDeltaDeleteBannedUpdate(index)) + } + 7 -> { + val index = buffer.g2() + val value = buffer.g4() + val startBit = buffer.g1() + val endBit = buffer.g1() + add( + ClanSettingsDelta.ClanSettingsDeltaSetMemberExtraInfoUpdate( + index, + value, + startBit, + endBit, + ), + ) + } + 8 -> { + val setting = buffer.g4() + val value = buffer.g4() + add( + ClanSettingsDelta.ClanSettingsDeltaSetIntSettingUpdate( + setting, + value, + ), + ) + } + 9 -> { + val setting = buffer.g4() + val value = buffer.g8() + add( + ClanSettingsDelta.ClanSettingsDeltaSetLongSettingUpdate( + setting, + value, + ), + ) + } + 10 -> { + val setting = buffer.g4() + val value = buffer.gjstr() + add( + ClanSettingsDelta.ClanSettingsDeltaSetStringSettingUpdate( + setting, + value, + ), + ) + } + 11 -> { + val setting = buffer.g4() + val value = buffer.g4() + val startBit = buffer.g1() + val endBit = buffer.g1() + add( + ClanSettingsDelta.ClanSettingsDeltaSetVarbitSettingUpdate( + setting, + value, + startBit, + endBit, + ), + ) + } + 12 -> { + val clanName = buffer.gjstr() + buffer.skipRead(4) + add(ClanSettingsDelta.ClanSettingsDeltaSetClanNameUpdate(clanName)) + } + 13 -> { + val hashOpcode = buffer.g1() + val hash = + if (hashOpcode != 0xFF) { + buffer.readerIndex(buffer.readerIndex() - 1) + buffer.g8() + } else { + -1L + } + val name = buffer.gjstrnull() + val joinRuneDay = buffer.g2() + add( + ClanSettingsDelta.ClanSettingsDeltaAddMemberV2Update( + hash, + name, + joinRuneDay, + ), + ) + } + 14 -> { + val index = buffer.g2() + val muted = buffer.g1() == 1 + add( + ClanSettingsDelta.ClanSettingsDeltaSetMemberMutedUpdate( + index, + muted, + ), + ) + } + 15 -> { + val index = buffer.g2() + add(ClanSettingsDelta.ClanSettingsDeltaSetClanOwnerUpdate(index)) + } + else -> error("Unknown opcode: $opcode") + } + } + } + return ClanSettingsDelta( + clanType, + owner, + updateNum, + updates, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt new file mode 100644 index 000000000..f0d1ec2ef --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/ClanSettingsFullDecoder.kt @@ -0,0 +1,176 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.ClanSettingsFull +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ClanSettingsFullDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CLANSETTINGS_FULL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ClanSettingsFull { + val clanType = buffer.g1() + if (!buffer.isReadable) { + return ClanSettingsFull( + clanType, + ClanSettingsFull.ClanSettingsFullLeaveUpdate, + ) + } + val version = buffer.g1() + val flags = buffer.g1() + val updateNum = buffer.g4() + val creationTime = buffer.g4() + val affinedMemberCount = buffer.g2() + val bannedMemberCount = buffer.g1() + val clanName = buffer.gjstr() + if (version >= 4) { + buffer.skipRead(4) + } + val allowUnaffined = buffer.g1() == 1 + val talkRank = buffer.g1() + val kickRank = buffer.g1() + val lootshareRank = buffer.g1() + val coinshareRank = buffer.g1() + val hasAffinedHashes = flags and ClanSettingsFull.FLAG_HAS_AFFINED_HASHES != 0 + val hasAffinedDisplayNames = flags and ClanSettingsFull.FLAG_HAS_AFFINED_DISPLAY_NAMES != 0 + check(hasAffinedHashes || hasAffinedDisplayNames) { + "Unexpected behavior: No hashes or display names." + } + check(hasAffinedHashes != hasAffinedDisplayNames) { + "Unexpected behavior: Two ways of writing names detected" + } + val affinedMembers = + buildList { + for (i in 0..= 2) { + buffer.g4() + } else { + 0 + } + val joinRuneDay = + if (version >= 5) { + buffer.g2() + } else { + 0 + } + val muted = + if (version >= 6) { + buffer.g1() == 1 + } else { + false + } + if (hasAffinedHashes) { + add( + ClanSettingsFull.AffinedClanMember( + hash, + rank, + extraInfo, + joinRuneDay, + muted, + ), + ) + } else { + add( + ClanSettingsFull.AffinedClanMember( + checkNotNull(displayName), + rank, + extraInfo, + joinRuneDay, + muted, + ), + ) + } + } + } + val bannedMembers = + buildList { + for (i in 0..= 3) { + val settingsCount = buffer.g2() + buildList { + for (i in 0.. { + val value = buffer.g4() + add(ClanSettingsFull.IntClanSetting(id, value)) + } + 1 -> { + val value = buffer.g8() + add(ClanSettingsFull.LongClanSetting(id, value)) + } + 2 -> { + val value = buffer.gjstr() + add(ClanSettingsFull.StringClanSetting(id, value)) + } + else -> { + error("Unknown type: $type") + } + } + } + } + } else { + emptyList() + } + return ClanSettingsFull( + clanType, + ClanSettingsFull.ClanSettingsFullJoinUpdate( + updateNum, + creationTime, + clanName, + allowUnaffined, + talkRank, + kickRank, + lootshareRank, + coinshareRank, + affinedMembers, + bannedMembers, + settings, + hasAffinedHashes, + hasAffinedDisplayNames, + ), + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt new file mode 100644 index 000000000..f28059f4a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelDecoder.kt @@ -0,0 +1,37 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.MessageClanChannel +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MessageClanChannelDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MESSAGE_CLANCHANNEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessageClanChannel { + val clanType = buffer.g1() + val name = buffer.gjstr() + val worldId = buffer.g2() + val worldMessageCounter = buffer.g3() + val chatCrownType = buffer.g1() + val message = huffmanCodec.decode(buffer) + return MessageClanChannel( + clanType, + name, + worldId, + worldMessageCounter, + chatCrownType, + message, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt new file mode 100644 index 000000000..7514d8d37 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/MessageClanChannelSystemDecoder.kt @@ -0,0 +1,33 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.MessageClanChannelSystem +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MessageClanChannelSystemDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MESSAGE_CLANCHANNEL_SYSTEM + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessageClanChannelSystem { + val clanType = buffer.g1() + val worldId = buffer.g2() + val worldMessageCounter = buffer.g3() + val message = huffmanCodec.decode(buffer) + return MessageClanChannelSystem( + clanType, + worldId, + worldMessageCounter, + message, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDecoder.kt new file mode 100644 index 000000000..f6cf6a96d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.VarClan +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class VarClanDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARCLAN + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarClan { + val id = buffer.g2() + val data = ByteArray(buffer.readableBytes()) + buffer.gdata(data) + return VarClan(id, VarClan.UnknownVarClanData(data)) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt new file mode 100644 index 000000000..d42abbb7a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanDisableDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.VarClanDisable +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class VarClanDisableDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARCLAN_DISABLE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarClanDisable { + return VarClanDisable + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt new file mode 100644 index 000000000..f6d0e13bd --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/clan/VarClanEnableDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.clan.VarClanEnable +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class VarClanEnableDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARCLAN_ENABLE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarClanEnable { + return VarClanEnable + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt new file mode 100644 index 000000000..212d99204 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/MessageFriendChannelDecoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.friendchat + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.Base37 +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.friendchat.MessageFriendChannel +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MessageFriendChannelDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MESSAGE_FRIENDCHANNEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessageFriendChannel { + val sender = buffer.gjstr() + val channelName = Base37.decodeWithCase(buffer.g8()) + val worldId = buffer.g2() + val worldMessageCounter = buffer.g3() + val chatCrownType = buffer.g1() + val message = huffmanCodec.decode(buffer) + return MessageFriendChannel( + sender, + channelName, + worldId, + worldMessageCounter, + chatCrownType, + message, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt new file mode 100644 index 000000000..ccf286bc6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/friendchat/UpdateFriendChatChannelFullV2Decoder.kt @@ -0,0 +1,54 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.friendchat + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.Base37 +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.friendchat.UpdateFriendChatChannelFull +import net.rsprox.protocol.game.outgoing.model.friendchat.UpdateFriendChatChannelFullV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateFriendChatChannelFullV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateFriendChatChannelFullV2 { + if (!buffer.isReadable) { + return UpdateFriendChatChannelFullV2(UpdateFriendChatChannelFullV2.LeaveUpdate) + } + val channelOwner = buffer.gjstr() + val channelName = Base37.decodeWithCase(buffer.g8()) + val kickRank = buffer.g1s() + val entryCount = buffer.gSmart1or2null() + val entries = + buildList { + for (i in 0.. { + override val prot: ClientProt = GameServerProt.UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateFriendChatChannelSingleUser { + val name = buffer.gjstr() + val worldId = buffer.g2() + val rank = buffer.g1s() + return if (rank != -128) { + val worldName = buffer.gjstr() + UpdateFriendChatChannelSingleUser( + UpdateFriendChatChannelSingleUser.AddedFriendChatUser( + name, + worldId, + rank, + worldName, + ), + ) + } else { + UpdateFriendChatChannelSingleUser( + UpdateFriendChatChannelSingleUser.RemovedFriendChatUser( + name, + worldId, + ), + ) + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupFullDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupFullDecoder.kt new file mode 100644 index 000000000..dd8798024 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupFullDecoder.kt @@ -0,0 +1,42 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.group + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.cache.api.CacheProvider +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.group.GroupFull +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class GroupFullDecoder( + @Suppress("unused") + private val cache: CacheProvider, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.GROUP_FULL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): GroupFull { + val updates = + buildList { + while (buffer.isReadable) { + val index = buffer.g1() + val id = buffer.gSmart1or2null() + if (id == -1) { + add(GroupFull.GroupDelete(index)) + } else { + val uid = buffer.g8() + val data = ByteArray(buffer.readableBytes()) + buffer.gdata(data) + // TODO: Use cache group definitions to decode group and member variables, + // then continue walking any following add/change updates in this packet. + add(GroupFull.GroupAddChange(index, id, uid, data)) + } + } + } + return GroupFull(updates) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarDecoder.kt new file mode 100644 index 000000000..7578034ce --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarDecoder.kt @@ -0,0 +1,43 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.group + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.group.GroupVar +import net.rsprox.protocol.game.outgoing.model.group.util.GroupVarUpdate +import net.rsprox.protocol.game.outgoing.model.group.util.GroupVariable +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class GroupVarDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.GROUP_VAR + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): GroupVar { + val updates = + buildList { + while (buffer.isReadable) { + val index = buffer.g1() + val packedGroupVar = buffer.g4() + val baseVarType = (packedGroupVar ushr 16) and 0x3 + val variable = + when (baseVarType) { + GroupVarUpdate.INT_BASE_VAR_TYPE -> GroupVariable.IntGroupVariable(buffer.g4()) + GroupVarUpdate.LONG_BASE_VAR_TYPE -> GroupVariable.LongGroupVariable(buffer.g8()) + GroupVarUpdate.STRING_BASE_VAR_TYPE -> GroupVariable.StringGroupVariable(buffer.gjstr()) + else -> { + val data = ByteArray(buffer.readableBytes()) + buffer.gdata(data) + GroupVariable.UnknownGroupVariable(baseVarType, data) + } + } + add(GroupVarUpdate(index, packedGroupVar, variable)) + } + } + return GroupVar(updates) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarIntDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarIntDecoder.kt new file mode 100644 index 000000000..3fbfa7ea1 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarIntDecoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.group + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.group.GroupVarInt +import net.rsprox.protocol.game.outgoing.model.group.util.GroupVarUpdate +import net.rsprox.protocol.game.outgoing.model.group.util.GroupVariable +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class GroupVarIntDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.GROUP_VAR_INT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): GroupVarInt { + val index = buffer.g1() + val packedGroupVar = buffer.g4() + val value = buffer.g4() + return GroupVarInt( + GroupVarUpdate( + index, + packedGroupVar, + GroupVariable.IntGroupVariable(value), + ), + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarLongDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarLongDecoder.kt new file mode 100644 index 000000000..3794c32ac --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/group/GroupVarLongDecoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.group + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.group.GroupVarLong +import net.rsprox.protocol.game.outgoing.model.group.util.GroupVarUpdate +import net.rsprox.protocol.game.outgoing.model.group.util.GroupVariable +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class GroupVarLongDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.GROUP_VAR_LONG + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): GroupVarLong { + val index = buffer.g1() + val packedGroupVar = buffer.g4() + val value = buffer.g8() + return GroupVarLong( + GroupVarUpdate( + index, + packedGroupVar, + GroupVariable.LongGroupVariable(value), + ), + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt new file mode 100644 index 000000000..8bc45620e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getNpcInfoBaseCoord +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_INFO_LARGE_V5 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcInfo { + val activeWorld = session.getActiveWorld() + val world = session.getWorld(activeWorld) + return world.npcInfo.decode( + buffer.buffer, + true, + session.getNpcInfoBaseCoord(), + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt new file mode 100644 index 000000000..50c11c86c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getNpcInfoBaseCoord +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_INFO_SMALL_V5 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcInfo { + val activeWorld = session.getActiveWorld() + val world = session.getWorld(activeWorld) + return world.npcInfo.decode( + buffer.buffer, + false, + session.getNpcInfoBaseCoord(), + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt new file mode 100644 index 000000000..92dba2bfa --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/PlayerInfoDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerInfo +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class PlayerInfoDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.PLAYER_INFO + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): PlayerInfo { + val playerInfo = session.getWorld(session.getActiveWorld()).playerInfo + return playerInfo.decode(buffer.buffer) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt new file mode 100644 index 000000000..8df85d3c7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/SetNpcUpdateOriginDecoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.SetNpcUpdateOrigin +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.session.setNpcInfoBaseCoord +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SetNpcUpdateOriginDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SET_NPC_UPDATE_ORIGIN + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetNpcUpdateOrigin { + val originX = buffer.g1() + val originZ = buffer.g1() + val world = session.getWorld(session.getActiveWorld()) + val coord = + CoordGrid( + world.level, + world.baseX + originX, + world.baseZ + originZ, + ) + session.setNpcInfoBaseCoord(coord) + return SetNpcUpdateOrigin( + originX, + originZ, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt new file mode 100644 index 000000000..e0e092a30 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/WorldEntityInfoV7Decoder.kt @@ -0,0 +1,112 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprox.cache.api.CacheProvider +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfo +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityUpdateType +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.allocateWorld +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt +import net.rsprox.protocol.v240.game.outgoing.model.info.npcinfo.NpcInfoClient +import net.rsprox.protocol.v240.game.outgoing.model.info.playerinfo.PlayerInfoClient +import net.rsprox.protocol.v240.game.outgoing.model.info.worldentityinfo.WorldEntityInfoClient + +internal class WorldEntityInfoV7Decoder( + private val huffmanCodec: HuffmanCodec, + private val cache: CacheProvider, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.WORLDENTITY_INFO_V7 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): WorldEntityInfo { + val activeWorld = session.getActiveWorld() + val world = session.getWorld(activeWorld) + val message = + world.worldEntity.decode( + buffer, + CoordGrid(world.level, world.baseX, world.baseZ), + 7, + ) + for ((index, update) in message.updates) { + when (update) { + is WorldEntityUpdateType.ActiveV2 -> { + } + WorldEntityUpdateType.HighResolutionToLowResolution -> { + } + is WorldEntityUpdateType.LowResolutionToHighResolutionV2 -> { + session.allocateWorld( + index, + PlayerInfoClient( + session.localPlayerIndex, + huffmanCodec, + ), + NpcInfoClient(cache), + WorldEntityInfoClient(), + update.sizeX, + update.sizeZ, + ) + } + WorldEntityUpdateType.Idle -> { + // noop + } + + is WorldEntityUpdateType.ActiveV1 -> { + } + is WorldEntityUpdateType.LowResolutionToHighResolutionV1 -> { + session.allocateWorld( + index, + PlayerInfoClient( + session.localPlayerIndex, + huffmanCodec, + ), + NpcInfoClient(cache), + WorldEntityInfoClient(), + update.sizeX, + update.sizeZ, + ) + } + + is WorldEntityUpdateType.LowResolutionToHighResolutionV3 -> { + session.allocateWorld( + index, + PlayerInfoClient( + session.localPlayerIndex, + huffmanCodec, + ), + NpcInfoClient(cache), + WorldEntityInfoClient(), + update.sizeX, + update.sizeZ, + ) + } + + is WorldEntityUpdateType.ActiveV3 -> { + } + is WorldEntityUpdateType.ExtendedInfoOnly -> { + } + is WorldEntityUpdateType.LowResolutionToHighResolutionV4 -> { + session.allocateWorld( + index, + PlayerInfoClient( + session.localPlayerIndex, + huffmanCodec, + ), + NpcInfoClient(cache), + WorldEntityInfoClient(), + update.sizeX, + update.sizeZ, + ) + } + } + } + return message + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt new file mode 100644 index 000000000..37fbe6bb3 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfClearInv +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfClearInvDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_CLEARINV + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfClearInv { + val combinedId = buffer.gCombinedIdAlt2() + return IfClearInv( + combinedId.interfaceId, + combinedId.componentId, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt new file mode 100644 index 000000000..e1bdc5d5c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfCloseSubDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfCloseSub +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class IfCloseSubDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_CLOSESUB + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfCloseSub { + val combinedId = buffer.gCombinedId() + return IfCloseSub( + combinedId.interfaceId, + combinedId.componentId, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt new file mode 100644 index 000000000..b654b5c2f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfMoveSub +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfMoveSubDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_MOVESUB + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfMoveSub { + val destinationCombinedId = buffer.gCombinedIdAlt1() + val sourceCombinedId = buffer.gCombinedId() + return IfMoveSub( + sourceCombinedId.interfaceId, + sourceCombinedId.componentId, + destinationCombinedId.interfaceId, + destinationCombinedId.componentId, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt new file mode 100644 index 000000000..f0e6878d1 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfOpenSub +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfOpenSubDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_OPENSUB + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfOpenSub { + val interfaceId = buffer.g2Alt3() + val combinedId = buffer.gCombinedIdAlt3() + val type = buffer.g1() + return IfOpenSub( + combinedId.interfaceId, + combinedId.componentId, + interfaceId, + type, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt new file mode 100644 index 000000000..36f513a3a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfOpenTop +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfOpenTopDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_OPENTOP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfOpenTop { + val interfaceId = buffer.g2Alt2() + return IfOpenTop( + interfaceId, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt new file mode 100644 index 000000000..8fe3d0e26 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfResyncV2Decoder.kt @@ -0,0 +1,64 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfResyncV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class IfResyncV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_RESYNC_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfResyncV2 { + val topLevelInterface = buffer.g2() + val subInterfaceCount = buffer.g2() + val subInterfaces = + buildList { + for (i in 0.. { + override val prot: ClientProt = GameServerProt.IF_SETANGLE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetAngle { + val combinedId = buffer.gCombinedIdAlt3() + val zoom = buffer.g2() + val angleX = buffer.g2() + val angleY = buffer.g2Alt3() + return IfSetAngle( + combinedId.interfaceId, + combinedId.componentId, + angleX, + angleY, + zoom, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt new file mode 100644 index 000000000..b6c365028 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetAnim +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetAnimDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETANIM + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetAnim { + val combinedId = buffer.gCombinedIdAlt1() + val anim = buffer.g2sAlt1() + return IfSetAnim( + combinedId.interfaceId, + combinedId.componentId, + anim, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt new file mode 100644 index 000000000..d768a9493 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetColour +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetColourDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETCOLOUR + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetColour { + val colour15BitPacked = buffer.g2() + val combinedId = buffer.gCombinedIdAlt2() + return IfSetColour( + combinedId.interfaceId, + combinedId.componentId, + colour15BitPacked, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt new file mode 100644 index 000000000..beef957e6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetEventsV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetEventsV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETEVENTS_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetEventsV2 { + val end = buffer.g2Alt2() + val events2 = buffer.g4() + val events1 = buffer.g4Alt2() + val start = buffer.g2() + val combinedId = buffer.gCombinedIdAlt3() + return IfSetEventsV2( + combinedId.interfaceId, + combinedId.componentId, + start, + end, + events1, + events2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt new file mode 100644 index 000000000..6b8014a83 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetHide +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetHideDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETHIDE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetHide { + val combinedId = buffer.gCombinedIdAlt3() + val hidden = buffer.g1Alt1() == 1 + return IfSetHide( + combinedId.interfaceId, + combinedId.componentId, + hidden, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt new file mode 100644 index 000000000..3b59b165f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetModelV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetModelV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETMODEL_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetModelV2 { + val model = buffer.g4Alt2() + val combinedId = buffer.gCombinedIdAlt1() + return IfSetModelV2( + combinedId.interfaceId, + combinedId.componentId, + model, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt new file mode 100644 index 000000000..95b3c4256 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetNpcHeadActive +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetNpcHeadActiveDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETNPCHEAD_ACTIVE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetNpcHeadActive { + val index = buffer.g2Alt2() + val combinedId = buffer.gCombinedIdAlt2() + return IfSetNpcHeadActive( + combinedId.interfaceId, + combinedId.componentId, + index, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt new file mode 100644 index 000000000..9117bdbda --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetNpcHead +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetNpcHeadDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETNPCHEAD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetNpcHead { + val combinedId = buffer.gCombinedId() + val npc = buffer.g2Alt3() + return IfSetNpcHead( + combinedId.interfaceId, + combinedId.componentId, + npc, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt new file mode 100644 index 000000000..1a953eeac --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetObject +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetObjectDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETOBJECT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetObject { + val combinedId = buffer.gCombinedIdAlt2() + val obj = buffer.g2Alt2() + val count = buffer.g4() + return IfSetObject( + combinedId.interfaceId, + combinedId.componentId, + obj, + count, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt new file mode 100644 index 000000000..7ecf30200 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerHead +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetPlayerHeadDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETPLAYERHEAD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetPlayerHead { + val combinedId = buffer.gCombinedIdAlt2() + return IfSetPlayerHead( + combinedId.interfaceId, + combinedId.componentId, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt new file mode 100644 index 000000000..babd5fa4d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelBaseColour +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetPlayerModelBaseColourDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_BASECOLOUR + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetPlayerModelBaseColour { + val index = buffer.g1() + val colour = buffer.g1() + val combinedId = buffer.gCombinedId() + return IfSetPlayerModelBaseColour( + combinedId.interfaceId, + combinedId.componentId, + index, + colour, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt new file mode 100644 index 000000000..d598be28d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBodyTypeDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelBodyType +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetPlayerModelBodyTypeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_BODYTYPE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetPlayerModelBodyType { + val combinedId = buffer.gCombinedIdAlt2() + val bodyType = buffer.g1() + return IfSetPlayerModelBodyType( + combinedId.interfaceId, + combinedId.componentId, + bodyType, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt new file mode 100644 index 000000000..de8806b79 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelObjDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelObj +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetPlayerModelObjDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_OBJ + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetPlayerModelObj { + val combinedId = buffer.gCombinedIdAlt2() + val obj = buffer.g4Alt3() + return IfSetPlayerModelObj( + combinedId.interfaceId, + combinedId.componentId, + obj, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt new file mode 100644 index 000000000..f0d0e1bdd --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelSelfDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelSelf +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetPlayerModelSelfDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETPLAYERMODEL_SELF + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetPlayerModelSelf { + val copyObjs = buffer.g1Alt3() == 1 + val combinedId = buffer.gCombinedId() + return IfSetPlayerModelSelf( + combinedId.interfaceId, + combinedId.componentId, + copyObjs, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt new file mode 100644 index 000000000..b54f64a39 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPositionDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPosition +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetPositionDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETPOSITION + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetPosition { + val y = buffer.g2sAlt3() + val combinedId = buffer.gCombinedIdAlt2() + val x = buffer.g2sAlt3() + return IfSetPosition( + combinedId.interfaceId, + combinedId.componentId, + x, + y, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt new file mode 100644 index 000000000..480bf357a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetRotateSpeed +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetRotateSpeedDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETROTATESPEED + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetRotateSpeed { + val ySpeed = buffer.g2() + val xSpeed = buffer.g2Alt2() + val combinedId = buffer.gCombinedIdAlt3() + return IfSetRotateSpeed( + combinedId.interfaceId, + combinedId.componentId, + xSpeed, + ySpeed, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt new file mode 100644 index 000000000..51cd24993 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetScrollPosDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetScrollPos +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetScrollPosDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETSCROLLPOS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetScrollPos { + val combinedId = buffer.gCombinedIdAlt3() + val scrollPos = buffer.g2() + return IfSetScrollPos( + combinedId.interfaceId, + combinedId.componentId, + scrollPos, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt new file mode 100644 index 000000000..d3d69ed4d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetText +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class IfSetTextDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.IF_SETTEXT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): IfSetText { + val text = buffer.gjstr() + val combinedId = buffer.gCombinedIdAlt2() + return IfSetText( + combinedId.interfaceId, + combinedId.componentId, + text, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt new file mode 100644 index 000000000..693f2548d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt @@ -0,0 +1,39 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.inv + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.inv.UpdateInvFull +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateInvFullDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_INV_FULL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateInvFull { + val combinedId = buffer.gCombinedId() + val inventoryId = buffer.g2() + val capacity = buffer.g2() + val objs = + buildList { + for (i in 0..= 0xFF) { + count = buffer.g4Alt3() + } + val id = buffer.g2Alt1() + add(UpdateInvFull.Obj(id - 1, count)) + } + } + return UpdateInvFull( + combinedId.interfaceId, + combinedId.componentId, + inventoryId, + objs, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt new file mode 100644 index 000000000..5ec0e3d94 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvPartialDecoder.kt @@ -0,0 +1,45 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.inv + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprot.protocol.util.gCombinedId +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.inv.UpdateInvPartial +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateInvPartialDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_INV_PARTIAL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateInvPartial { + val combinedId = buffer.gCombinedId() + val inventoryId = buffer.g2() + val objs = + buildList { + while (buffer.isReadable) { + val slot = buffer.gSmart1or2() + val id = buffer.g2() + if (id == 0) { + add(UpdateInvPartial.IndexedObj(slot, -1, 0)) + continue + } + var count = buffer.g1() + if (count >= 0xFF) { + count = buffer.g4() + } + add(UpdateInvPartial.IndexedObj(slot, id - 1, count)) + } + } + return UpdateInvPartial( + combinedId.interfaceId, + combinedId.componentId, + inventoryId, + objs, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt new file mode 100644 index 000000000..864450240 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt @@ -0,0 +1,20 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.inv + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.inv.UpdateInvStopTransmit +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateInvStopTransmitDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_INV_STOPTRANSMIT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateInvStopTransmit { + val inventoryId = buffer.g2Alt2() + return UpdateInvStopTransmit(inventoryId) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutDecoder.kt new file mode 100644 index 000000000..c861d3eac --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.logout + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.logout.Logout +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class LogoutDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOGOUT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): Logout { + return Logout + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt new file mode 100644 index 000000000..bc9dc26a4 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutTransferDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.logout + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.logout.LogoutTransfer +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class LogoutTransferDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOGOUT_TRANSFER + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LogoutTransfer { + val host = buffer.gjstr() + val id = buffer.g2() + val properties = buffer.g4() + return LogoutTransfer( + host, + id, + properties, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt new file mode 100644 index 000000000..d89910c7a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/logout/LogoutWithReasonDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.logout + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.logout.LogoutWithReason +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class LogoutWithReasonDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOGOUT_WITHREASON + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LogoutWithReason { + val reason = buffer.g1() + return LogoutWithReason(reason) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt new file mode 100644 index 000000000..705bc884a --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildRegionV2Decoder.kt @@ -0,0 +1,49 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.map + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.bitbuffer.toBitBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.map.RebuildRegionV2 +import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea +import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class RebuildRegionV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.REBUILD_REGION_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): RebuildRegionV2 { + val zoneZ = buffer.g2() + val zoneX = buffer.g2() + val reload = buffer.g1Alt1() == 1 + + @Suppress("UnusedVariable", "unused") + val distinctMapsquareCount = buffer.g2() + val buildArea = BuildArea() + buffer.buffer.toBitBuf().use { bitBuf -> + for (level in 0..<4) { + for (x in 0..<13) { + for (z in 0..<13) { + val exists = bitBuf.gBits(1) == 1 + val value = if (exists) bitBuf.gBits(26) else -1 + buildArea[level, x, z] = RebuildRegionZone(value) + } + } + } + } + val world = session.getWorld(-1) + world.baseX = (zoneX - 6) * 8 + world.baseZ = (zoneZ - 6) * 8 + return RebuildRegionV2( + zoneX, + zoneZ, + reload, + buildArea, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt new file mode 100644 index 000000000..8bf6af2db --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/RebuildWorldEntityV4Decoder.kt @@ -0,0 +1,52 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.map + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.bitbuffer.toBitBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.map.RebuildWorldEntityV4 +import net.rsprox.protocol.game.outgoing.model.map.util.BuildArea +import net.rsprox.protocol.game.outgoing.model.map.util.RebuildRegionZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class RebuildWorldEntityV4Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.REBUILD_WORLDENTITY_V4 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): RebuildWorldEntityV4 { + val baseX = buffer.g2() + val baseZ = buffer.g2() + + @Suppress("UnusedVariable", "unused") + val distinctMapsquareCount = buffer.g2() + val world = session.getWorld(session.getActiveWorld()) + val width = world.sizeX / 8 + val length = world.sizeZ / 8 + val buildArea = BuildArea(4, width, length) + buffer.buffer.toBitBuf().use { bitBuf -> + for (level in 0..<4) { + for (x in 0.. { + override val prot: ClientProt = GameServerProt.RECONNECT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): Reconnect { + val playerInfoInitBlock = + buffer.buffer + .toBitBuf() + .use { bitBuf -> + val localPlayerAbsolutePosition = bitBuf.gBits(30) + val lowResolutionPositions = IntArray(2048) + for (i in 1.. { + override val prot: ClientProt = GameServerProt.REBUILD_NORMAL_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): StaticRebuildMessageV2 { + val playerInfoInitBlock = + if (buffer.isReadable(MINIMUM_REBUILD_LOGIN_CAPACITY)) { + buffer.buffer + .toBitBuf() + .use { bitBuf -> + val localPlayerAbsolutePosition = bitBuf.gBits(30) + val lowResolutionPositions = IntArray(2048) + for (i in 1.. { + override val prot: ClientProt = GameServerProt.HIDELOCOPS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): HideLocOps { + val hidden = buffer.gboolean() + return HideLocOps(hidden) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt new file mode 100644 index 000000000..d57a2ff76 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideNpcOpsDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.HideNpcOps +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class HideNpcOpsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.HIDENPCOPS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): HideNpcOps { + val hidden = buffer.gboolean() + return HideNpcOps(hidden) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt new file mode 100644 index 000000000..8d838f359 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HideObjOpsDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.HideObjOps +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class HideObjOpsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.HIDEOBJOPS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): HideObjOps { + val hidden = buffer.gboolean() + return HideObjOps(hidden) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt new file mode 100644 index 000000000..6d1d9c297 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HintArrowDecoder.kt @@ -0,0 +1,55 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.HintArrow +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class HintArrowDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.HINT_ARROW + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): HintArrow { + return when (val type = buffer.g1()) { + 0 -> { + buffer.skipRead(5) + HintArrow(HintArrow.ResetHintArrow) + } + 1 -> { + val index = buffer.g2() + buffer.skipRead(3) + HintArrow(HintArrow.NpcHintArrow(index)) + } + 10 -> { + val index = buffer.g2() + buffer.skipRead(3) + HintArrow(HintArrow.PlayerHintArrow(index)) + } + 11 -> { + val index = buffer.g2() + val height = buffer.g3() + HintArrow(HintArrow.WorldEntityHintArrow(index, height)) + } + in 2..6 -> { + val x = buffer.g2() + val z = buffer.g2() + val height = buffer.g1() + HintArrow( + HintArrow.TileHintArrow( + x, + z, + height, + type, + ), + ) + } + else -> error("Unknown hint arrow type: $type") + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt new file mode 100644 index 000000000..1d997e63f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/HiscoreReplyDecoder.kt @@ -0,0 +1,78 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.HiscoreReply +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class HiscoreReplyDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.HISCORE_REPLY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): HiscoreReply { + val requestId = buffer.g1() + return when (val responseType = buffer.g1()) { + 0 -> { + val version = buffer.g1() + val statCount = buffer.g1() + val stats = + buildList { + for (i in 0.. { + val reason = buffer.gjstr() + HiscoreReply( + requestId, + HiscoreReply.FailedHiscoreReply(reason), + ) + } + else -> error("Invalid hiscore reply type: $responseType") + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt new file mode 100644 index 000000000..d86020b72 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/MinimapToggleDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.MinimapToggle +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MinimapToggleDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MINIMAP_TOGGLE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MinimapToggle { + val state = buffer.g1() + return MinimapToggle(state) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt new file mode 100644 index 000000000..afcdb76d3 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupEndDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.PacketGroupEnd +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class PacketGroupEndDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.PACKET_GROUP_END + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): PacketGroupEnd { + return PacketGroupEnd(buffer.g2()) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt new file mode 100644 index 000000000..815798676 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/PacketGroupStartDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.PacketGroupStart +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.setBytesConsumed +import net.rsprox.protocol.session.setRemainingBytesInPacketGroup +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class PacketGroupStartDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.PACKET_GROUP_START + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): PacketGroupStart { + val length = buffer.g2s() + session.setRemainingBytesInPacketGroup(length) + session.setBytesConsumed(null) + return PacketGroupStart(length) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt new file mode 100644 index 000000000..cbffc0807 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ReflectionCheckerDecoder.kt @@ -0,0 +1,123 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.ReflectionChecker +import net.rsprox.protocol.reflection.ReflectionCheck +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getReflectionChecks +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Suppress("DuplicatedCode") +@Consistent +internal class ReflectionCheckerDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.REFLECTION_CHECKER + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ReflectionChecker { + val checksCount = buffer.g1() + val id = buffer.g4() + val checks = + buildList { + for (i in 0.. { + val className = buffer.gjstr() + val fieldName = buffer.gjstr() + add( + ReflectionCheck.GetFieldValue( + className, + fieldName, + ), + ) + } + 1 -> { + val className = buffer.gjstr() + val fieldName = buffer.gjstr() + val value = buffer.g4() + add( + ReflectionCheck.SetFieldValue( + className, + fieldName, + value, + ), + ) + } + 2 -> { + val className = buffer.gjstr() + val fieldName = buffer.gjstr() + add( + ReflectionCheck.GetFieldModifiers( + className, + fieldName, + ), + ) + } + 3 -> { + val className = buffer.gjstr() + val methodName = buffer.gjstr() + val parameterClassCount = buffer.g1() + val parameterClasses = + buildList { + for (j in 0.. { + val className = buffer.gjstr() + val methodName = buffer.gjstr() + val parameterClassCount = buffer.g1() + val parameterClasses = + buildList { + for (j in 0.. error("Unknown reflection check type: $opcode") + } + } + } + val old = session.getReflectionChecks().put(id, checks) + check(old == null) { + "Overlapping reflection check: $old/$checks" + } + return ReflectionChecker( + id, + checks, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt new file mode 100644 index 000000000..72b31249d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetAnimsDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.ResetAnims +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ResetAnimsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.RESET_ANIMS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResetAnims { + return ResetAnims + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt new file mode 100644 index 000000000..0f7f3bb33 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ResetInteractionModeDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.ResetInteractionMode +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ResetInteractionModeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.RESET_INTERACTION_MODE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ResetInteractionMode { + val worldId = buffer.g2() + return ResetInteractionMode( + worldId, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt new file mode 100644 index 000000000..9ecaa11cb --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SendPingDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.SendPing +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SendPingDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SEND_PING + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SendPing { + val value1 = buffer.g4() + val value2 = buffer.g4() + return SendPing( + value1, + value2, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt new file mode 100644 index 000000000..c7e10480e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/ServerTickEndDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.ServerTickEnd +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ServerTickEndDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SERVER_TICK_END + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ServerTickEnd { + return ServerTickEnd + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt new file mode 100644 index 000000000..dadc30d5b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetHeatmapEnabledDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.SetHeatmapEnabled +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SetHeatmapEnabledDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SET_HEATMAP_ENABLED + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetHeatmapEnabled { + val enabled = buffer.gboolean() + return SetHeatmapEnabled(enabled) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt new file mode 100644 index 000000000..28acb6cdf --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SetInteractionModeDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.SetInteractionMode +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SetInteractionModeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SET_INTERACTION_MODE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetInteractionMode { + val worldId = buffer.g2() + val tileInteractionMode = buffer.g1() + val entityInteractionMode = buffer.g1() + return SetInteractionMode( + worldId, + tileInteractionMode, + entityInteractionMode, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt new file mode 100644 index 000000000..b23167eaa --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/SiteSettingsDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.SiteSettings +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SiteSettingsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SITE_SETTINGS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SiteSettings { + val settings = buffer.gjstr() + return SiteSettings( + settings, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt new file mode 100644 index 000000000..70b91ff56 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.UpdateRebootTimerV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateRebootTimerV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_REBOOT_TIMER_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateRebootTimerV2 { + val message = buffer.gjstr() + val gameCycles = buffer.g2() + return UpdateRebootTimerV2( + gameCycles, + when { + message.isEmpty() -> UpdateRebootTimerV2.IgnoreUpdateMessage + message == CANCEL -> UpdateRebootTimerV2.ClearUpdateMessage + else -> UpdateRebootTimerV2.SetUpdateMessage(message) + }, + ) + } + + private companion object { + private const val CANCEL: String = "\u0018" + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt new file mode 100644 index 000000000..9be897ee7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateUid192Decoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.crypto.crc.CyclicRedundancyCheck +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.UpdateUid192 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateUid192Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_UID192 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateUid192 { + val data = ByteArray(24) + buffer.gdata(data) + val expectedCrc = buffer.g4() + val crc = CyclicRedundancyCheck.computeCrc32(data) + if (expectedCrc != crc) { + throw IllegalStateException("CRC Mismatch: $expectedCrc != $crc") + } + return UpdateUid192( + data, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt new file mode 100644 index 000000000..c83755363 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UrlOpenDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.client.UrlOpen +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UrlOpenDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.URL_OPEN + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UrlOpen { + // The URL is already decrypted at the proxy level + // Additionally, any sensitive web tokens are erased at the proxy. + val url = buffer.gjstr() + return UrlOpen( + url, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt new file mode 100644 index 000000000..9684d813e --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/AccountFlagsDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.AccountFlags +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class AccountFlagsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.ACCOUNT_FLAGS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): AccountFlags { + val flags = buffer.g8() + return AccountFlags( + flags, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt new file mode 100644 index 000000000..f9782f74b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.ChatFilterSettings +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ChatFilterSettingsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CHAT_FILTER_SETTINGS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ChatFilterSettings { + val publicChatFilter = buffer.g1Alt1() + val tradeChatFilter = buffer.g1Alt3() + return ChatFilterSettings( + publicChatFilter, + tradeChatFilter, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt new file mode 100644 index 000000000..73fa8f60c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/ChatFilterSettingsPrivateChatDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.ChatFilterSettingsPrivateChat +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class ChatFilterSettingsPrivateChatDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.CHAT_FILTER_SETTINGS_PRIVATECHAT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ChatFilterSettingsPrivateChat { + val privateChatFilter = buffer.g1() + return ChatFilterSettingsPrivateChat( + privateChatFilter, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt new file mode 100644 index 000000000..ec7d6a0ea --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/MessageGameDecoder.kt @@ -0,0 +1,40 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.MessageGame +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MessageGameDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MESSAGE_GAME + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessageGame { + val type = buffer.gSmart1or2() + val name = + if (buffer.g1() == 1) { + buffer.gjstr() + } else { + null + } + val message = buffer.gjstr() + return if (name != null) { + MessageGame( + type, + name, + message, + ) + } else { + MessageGame( + type, + message, + ) + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt new file mode 100644 index 000000000..1514e8367 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/RunClientScriptDecoder.kt @@ -0,0 +1,58 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.extensions.gjstr +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.RunClientScript +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class RunClientScriptDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.RUNCLIENTSCRIPT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): RunClientScript { + val types = buffer.gjstr() + val arguments = ArrayDeque() + for (char in types.reversed()) { + when (char) { + 'W' -> { + val length = buffer.gVarInt2() + val array = + IntArray(length) { + buffer.gVarInt2s() + } + arguments.addFirst(array) + } + 'X' -> { + val length = buffer.gVarInt2() + val array = + Array(length) { + buffer.buffer.gjstr() + } + arguments.addFirst(array) + } + 's' -> { + arguments.addFirst(buffer.gjstr()) + } + 'Ï' -> { + arguments.addFirst(buffer.g8()) + } + else -> { + arguments.addFirst(buffer.g4()) + } + } + } + val id = buffer.g4() + return RunClientScript( + id, + types.toCharArray(), + arguments, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt new file mode 100644 index 000000000..770f0385f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetMapFlagV2Decoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.misc.player.SetMapFlagV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class SetMapFlagV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SET_MAP_FLAG_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetMapFlagV2 { + val coordGrid = CoordGrid(buffer.g4()) + return SetMapFlagV2(coordGrid) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt new file mode 100644 index 000000000..d1acec7e0 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/SetPlayerOpDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.SetPlayerOp +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class SetPlayerOpDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SET_PLAYER_OP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetPlayerOp { + val priority = buffer.g1() == 1 + val id = buffer.g1Alt1() + val op = buffer.gjstr() + return SetPlayerOp( + id, + priority, + if (op == "null") null else op, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt new file mode 100644 index 000000000..941e4a6cf --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/TriggerOnDialogAbortDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.TriggerOnDialogAbort +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class TriggerOnDialogAbortDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.TRIGGER_ONDIALOGABORT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): TriggerOnDialogAbort { + return TriggerOnDialogAbort + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt new file mode 100644 index 000000000..aafbcd14f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunEnergyDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateRunEnergy +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateRunEnergyDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_RUNENERGY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateRunEnergy { + val energy = buffer.g2() + return UpdateRunEnergy( + energy, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt new file mode 100644 index 000000000..e3df1b396 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateRunWeightDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateRunWeight +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateRunWeightDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_RUNWEIGHT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateRunWeight { + val runweight = buffer.g2s() + return UpdateRunWeight( + runweight, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt new file mode 100644 index 000000000..68081b021 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateStatV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateStatV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_STAT_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateStatV2 { + val invisibleBoostedLevel = buffer.g1() + val currentLevel = buffer.g1() + val stat = buffer.g1Alt1() + val experience = buffer.g4Alt2() + return UpdateStatV2( + stat, + currentLevel, + invisibleBoostedLevel, + experience, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt new file mode 100644 index 000000000..17c86f1f1 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStockMarketSlotDecoder.kt @@ -0,0 +1,47 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateStockMarketSlot +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateStockMarketSlotDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_STOCKMARKET_SLOT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateStockMarketSlot { + val slot = buffer.g1() + return when (val status = buffer.g1()) { + 0 -> { + UpdateStockMarketSlot( + slot, + UpdateStockMarketSlot.ResetStockMarketSlot, + ) + } + else -> { + val obj = buffer.g2() + val price = buffer.g4() + val count = buffer.g4() + val completedCount = buffer.g4() + val completedGold = buffer.g4() + UpdateStockMarketSlot( + slot, + UpdateStockMarketSlot.SetStockMarketSlot( + status, + obj, + price, + count, + completedCount, + completedGold, + ), + ) + } + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt new file mode 100644 index 000000000..d00f7cadc --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateTradingPostDecoder.kt @@ -0,0 +1,57 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.misc.player.UpdateTradingPost +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateTradingPostDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_TRADINGPOST + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateTradingPost { + val reset = buffer.g1() == 0 + if (reset) { + return UpdateTradingPost(UpdateTradingPost.ResetTradingPost) + } + val age = buffer.g8() + val obj = buffer.g2() + val status = buffer.g1() == 1 + val offerCount = buffer.g2() + val offers = + buildList { + for (i in 0.. { + override val prot: ClientProt = GameServerProt.FRIENDLIST_LOADED + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): FriendListLoaded { + return FriendListLoaded + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt new file mode 100644 index 000000000..766f96322 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateDecoder.kt @@ -0,0 +1,35 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.social.MessagePrivate +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MessagePrivateDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MESSAGE_PRIVATE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessagePrivate { + val sender = buffer.gjstr() + val worldId = buffer.g2() + val worldMessageCounter = buffer.g3() + val chatCrownType = buffer.g1() + val message = huffmanCodec.decode(buffer) + return MessagePrivate( + sender, + worldId, + worldMessageCounter, + chatCrownType, + message, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt new file mode 100644 index 000000000..1f25b95ab --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/MessagePrivateEchoDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.social.MessagePrivateEcho +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class MessagePrivateEchoDecoder( + private val huffmanCodec: HuffmanCodec, +) : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MESSAGE_PRIVATE_ECHO + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MessagePrivateEcho { + val recipient = buffer.gjstr() + val message = huffmanCodec.decode(buffer) + return MessagePrivateEcho( + recipient, + message, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt new file mode 100644 index 000000000..373d635af --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateFriendListDecoder.kt @@ -0,0 +1,64 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.social.UpdateFriendList +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateFriendListDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_FRIENDLIST + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateFriendList { + return UpdateFriendList( + buildList { + while (buffer.isReadable) { + val added = buffer.g1() == 1 + val name = buffer.gjstr() + val previousName = buffer.gjstr() + val worldId = buffer.g2() + val rank = buffer.g1() + val properties = buffer.g1() + if (worldId > 0) { + val worldName = buffer.gjstr() + val platform = buffer.g1() + val worldFlags = buffer.g4() + val notes = buffer.gjstr() + add( + UpdateFriendList.OnlineFriend( + added, + name, + previousName, + worldId, + rank, + properties, + notes, + worldName, + platform, + worldFlags, + ), + ) + continue + } + val notes = buffer.gjstr() + add( + UpdateFriendList.OfflineFriend( + added, + name, + previousName, + rank, + properties, + notes, + ), + ) + } + }, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt new file mode 100644 index 000000000..3cd9619e9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/social/UpdateIgnoreListDecoder.kt @@ -0,0 +1,47 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.social + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.social.UpdateIgnoreList +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UpdateIgnoreListDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_IGNORELIST + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateIgnoreList { + return UpdateIgnoreList( + buildList { + while (buffer.isReadable) { + val type = buffer.g1() + val name = buffer.gjstr() + if (type == 4) { + add( + UpdateIgnoreList.RemovedIgnoredEntry( + name, + ), + ) + continue + } + val added = type and 0x1 != 0 + val previousName = buffer.gjstr() + val note = buffer.gjstr() + add( + UpdateIgnoreList.AddedIgnoredEntry( + name, + previousName, + note, + added, + ), + ) + } + }, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStartDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStartDecoder.kt new file mode 100644 index 000000000..2a9281035 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStartDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.AmbientSoundStart +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class AmbientSoundStartDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.AMBIENTSOUND_START + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): AmbientSoundStart { + val fade = buffer.g1Alt1() == 1 + val id = buffer.g2() + return AmbientSoundStart( + id, + fade, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStopDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStopDecoder.kt new file mode 100644 index 000000000..16a49a88d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/AmbientSoundStopDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.AmbientSoundStop +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class AmbientSoundStopDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.AMBIENTSOUND_STOP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): AmbientSoundStop { + val fade = buffer.g1() == 1 + return AmbientSoundStop( + fade, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt new file mode 100644 index 000000000..029b8cdd2 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.MidiJingle +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MidiJingleDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MIDI_JINGLE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MidiJingle { + val lengthInMillis = buffer.g3() + val id = buffer.g2Alt3() + return MidiJingle( + id, + lengthInMillis, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt new file mode 100644 index 000000000..662201fb6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.MidiSongStop +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MidiSongStopDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MIDI_SONG_STOP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MidiSongStop { + val fadeOutDelay = buffer.g2Alt3() + val fadeOutSpeed = buffer.g2Alt3() + return MidiSongStop( + fadeOutDelay, + fadeOutSpeed, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt new file mode 100644 index 000000000..873516109 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt @@ -0,0 +1,30 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.MidiSongV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MidiSongV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MIDI_SONG_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MidiSongV2 { + val fadeInDelay = buffer.g2Alt1() + val fadeOutDelay = buffer.g2() + val id = buffer.g2Alt3() + val fadeInSpeed = buffer.g2() + val fadeOutSpeed = buffer.g2Alt3() + return MidiSongV2( + id, + fadeOutDelay, + fadeOutSpeed, + fadeInDelay, + fadeInSpeed, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt new file mode 100644 index 000000000..a732674c4 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt @@ -0,0 +1,32 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.MidiSongWithSecondary +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MidiSongWithSecondaryDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MIDI_SONG_WITHSECONDARY + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MidiSongWithSecondary { + val primaryId = buffer.g2() + val fadeInDelay = buffer.g2Alt3() + val secondaryId = buffer.g2Alt1() + val fadeOutSpeed = buffer.g2() + val fadeOutDelay = buffer.g2Alt1() + val fadeInSpeed = buffer.g2Alt3() + return MidiSongWithSecondary( + primaryId, + secondaryId, + fadeOutDelay, + fadeOutSpeed, + fadeInDelay, + fadeInSpeed, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt new file mode 100644 index 000000000..efad4a730 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSwapDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.MidiSwap +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MidiSwapDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MIDI_SWAP + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MidiSwap { + val fadeOutSpeed = buffer.g2() + val fadeInDelay = buffer.g2() + val fadeInSpeed = buffer.g2Alt2() + val fadeOutDelay = buffer.g2() + return MidiSwap( + fadeOutDelay, + fadeOutSpeed, + fadeInDelay, + fadeInSpeed, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt new file mode 100644 index 000000000..3c27b4500 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/SynthSoundDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.sound.SynthSound +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SynthSoundDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SYNTH_SOUND + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SynthSound { + val id = buffer.g2() + val loops = buffer.g1() + val delay = buffer.g2() + return SynthSound( + id, + loops, + delay, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt new file mode 100644 index 000000000..e9b5222a2 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.AnimSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class AnimSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.ANIM_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): AnimSpecific { + val delay = buffer.g1Alt2() + val id = buffer.g2Alt1() + return AnimSpecific( + id, + delay, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt new file mode 100644 index 000000000..302702038 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.LocAnimSpecific +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInBuildArea +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class LocAnimSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOC_ANIM_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LocAnimSpecific { + val locProperties = LocProperties(buffer.g1Alt1()) + val id = buffer.g2() + val coordInBuildArea = CoordInBuildArea(buffer.g3Alt1()) + return LocAnimSpecific( + id, + coordInBuildArea, + locProperties, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt new file mode 100644 index 000000000..58c4be2f9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.MapAnimSpecific +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInBuildArea +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MapAnimSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MAP_ANIM_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MapAnimSpecific { + val height = buffer.g1Alt2() + val id = buffer.g2Alt2() + val coordInBuildArea = CoordInBuildArea(buffer.g3Alt2()) + val delay = buffer.g2Alt2() + return MapAnimSpecific( + id, + delay, + height, + coordInBuildArea, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt new file mode 100644 index 000000000..18872e3e2 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.NpcAnimSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcAnimSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_ANIM_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcAnimSpecific { + val delay = buffer.g1Alt2() + val index = buffer.g2Alt2() + val id = buffer.g2() + return NpcAnimSpecific( + index, + id, + delay, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt new file mode 100644 index 000000000..592a3dab0 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.NpcHeadIconSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcHeadIconSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_HEADICON_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcHeadIconSpecific { + val index = buffer.g2Alt2() + val headIconSlot = buffer.g1Alt3() + val spriteIndex = buffer.g2sAlt1() + val spriteGroup = buffer.g4Alt3() + return NpcHeadIconSpecific( + index, + headIconSlot, + spriteGroup, + spriteIndex, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt new file mode 100644 index 000000000..77d937bba --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcSpotAnimSpecificDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.NpcSpotAnimSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcSpotAnimSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_SPOTANIM_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcSpotAnimSpecific { + val slot = buffer.g1Alt1() + val index = buffer.g2() + val id = buffer.g2() + val packed = buffer.g4Alt2() + val height = packed ushr 16 + val delay = packed and 0xFFFF + return NpcSpotAnimSpecific( + index, + id, + slot, + height, + delay, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt new file mode 100644 index 000000000..e22aa9c79 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjAddSpecificDecoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ObjAddSpecific +import net.rsprox.protocol.game.outgoing.model.util.OpFlags +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjAddSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_ADD_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjAddSpecific { + val timeUntilPublic = buffer.g2() + val id = buffer.g2Alt1() + val timeUntilDespawn = buffer.g2Alt1() + val neverBecomesPublic = buffer.g1Alt3() == 1 + val ownershipType = buffer.g1() + val opFlags = OpFlags(buffer.g1Alt2()) + val coordGrid = CoordGrid(buffer.g4Alt2()) + val quantity = buffer.g4Alt3() + return ObjAddSpecific( + id, + quantity, + coordGrid, + opFlags, + timeUntilPublic, + timeUntilDespawn, + ownershipType, + neverBecomesPublic, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt new file mode 100644 index 000000000..3e0e429a4 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ObjCountSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjCountSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_COUNT_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjCountSpecific { + val oldQuantity = buffer.g4Alt1() + val newQuantity = buffer.g4() + val coordGrid = CoordGrid(buffer.g4()) + val id = buffer.g2() + return ObjCountSpecific( + id, + oldQuantity, + newQuantity, + coordGrid, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt new file mode 100644 index 000000000..db89859bb --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt @@ -0,0 +1,37 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ObjCustomiseSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjCustomiseSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_CUSTOMISE_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjCustomiseSpecific { + val model = buffer.g2Alt2() + val retex = buffer.g2s() + val retexIndex = buffer.g2sAlt2() + val quantity = buffer.g4Alt3() + val coordGrid = CoordGrid(buffer.g4()) + val recol = buffer.g2sAlt2() + val id = buffer.g2() + val recolIndex = buffer.g2sAlt3() + return ObjCustomiseSpecific( + id, + quantity, + model, + recolIndex, + recol, + retexIndex, + retex, + coordGrid, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt new file mode 100644 index 000000000..c039cfd81 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjDelSpecificDecoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ObjDelSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjDelSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_DEL_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjDelSpecific { + val id = buffer.g2Alt2() + val quantity = buffer.g4() + val coordGrid = CoordGrid(buffer.g4()) + return ObjDelSpecific( + id, + quantity, + coordGrid, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt new file mode 100644 index 000000000..909e64590 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ObjEnabledOpsSpecific +import net.rsprox.protocol.game.outgoing.model.util.OpFlags +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjEnabledOpsSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_ENABLED_OPS_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjEnabledOpsSpecific { + val id = buffer.g2Alt2() + val opFlags = OpFlags(buffer.g1Alt3()) + val coordGrid = CoordGrid(buffer.g4Alt2()) + return ObjEnabledOpsSpecific( + id, + opFlags, + coordGrid, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt new file mode 100644 index 000000000..bff2b0258 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjUncustomiseSpecificDecoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ObjUncustomiseSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjUncustomiseSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_UNCUSTOMISE_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjUncustomiseSpecific { + val coordGrid = CoordGrid(buffer.g4()) + val quantity = buffer.g4Alt3() + val id = buffer.g2() + return ObjUncustomiseSpecific( + id, + quantity, + coordGrid, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt new file mode 100644 index 000000000..2cfd9ff03 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/PlayerSpotAnimSpecificDecoder.kt @@ -0,0 +1,31 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.specific.PlayerSpotAnimSpecific +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class PlayerSpotAnimSpecificDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.PLAYER_SPOTANIM_SPECIFIC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): PlayerSpotAnimSpecific { + val id = buffer.g2Alt2() + val packed = buffer.g4() + val slot = buffer.g1Alt3() + val index = buffer.g2() + val height = packed ushr 16 + val delay = packed and 0xFFFF + return PlayerSpotAnimSpecific( + index, + id, + slot, + height, + delay, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt new file mode 100644 index 000000000..817df6f98 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ProjAnimSpecificV4Decoder.kt @@ -0,0 +1,43 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.specific.ProjAnimSpecificV4 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ProjAnimSpecificV4Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.PROJANIM_SPECIFIC_V4 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ProjAnimSpecificV4 { + val startTime = buffer.g2Alt2() + val endTime = buffer.g2Alt2() + val startHeight = buffer.g2Alt3() + val endHeight = buffer.g2Alt3() + val angle = buffer.g1Alt3() + val start = CoordGrid(buffer.g4Alt1()) + val progress = buffer.g2Alt3() + val id = buffer.g2Alt1() + val end = CoordGrid(buffer.g4Alt1()) + val sourceIndex = buffer.g3sAlt3() + val targetIndex = buffer.g3s() + return ProjAnimSpecificV4( + id, + startHeight, + endHeight, + startTime, + endTime, + angle, + progress, + start, + sourceIndex, + end, + targetIndex, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt new file mode 100644 index 000000000..8699d10ef --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/unknown/UnknownStringDecoder.kt @@ -0,0 +1,22 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.unknown + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.unknown.UnknownString +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class UnknownStringDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UNKNOWN_STRING + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UnknownString { + val string = buffer.gjstr() + return UnknownString(string) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt new file mode 100644 index 000000000..eca028991 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpLargeDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.varp.VarpLarge +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class VarpLargeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARP_LARGE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarpLarge { + val id = buffer.g2Alt2() + val value = buffer.g4Alt1() + return VarpLarge( + id, + value, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt new file mode 100644 index 000000000..33344194f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpResetDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.varp.VarpReset +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class VarpResetDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARP_RESET + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarpReset { + return VarpReset + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt new file mode 100644 index 000000000..0f658d7f0 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt @@ -0,0 +1,24 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.varp.VarpSmall +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class VarpSmallDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARP_SMALL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarpSmall { + val value = buffer.g1sAlt1() + val id = buffer.g2Alt3() + return VarpSmall( + id, + value, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt new file mode 100644 index 000000000..83e9ee139 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSyncDecoder.kt @@ -0,0 +1,21 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.varp.VarpSync +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class VarpSyncDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.VARP_SYNC + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): VarpSync { + return VarpSync + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt new file mode 100644 index 000000000..00df35420 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/worldentity/SetActiveWorldV2Decoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.worldentity + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.metadata.Consistent +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.worldentity.SetActiveWorldV2 +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.session.setActiveWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +@Consistent +internal class SetActiveWorldV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SET_ACTIVE_WORLD_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SetActiveWorldV2 { + var index = buffer.g2s() + // 237 made toplevel/root world into id 0 + // but because our transcriber handles all revisions, we need it to be a uniform value + // within logic processing. + if (index == 0) { + index = -1 + } + val activeLevel = buffer.g1() + session.setActiveWorld(index, activeLevel) + val world = session.getWorld(index) + world.level = activeLevel + return if (index == -1) { + SetActiveWorldV2(SetActiveWorldV2.RootWorldType(activeLevel)) + } else { + SetActiveWorldV2(SetActiveWorldV2.DynamicWorldType(index, activeLevel)) + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt new file mode 100644 index 000000000..606063c0b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.header + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZoneFullFollows +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateZoneFullFollowsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_ZONE_FULL_FOLLOWS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateZoneFullFollows { + val zoneZ = buffer.g1Alt3() + val zoneX = buffer.g1Alt2() + val level = buffer.g1() + return UpdateZoneFullFollows( + zoneX, + zoneZ, + level, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt new file mode 100644 index 000000000..f86bb39bf --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialEnclosedDecoder.kt @@ -0,0 +1,71 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.header + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.IncomingZoneProt +import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZonePartialEnclosed +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocAddChangeV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocAnimDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocDelDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocMergeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.MapAnimDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.MapProjAnimV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ObjAddDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ObjCountDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ObjCustomiseDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ObjDelDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ObjEnabledOpsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ObjUncustomiseDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ScriptedProjAddDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.ScriptedProjChangeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.SoundAreaDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateZonePartialEnclosedDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_ZONE_PARTIAL_ENCLOSED + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateZonePartialEnclosed { + val level = buffer.g1Alt2() + val zoneZ = buffer.g1Alt1() + val zoneX = buffer.g1Alt1() + val packets = + buildList { + while (buffer.isReadable) { + val index = buffer.g1() + val decoder = IndexedZoneProtDecoder.entries[index] + add(decoder.decoder.decode(buffer, session) as IncomingZoneProt) + } + } + return UpdateZonePartialEnclosed( + zoneX, + zoneZ, + level, + packets, + ) + } + + private enum class IndexedZoneProtDecoder( + val decoder: ProxyMessageDecoder<*>, + ) { + LOC_DEL(LocDelDecoder()), + SCRIPTEDPROJ_CHANGE(ScriptedProjChangeDecoder()), + LOC_MERGE(LocMergeDecoder()), + OBJ_CUSTOMISE(ObjCustomiseDecoder()), + OBJ_COUNT(ObjCountDecoder()), + MAP_ANIM(MapAnimDecoder()), + OBJ_UNCUSTOMISE(ObjUncustomiseDecoder()), + LOC_ADD_CHANGE_V2(LocAddChangeV2Decoder()), + OBJ_ADD(ObjAddDecoder()), + LOC_ANIM(LocAnimDecoder()), + OBJ_DEL(ObjDelDecoder()), + OBJ_ENABLED_OPS(ObjEnabledOpsDecoder()), + SCRIPTEDPROJ_ADD(ScriptedProjAddDecoder()), + MAP_PROJANIM_V2(MapProjAnimV2Decoder()), + SOUND_AREA(SoundAreaDecoder()), + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt new file mode 100644 index 000000000..6d90610f7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.header + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.header.UpdateZonePartialFollows +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class UpdateZonePartialFollowsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.UPDATE_ZONE_PARTIAL_FOLLOWS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): UpdateZonePartialFollows { + val zoneZ = buffer.g1Alt1() + val zoneX = buffer.g1() + val level = buffer.g1Alt2() + return UpdateZonePartialFollows( + zoneX, + zoneZ, + level, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt new file mode 100644 index 000000000..ab3e60b3f --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAddChangeV2Decoder.kt @@ -0,0 +1,45 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.util.OpFlags +import net.rsprox.protocol.game.outgoing.model.zone.payload.LocAddChangeV2 +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class LocAddChangeV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOC_ADD_CHANGE_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LocAddChangeV2 { + val opOverrideCount = buffer.g1Alt1() + val opOverrides: Map? = + if (opOverrideCount > 0) { + buildMap { + for (i in 0.. { + override val prot: ClientProt = GameServerProt.LOC_ANIM + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LocAnim { + val locProperties = LocProperties(buffer.g1()) + val coordInZone = CoordInZone(buffer.g1Alt3()) + val id = buffer.g2Alt3() + return LocAnim( + id, + coordInZone, + locProperties, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt new file mode 100644 index 000000000..1dd7f296d --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt @@ -0,0 +1,26 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.LocDel +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class LocDelDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOC_DEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LocDel { + val locProperties = LocProperties(buffer.g1()) + val coordInZone = CoordInZone(buffer.g1Alt2()) + return LocDel( + coordInZone, + locProperties, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt new file mode 100644 index 000000000..b648c4d35 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt @@ -0,0 +1,42 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.LocMerge +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.LocProperties +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class LocMergeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.LOC_MERGE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): LocMerge { + val minX = buffer.g1s() + val index = buffer.g2Alt1() + val locProperties = LocProperties(buffer.g1()) + val minZ = buffer.g1s() + val id = buffer.g2Alt1() + val end = buffer.g2() + val start = buffer.g2Alt3() + val maxX = buffer.g1sAlt1() + val coordInZone = CoordInZone(buffer.g1Alt3()) + val maxZ = buffer.g1sAlt3() + return LocMerge( + index, + id, + coordInZone, + locProperties, + start, + end, + minX, + minZ, + maxX, + maxZ, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt new file mode 100644 index 000000000..b00d9b7a5 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.MapAnim +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MapAnimDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MAP_ANIM + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MapAnim { + val height = buffer.g1() + val id = buffer.g2Alt1() + val delay = buffer.g2Alt1() + val coordInZone = CoordInZone(buffer.g1()) + return MapAnim( + id, + delay, + height, + coordInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt new file mode 100644 index 000000000..5e8e0d8ba --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt @@ -0,0 +1,44 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.zone.payload.MapProjAnimV2 +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class MapProjAnimV2Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.MAP_PROJANIM_V2 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): MapProjAnimV2 { + val startTime = buffer.g2() + val coordInZone = CoordInZone(buffer.g1()) + val progress = buffer.g2Alt2() + val id = buffer.g2Alt2() + val endTime = buffer.g2Alt1() + val end = CoordGrid(buffer.g4Alt1()) + val endHeight = buffer.g2Alt3() + val sourceIndex = buffer.g3sAlt2() + val angle = buffer.g1Alt2() + val startHeight = buffer.g2() + val targetIndex = buffer.g3s() + return MapProjAnimV2( + id, + startHeight, + endHeight, + startTime, + endTime, + angle, + progress, + sourceIndex, + targetIndex, + coordInZone, + end, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt new file mode 100644 index 000000000..229580074 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.util.OpFlags +import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjAdd +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjAddDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_ADD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjAdd { + val coordInZone = CoordInZone(buffer.g1Alt1()) + val timeUntilPublic = buffer.g2() + val ownershipType = buffer.g1() + val id = buffer.g2Alt2() + val neverBecomesPublic = buffer.g1() == 1 + val opFlags = OpFlags(buffer.g1Alt2()) + val timeUntilDespawn = buffer.g2Alt3() + val quantity = buffer.g4Alt1() + return ObjAdd( + id, + quantity, + coordInZone, + opFlags, + timeUntilPublic, + timeUntilDespawn, + ownershipType, + neverBecomesPublic, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt new file mode 100644 index 000000000..d5de0b97b --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjCount +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjCountDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_COUNT + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjCount { + val oldQuantity = buffer.g4Alt3() + val coordInZone = CoordInZone(buffer.g1Alt1()) + val newQuantity = buffer.g4Alt1() + val id = buffer.g2Alt3() + return ObjCount( + id, + oldQuantity, + newQuantity, + coordInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt new file mode 100644 index 000000000..2bb93c6c7 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt @@ -0,0 +1,38 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjCustomise +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjCustomiseDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_CUSTOMISE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjCustomise { + val model = buffer.g2() + val recolIndex = buffer.g2sAlt1() + val id = buffer.g2Alt1() + val coordInZone = CoordInZone(buffer.g1Alt3()) + val retex = buffer.g2sAlt2() + val quantity = buffer.g4Alt3() + val recol = buffer.g2sAlt3() + val retexIndex = buffer.g2sAlt2() + return ObjCustomise( + id, + quantity, + model, + recolIndex, + recol, + retexIndex, + retex, + coordInZone.xInZone, + coordInZone.zInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt new file mode 100644 index 000000000..e9d99c675 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt @@ -0,0 +1,27 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjDel +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjDelDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_DEL + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjDel { + val id = buffer.g2() + val coordInZone = CoordInZone(buffer.g1()) + val quantity = buffer.g4Alt2() + return ObjDel( + id, + quantity, + coordInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt new file mode 100644 index 000000000..f4d9b02e9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.util.OpFlags +import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjEnabledOps +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjEnabledOpsDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_ENABLED_OPS + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjEnabledOps { + val coordInZone = CoordInZone(buffer.g1Alt1()) + val id = buffer.g2Alt3() + val opFlags = OpFlags(buffer.g1()) + return ObjEnabledOps( + id, + opFlags, + coordInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt new file mode 100644 index 000000000..cfafe74d1 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt @@ -0,0 +1,28 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.ObjUncustomise +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ObjUncustomiseDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.OBJ_UNCUSTOMISE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ObjUncustomise { + val id = buffer.g2() + val quantity = buffer.g4() + val coordInZone = CoordInZone(buffer.g1Alt1()) + return ObjUncustomise( + id, + quantity, + coordInZone.xInZone, + coordInZone.zInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt new file mode 100644 index 000000000..a025ec4e4 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt @@ -0,0 +1,57 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.zone.payload.ScriptedProjAdd +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ScriptedProjAddDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SCRIPTEDPROJ_ADD + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ScriptedProjAdd { + val sourceOffsetX = buffer.g2sAlt1() + val id = buffer.g2() + val targetOffsetZ = buffer.g2s() + val targetCoord = CoordGrid(buffer.g4Alt3()) + val startTime = buffer.g2Alt2() + val sourceHeight = buffer.g2s() + val curveScriptA = buffer.g2Alt1() + val targetIndex = buffer.g3sAlt3() + val slot = buffer.g2() + val endTime = buffer.g2Alt1() + val coordInZone = CoordInZone(buffer.g1()) + val targetOffsetX = buffer.g2s() + val curveScriptH = buffer.g2Alt1() + val sourceOffsetZ = buffer.g2sAlt3() + val targetHeight = buffer.g2sAlt1() + val sourceIndex = buffer.g3sAlt2() + val curveScriptT = buffer.g2Alt1() + return ScriptedProjAdd( + slot, + id, + coordInZone.xInZone, + coordInZone.zInZone, + sourceOffsetX, + sourceOffsetZ, + sourceHeight, + sourceIndex, + targetCoord, + targetOffsetX, + targetOffsetZ, + targetHeight, + targetIndex, + startTime, + endTime, + curveScriptH, + curveScriptA, + curveScriptT, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt new file mode 100644 index 000000000..b7392fb96 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt @@ -0,0 +1,37 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.zone.payload.ScriptedProjChange +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class ScriptedProjChangeDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SCRIPTEDPROJ_CHANGE + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): ScriptedProjChange { + val targetOffsetZ = buffer.g2sAlt1() + val targetHeight = buffer.g2sAlt2() + val targetCoord = CoordGrid(buffer.g4Alt2()) + val targetOffsetX = buffer.g2s() + val targetIndex = buffer.g3sAlt3() + val freezeDuration = buffer.g2Alt1() + val slot = buffer.g2() + val deleteOnFreezeEnd = buffer.g1Alt1() == 1 + return ScriptedProjChange( + slot, + targetCoord, + targetOffsetX, + targetOffsetZ, + targetHeight, + targetIndex, + freezeDuration, + deleteOnFreezeEnd, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt new file mode 100644 index 000000000..39ff8aff9 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/SoundAreaDecoder.kt @@ -0,0 +1,33 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.zone.payload.SoundArea +import net.rsprox.protocol.game.outgoing.model.zone.payload.util.CoordInZone +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class SoundAreaDecoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.SOUND_AREA + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): SoundArea { + val coordInZone = CoordInZone(buffer.g1Alt3()) + val size = buffer.g1Alt2() + val radius = buffer.g1() + val delay = buffer.g1Alt2() + val loops = buffer.g1Alt1() + val id = buffer.g2() + return SoundArea( + id, + delay, + loops, + radius, + size, + coordInZone, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt new file mode 100644 index 000000000..0f2306bdc --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt @@ -0,0 +1,218 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.prot + +import net.rsprot.protocol.ClientProt +import net.rsprot.protocol.Prot +import net.rsprot.protocol.ServerProt + +public enum class GameServerProt( + override val opcode: Int, + override val size: Int, +) : ServerProt, + ClientProt { + // Interface related packets + IF_RESYNC_V2(GameServerProtId.IF_RESYNC_V2, Prot.VAR_SHORT), + IF_OPENTOP(GameServerProtId.IF_OPENTOP, 2), + IF_OPENSUB(GameServerProtId.IF_OPENSUB, 7), + IF_CLOSESUB(GameServerProtId.IF_CLOSESUB, 4), + IF_MOVESUB(GameServerProtId.IF_MOVESUB, 8), + IF_CLEARINV(GameServerProtId.IF_CLEARINV, 4), + + IF_SETEVENTS_V2(GameServerProtId.IF_SETEVENTS_V2, 16), + IF_SETPOSITION(GameServerProtId.IF_SETPOSITION, 8), + IF_SETSCROLLPOS(GameServerProtId.IF_SETSCROLLPOS, 6), + IF_SETROTATESPEED(GameServerProtId.IF_SETROTATESPEED, 8), + IF_SETTEXT(GameServerProtId.IF_SETTEXT, Prot.VAR_SHORT), + IF_SETHIDE(GameServerProtId.IF_SETHIDE, 5), + IF_SETANGLE(GameServerProtId.IF_SETANGLE, 10), + IF_SETOBJECT(GameServerProtId.IF_SETOBJECT, 10), + IF_SETCOLOUR(GameServerProtId.IF_SETCOLOUR, 6), + IF_SETANIM(GameServerProtId.IF_SETANIM, 6), + IF_SETNPCHEAD(GameServerProtId.IF_SETNPCHEAD, 6), + IF_SETNPCHEAD_ACTIVE(GameServerProtId.IF_SETNPCHEAD_ACTIVE, 6), + IF_SETPLAYERHEAD(GameServerProtId.IF_SETPLAYERHEAD, 4), + IF_SETMODEL_V2(GameServerProtId.IF_SETMODEL_V2, 8), + IF_SETPLAYERMODEL_BASECOLOUR(GameServerProtId.IF_SETPLAYERMODEL_BASECOLOUR, 6), + IF_SETPLAYERMODEL_BODYTYPE(GameServerProtId.IF_SETPLAYERMODEL_BODYTYPE, 5), + IF_SETPLAYERMODEL_OBJ(GameServerProtId.IF_SETPLAYERMODEL_OBJ, 8), + IF_SETPLAYERMODEL_SELF(GameServerProtId.IF_SETPLAYERMODEL_SELF, 5), + + // Music-system related packets (excl. zone ones) + MIDI_SONG_V2(GameServerProtId.MIDI_SONG_V2, 10), + MIDI_SONG_WITHSECONDARY(GameServerProtId.MIDI_SONG_WITHSECONDARY, 12), + MIDI_SWAP(GameServerProtId.MIDI_SWAP, 8), + MIDI_SONG_STOP(GameServerProtId.MIDI_SONG_STOP, 4), + MIDI_JINGLE(GameServerProtId.MIDI_JINGLE, 5), + SYNTH_SOUND(GameServerProtId.SYNTH_SOUND, 5), + AMBIENTSOUND_START(GameServerProtId.AMBIENTSOUND_START, 3), + AMBIENTSOUND_STOP(GameServerProtId.AMBIENTSOUND_STOP, 1), + + // Zone header packets + UPDATE_ZONE_FULL_FOLLOWS(GameServerProtId.UPDATE_ZONE_FULL_FOLLOWS, 3), + UPDATE_ZONE_PARTIAL_FOLLOWS(GameServerProtId.UPDATE_ZONE_PARTIAL_FOLLOWS, 3), + UPDATE_ZONE_PARTIAL_ENCLOSED(GameServerProtId.UPDATE_ZONE_PARTIAL_ENCLOSED, Prot.VAR_SHORT), + + // Zone payload packets + LOC_ADD_CHANGE_V2(GameServerProtId.LOC_ADD_CHANGE_V2, -2), + LOC_DEL(GameServerProtId.LOC_DEL, 2), + LOC_ANIM(GameServerProtId.LOC_ANIM, 4), + LOC_MERGE(GameServerProtId.LOC_MERGE, 14), + OBJ_ADD(-1, 14), + OBJ_DEL(-1, 7), + OBJ_COUNT(-1, 11), + OBJ_ENABLED_OPS(-1, 4), + OBJ_CUSTOMISE(-1, 17), + OBJ_UNCUSTOMISE(-1, 7), + MAP_ANIM(GameServerProtId.MAP_ANIM, 6), + + // MAP_PROJANIM_V2 has no packet of its own. It can only be transmitted via the partial enclosed packet. + MAP_PROJANIM_V2(-1, 24), + SOUND_AREA(GameServerProtId.SOUND_AREA, 7), + SCRIPTEDPROJ_ADD(-1, 37), + SCRIPTEDPROJ_CHANGE(-1, 18), + + // Specific packets + PROJANIM_SPECIFIC_V4(GameServerProtId.PROJANIM_SPECIFIC_V4, 27), + MAP_ANIM_SPECIFIC(GameServerProtId.MAP_ANIM_SPECIFIC, 8), + LOC_ANIM_SPECIFIC(GameServerProtId.LOC_ANIM_SPECIFIC, 6), + NPC_HEADICON_SPECIFIC(GameServerProtId.NPC_HEADICON_SPECIFIC, 9), + NPC_SPOTANIM_SPECIFIC(GameServerProtId.NPC_SPOTANIM_SPECIFIC, 9), + NPC_ANIM_SPECIFIC(GameServerProtId.NPC_ANIM_SPECIFIC, 5), + ANIM_SPECIFIC(GameServerProtId.ANIM_SPECIFIC, 3), + PLAYER_SPOTANIM_SPECIFIC(GameServerProtId.PLAYER_SPOTANIM_SPECIFIC, 9), + OBJ_ADD_SPECIFIC(GameServerProtId.OBJ_ADD_SPECIFIC, 17), + OBJ_DEL_SPECIFIC(GameServerProtId.OBJ_DEL_SPECIFIC, 10), + OBJ_ENABLED_OPS_SPECIFIC(GameServerProtId.OBJ_ENABLED_OPS_SPECIFIC, 7), + OBJ_UNCUSTOMISE_SPECIFIC(GameServerProtId.OBJ_UNCUSTOMISE_SPECIFIC, 10), + OBJ_COUNT_SPECIFIC(GameServerProtId.OBJ_COUNT_SPECIFIC, 14), + OBJ_CUSTOMISE_SPECIFIC(GameServerProtId.OBJ_CUSTOMISE_SPECIFIC, 20), + + // Info packets + PLAYER_INFO(GameServerProtId.PLAYER_INFO, Prot.VAR_SHORT), + NPC_INFO_SMALL_V5(GameServerProtId.NPC_INFO_SMALL_V5, Prot.VAR_SHORT), + NPC_INFO_LARGE_V5(GameServerProtId.NPC_INFO_LARGE_V5, Prot.VAR_SHORT), + + SET_NPC_UPDATE_ORIGIN(GameServerProtId.SET_NPC_UPDATE_ORIGIN, 2), + + // World entity packets + SET_ACTIVE_WORLD_V2(GameServerProtId.SET_ACTIVE_WORLD_V2, 3), + WORLDENTITY_INFO_V7(GameServerProtId.WORLDENTITY_INFO_V7, Prot.VAR_SHORT), + + // Map packets + REBUILD_NORMAL_V2(GameServerProtId.REBUILD_NORMAL_V2, Prot.VAR_SHORT), + REBUILD_REGION_V2(GameServerProtId.REBUILD_REGION_V2, Prot.VAR_SHORT), + REBUILD_WORLDENTITY_V4(GameServerProtId.REBUILD_WORLDENTITY_V4, Prot.VAR_SHORT), + + // Varp packets + VARP_SMALL(GameServerProtId.VARP_SMALL, 3), + VARP_LARGE(GameServerProtId.VARP_LARGE, 6), + VARP_RESET(GameServerProtId.VARP_RESET, 0), + VARP_SYNC(GameServerProtId.VARP_SYNC, 0), + + // Camera packets + CAM_SHAKE(GameServerProtId.CAM_SHAKE, 4), + CAM_RESET(GameServerProtId.CAM_RESET, 0), + CAM_SMOOTHRESET(GameServerProtId.CAM_SMOOTHRESET, 4), + CAM_MOVETO_V2(GameServerProtId.CAM_MOVETO_V2, 8), + CAM_MOVETO_V3(GameServerProtId.CAM_MOVETO_V3, 9), + CAM_MOVETO_CYCLES_V2(GameServerProtId.CAM_MOVETO_CYCLES_V2, 10), + CAM_MOVETO_CYCLES_V3(GameServerProtId.CAM_MOVETO_CYCLES_V3, 11), + CAM_MOVETO_ARC_V2(GameServerProtId.CAM_MOVETO_ARC_V2, 14), + CAM_MOVETO_ARC_V3(GameServerProtId.CAM_MOVETO_ARC_V3, 15), + CAM_LOOKAT_V2(GameServerProtId.CAM_LOOKAT_V2, 8), + CAM_LOOKAT_V3(GameServerProtId.CAM_LOOKAT_V3, 9), + CAM_LOOKAT_CYCLES(GameServerProtId.CAM_LOOKAT_CYCLES, 10), + CAM_ROTATETO_COORDINATE_V2(GameServerProtId.CAM_ROTATETO_COORDINATE_V2, 9), + CAM_ROTATETO_COORDINATE_V3(GameServerProtId.CAM_ROTATETO_COORDINATE_V3, 11), + CAM_ROTATEBY(GameServerProtId.CAM_ROTATEBY, 7), + CAM_ROTATETO(GameServerProtId.CAM_ROTATETO, 7), + CAM_MODE(GameServerProtId.CAM_MODE, 1), + CAM_TARGET_V3(GameServerProtId.CAM_TARGET_V3, 5), + CAM_TARGET_V4(GameServerProtId.CAM_TARGET_V4, 5), + OCULUS_SYNC(GameServerProtId.OCULUS_SYNC, 4), + CAM_UNLOCK(GameServerProtId.CAM_UNLOCK, 1), + CAM_SKYBOX(GameServerProtId.CAM_SKYBOX, 4), + + // Group packets + GROUP_FULL(GameServerProtId.GROUP_FULL, Prot.VAR_SHORT), + GROUP_VAR(GameServerProtId.GROUP_VAR, Prot.VAR_SHORT), + GROUP_VAR_INT(GameServerProtId.GROUP_VAR_INT, 9), + GROUP_VAR_LONG(GameServerProtId.GROUP_VAR_LONG, 13), + + // Inventory packets + UPDATE_INV_FULL(GameServerProtId.UPDATE_INV_FULL, Prot.VAR_SHORT), + UPDATE_INV_PARTIAL(GameServerProtId.UPDATE_INV_PARTIAL, Prot.VAR_SHORT), + UPDATE_INV_STOPTRANSMIT(GameServerProtId.UPDATE_INV_STOPTRANSMIT, 2), + + // Social packets + MESSAGE_PRIVATE(GameServerProtId.MESSAGE_PRIVATE, Prot.VAR_SHORT), + MESSAGE_PRIVATE_ECHO(GameServerProtId.MESSAGE_PRIVATE_ECHO, Prot.VAR_SHORT), + FRIENDLIST_LOADED(GameServerProtId.FRIENDLIST_LOADED, 0), + UPDATE_FRIENDLIST(GameServerProtId.UPDATE_FRIENDLIST, Prot.VAR_SHORT), + UPDATE_IGNORELIST(GameServerProtId.UPDATE_IGNORELIST, Prot.VAR_SHORT), + + // Friend chat (old "clans") packets + UPDATE_FRIENDCHAT_CHANNEL_FULL_V2(GameServerProtId.UPDATE_FRIENDCHAT_CHANNEL_FULL_V2, Prot.VAR_SHORT), + UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER(GameServerProtId.UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER, Prot.VAR_BYTE), + MESSAGE_FRIENDCHANNEL(GameServerProtId.MESSAGE_FRIENDCHANNEL, Prot.VAR_BYTE), + + // Clan chat packets + VARCLAN(GameServerProtId.VARCLAN, Prot.VAR_BYTE), + VARCLAN_ENABLE(GameServerProtId.VARCLAN_ENABLE, 0), + VARCLAN_DISABLE(GameServerProtId.VARCLAN_DISABLE, 0), + CLANCHANNEL_FULL(GameServerProtId.CLANCHANNEL_FULL, Prot.VAR_SHORT), + CLANCHANNEL_DELTA(GameServerProtId.CLANCHANNEL_DELTA, Prot.VAR_SHORT), + CLANSETTINGS_FULL(GameServerProtId.CLANSETTINGS_FULL, Prot.VAR_SHORT), + CLANSETTINGS_DELTA(GameServerProtId.CLANSETTINGS_DELTA, Prot.VAR_SHORT), + MESSAGE_CLANCHANNEL(GameServerProtId.MESSAGE_CLANCHANNEL, Prot.VAR_BYTE), + MESSAGE_CLANCHANNEL_SYSTEM(GameServerProtId.MESSAGE_CLANCHANNEL_SYSTEM, Prot.VAR_BYTE), + + // Log out packets + LOGOUT(GameServerProtId.LOGOUT, 0), + LOGOUT_WITHREASON(GameServerProtId.LOGOUT_WITHREASON, 1), + LOGOUT_TRANSFER(GameServerProtId.LOGOUT_TRANSFER, Prot.VAR_BYTE), + + // Misc. player state packets + UPDATE_RUNWEIGHT(GameServerProtId.UPDATE_RUNWEIGHT, 2), + UPDATE_RUNENERGY(GameServerProtId.UPDATE_RUNENERGY, 2), + SET_MAP_FLAG_V2(GameServerProtId.SET_MAP_FLAG_V2, 4), + SET_PLAYER_OP(GameServerProtId.SET_PLAYER_OP, Prot.VAR_BYTE), + UPDATE_STAT_V2(GameServerProtId.UPDATE_STAT_V2, 7), + + // Misc. player packets + RUNCLIENTSCRIPT(GameServerProtId.RUNCLIENTSCRIPT, Prot.VAR_SHORT), + TRIGGER_ONDIALOGABORT(GameServerProtId.TRIGGER_ONDIALOGABORT, 0), + MESSAGE_GAME(GameServerProtId.MESSAGE_GAME, Prot.VAR_BYTE), + CHAT_FILTER_SETTINGS(GameServerProtId.CHAT_FILTER_SETTINGS, 2), + CHAT_FILTER_SETTINGS_PRIVATECHAT(GameServerProtId.CHAT_FILTER_SETTINGS_PRIVATECHAT, 1), + UPDATE_TRADINGPOST(GameServerProtId.UPDATE_TRADINGPOST, Prot.VAR_SHORT), + UPDATE_STOCKMARKET_SLOT(GameServerProtId.UPDATE_STOCKMARKET_SLOT, 20), + ACCOUNT_FLAGS(GameServerProtId.ACCOUNT_FLAGS, 8), + + // Misc. client state packets + HINT_ARROW(GameServerProtId.HINT_ARROW, 6), + RESET_ANIMS(GameServerProtId.RESET_ANIMS, 0), + UPDATE_REBOOT_TIMER_V2(GameServerProtId.UPDATE_REBOOT_TIMER_V2, Prot.VAR_BYTE), + SET_HEATMAP_ENABLED(GameServerProtId.SET_HEATMAP_ENABLED, 1), + MINIMAP_TOGGLE(GameServerProtId.MINIMAP_TOGGLE, 1), + SERVER_TICK_END(GameServerProtId.SERVER_TICK_END, 0), + HIDENPCOPS(GameServerProtId.HIDENPCOPS, 1), + HIDEOBJOPS(GameServerProtId.HIDEOBJOPS, 1), + HIDELOCOPS(GameServerProtId.HIDELOCOPS, 1), + SET_INTERACTION_MODE(GameServerProtId.SET_INTERACTION_MODE, 4), + RESET_INTERACTION_MODE(GameServerProtId.RESET_INTERACTION_MODE, 2), + + // Misc. client packets + URL_OPEN(GameServerProtId.URL_OPEN, Prot.VAR_SHORT), + SITE_SETTINGS(GameServerProtId.SITE_SETTINGS, Prot.VAR_BYTE), + UPDATE_UID192(GameServerProtId.UPDATE_UID192, 28), + REFLECTION_CHECKER(GameServerProtId.REFLECTION_CHECKER, Prot.VAR_SHORT), + SEND_PING(GameServerProtId.SEND_PING, 8), + HISCORE_REPLY(GameServerProtId.HISCORE_REPLY, Prot.VAR_SHORT), + PACKET_GROUP_START(GameServerProtId.PACKET_GROUP_START, 2), + + // Unknown packets + UNKNOWN_STRING(GameServerProtId.UNKNOWN_STRING, Prot.VAR_BYTE), + + PACKET_GROUP_END(0xFE, 0), + RECONNECT(0xFF, Prot.VAR_SHORT), +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt new file mode 100644 index 000000000..3f67f37f6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt @@ -0,0 +1,153 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.prot + +internal object GameServerProtId { + const val MIDI_SONG_STOP = 0 + const val CAM_TARGET_V3 = 1 + const val NPC_INFO_LARGE_V5 = 2 + const val CAM_RESET = 3 + const val NPC_HEADICON_SPECIFIC = 4 + const val CHAT_FILTER_SETTINGS_PRIVATECHAT = 5 + const val SET_PLAYER_OP = 6 + const val IF_OPENSUB = 7 + const val REFLECTION_CHECKER = 8 + const val UPDATE_ZONE_PARTIAL_FOLLOWS = 9 + const val LOC_DEL = 10 + const val VARCLAN = 11 + const val VARP_LARGE = 12 + const val OBJ_COUNT_SPECIFIC = 13 + const val IF_SETROTATESPEED = 14 + const val MESSAGE_PRIVATE_ECHO = 15 + const val IF_SETPLAYERMODEL_BASECOLOUR = 16 + const val IF_SETANGLE = 17 + const val UPDATE_INV_PARTIAL = 18 + const val MESSAGE_PRIVATE = 19 + const val NPC_ANIM_SPECIFIC = 20 + const val HIDELOCOPS = 21 + const val UPDATE_INV_FULL = 22 + const val IF_CLOSESUB = 23 + const val UNKNOWN_STRING = 24 + const val IF_RESYNC_V2 = 25 + const val SET_HEATMAP_ENABLED = 26 + const val UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = 27 + const val PLAYER_INFO = 28 + const val CAM_SMOOTHRESET = 29 + const val LOC_ANIM_SPECIFIC = 30 + const val UPDATE_RUNWEIGHT = 31 + const val SOUND_AREA = 32 + const val LOC_ADD_CHANGE_V2 = 33 + const val LOC_MERGE = 34 + const val MIDI_SONG_V2 = 35 + const val FRIENDLIST_LOADED = 36 + const val UPDATE_REBOOT_TIMER_V2 = 37 + const val CAM_MODE = 38 + const val URL_OPEN = 39 + const val CAM_ROTATETO = 40 + const val OBJ_DEL_SPECIFIC = 41 + const val UPDATE_IGNORELIST = 42 + const val MINIMAP_TOGGLE = 43 + const val VARP_RESET = 44 + const val UPDATE_INV_STOPTRANSMIT = 45 + const val UPDATE_STAT_V2 = 46 + const val SET_ACTIVE_WORLD_V2 = 47 + const val PROJANIM_SPECIFIC_V4 = 48 + const val REBUILD_NORMAL_V2 = 49 + const val HINT_ARROW = 50 + const val CAM_ROTATEBY = 51 + const val OBJ_CUSTOMISE_SPECIFIC = 52 + const val UPDATE_STOCKMARKET_SLOT = 53 + const val UPDATE_ZONE_FULL_FOLLOWS = 54 + const val IF_SETCOLOUR = 55 + const val UPDATE_TRADINGPOST = 56 + const val LOGOUT = 57 + const val LOGOUT_WITHREASON = 58 + const val IF_SETANIM = 59 + const val VARCLAN_DISABLE = 60 + const val MESSAGE_FRIENDCHANNEL = 61 + const val MESSAGE_CLANCHANNEL_SYSTEM = 62 + const val IF_SETHIDE = 63 + const val UPDATE_RUNENERGY = 64 + const val OCULUS_SYNC = 65 + const val RESET_INTERACTION_MODE = 66 + const val SITE_SETTINGS = 67 + const val ACCOUNT_FLAGS = 68 + const val CLANCHANNEL_FULL = 69 + const val OBJ_ENABLED_OPS_SPECIFIC = 70 + const val CLANSETTINGS_DELTA = 71 + const val PLAYER_SPOTANIM_SPECIFIC = 72 + const val HIDEOBJOPS = 73 + const val MESSAGE_GAME = 74 + const val HIDENPCOPS = 75 + const val VARP_SYNC = 76 + const val SYNTH_SOUND = 77 + const val OBJ_ADD_SPECIFIC = 78 + const val SET_INTERACTION_MODE = 79 + const val IF_SETTEXT = 80 + const val CLANSETTINGS_FULL = 81 + const val IF_SETSCROLLPOS = 82 + const val SERVER_TICK_END = 83 + const val IF_SETNPCHEAD = 84 + const val NPC_INFO_SMALL_V5 = 85 + const val MAP_ANIM = 86 + const val CAM_TARGET_V4 = 87 + const val VARCLAN_ENABLE = 88 + const val IF_SETNPCHEAD_ACTIVE = 89 + const val MAP_ANIM_SPECIFIC = 90 + const val LOGOUT_TRANSFER = 91 + const val RESET_ANIMS = 92 + const val PACKET_GROUP_START = 93 + const val IF_CLEARINV = 94 + const val CLANCHANNEL_DELTA = 95 + const val IF_OPENTOP = 96 + const val VARP_SMALL = 97 + const val IF_SETPLAYERMODEL_OBJ = 98 + const val MIDI_SONG_WITHSECONDARY = 99 + const val IF_SETPLAYERMODEL_BODYTYPE = 100 + const val NPC_SPOTANIM_SPECIFIC = 101 + const val IF_SETPOSITION = 102 + const val CAM_SHAKE = 103 + const val OBJ_UNCUSTOMISE_SPECIFIC = 104 + const val UPDATE_ZONE_PARTIAL_ENCLOSED = 105 + const val IF_SETOBJECT = 106 + const val MIDI_SWAP = 107 + const val IF_SETEVENTS_V2 = 108 + const val REBUILD_WORLDENTITY_V4 = 109 + const val LOC_ANIM = 110 + const val UPDATE_FRIENDLIST = 111 + const val UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER = 112 + const val UPDATE_UID192 = 113 + const val RUNCLIENTSCRIPT = 114 + const val SEND_PING = 115 + const val SET_NPC_UPDATE_ORIGIN = 116 + const val TRIGGER_ONDIALOGABORT = 117 + const val MIDI_JINGLE = 118 + const val ANIM_SPECIFIC = 119 + const val IF_SETPLAYERHEAD = 120 + const val IF_SETPLAYERMODEL_SELF = 121 + const val WORLDENTITY_INFO_V7 = 122 + const val IF_MOVESUB = 123 + const val CHAT_FILTER_SETTINGS = 124 + const val REBUILD_REGION_V2 = 125 + const val HISCORE_REPLY = 126 + const val MESSAGE_CLANCHANNEL = 127 + const val CAM_MOVETO_ARC_V3 = 128 + const val CAM_MOVETO_ARC_V2 = 129 + const val CAM_MOVETO_CYCLES_V3 = 130 + const val CAM_UNLOCK = 131 + const val GROUP_FULL = 132 + const val GROUP_VAR_LONG = 133 + const val CAM_MOVETO_CYCLES_V2 = 134 + const val CAM_SKYBOX = 135 + const val GROUP_VAR = 136 + const val CAM_LOOKAT_CYCLES = 137 + const val AMBIENTSOUND_STOP = 138 + const val CAM_LOOKAT_V2 = 139 + const val GROUP_VAR_INT = 140 + const val CAM_ROTATETO_COORDINATE_V2 = 141 + const val IF_SETMODEL_V2 = 142 + const val SET_MAP_FLAG_V2 = 143 + const val CAM_LOOKAT_V3 = 144 + const val AMBIENTSOUND_START = 145 + const val CAM_MOVETO_V2 = 146 + const val CAM_MOVETO_V3 = 147 + const val CAM_ROTATETO_COORDINATE_V3 = 148 +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt new file mode 100644 index 000000000..689e6ffe6 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt @@ -0,0 +1,337 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.prot + +import net.rsprot.compression.HuffmanCodec +import net.rsprot.protocol.ProtRepository +import net.rsprox.cache.api.CacheProvider +import net.rsprox.protocol.MessageDecoderRepository +import net.rsprox.protocol.MessageDecoderRepositoryBuilder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamLookAtCyclesDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamLookAtV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamLookAtV3Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamModeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamMoveToArcV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamMoveToArcV3Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamMoveToCyclesV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamMoveToCyclesV3Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamMoveToV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamMoveToV3Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamResetDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamRotateBy +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamRotateToCoordinateV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamRotateToCoordinateV3Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamRotateToDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamShakeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamSkyboxDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamSmoothResetDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamTargetV3Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamTargetV4Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.CamUnlockDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.camera.OculusSyncDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.ClanChannelDeltaDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.ClanChannelFullDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.ClanSettingsDeltaDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.ClanSettingsFullDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.MessageClanChannelDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.MessageClanChannelSystemDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.VarClanDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.VarClanDisableDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.clan.VarClanEnableDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.friendchat.MessageFriendChannelDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.friendchat.UpdateFriendChatChannelFullV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.friendchat.UpdateFriendChatChannelSingleUserDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupFullDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupVarDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupVarIntDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupVarLongDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.NpcInfoLargeV5Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.NpcInfoSmallV5Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.PlayerInfoDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.SetNpcUpdateOriginDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.WorldEntityInfoV7Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.* +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfClearInvDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfCloseSubDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfMoveSubDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfOpenSubDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfOpenTopDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfResyncV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetAngleDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetAnimDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetColourDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetHideDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetNpcHeadActiveDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetNpcHeadDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetObjectDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetPlayerHeadDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelBaseColourDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelBodyTypeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelObjDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetPlayerModelSelfDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetPositionDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetRotateSpeedDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetScrollPosDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces.IfSetTextDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.inv.UpdateInvFullDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.inv.UpdateInvPartialDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.inv.UpdateInvStopTransmitDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.logout.LogoutDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.logout.LogoutTransferDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.logout.LogoutWithReasonDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.map.RebuildRegionV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.map.RebuildWorldEntityV4Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.map.ReconnectDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.map.StaticRebuildV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.HideLocOpsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.HideNpcOpsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.HideObjOpsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.HintArrowDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.HiscoreReplyDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.MinimapToggleDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.PacketGroupEndDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.PacketGroupStartDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.ReflectionCheckerDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.ResetAnimsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.ResetInteractionModeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.SendPingDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.ServerTickEndDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.SetHeatmapEnabledDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.SetInteractionModeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.SiteSettingsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.UpdateRebootTimerV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.UpdateUid192Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.client.UrlOpenDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.AccountFlagsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.ChatFilterSettingsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.ChatFilterSettingsPrivateChatDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.MessageGameDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.RunClientScriptDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.SetMapFlagV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.SetPlayerOpDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.TriggerOnDialogAbortDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.UpdateRunEnergyDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.UpdateRunWeightDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.UpdateStatV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.UpdateStockMarketSlotDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.misc.player.UpdateTradingPostDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.social.FriendListLoadedDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.social.MessagePrivateDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.social.MessagePrivateEchoDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.social.UpdateFriendListDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.social.UpdateIgnoreListDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.AmbientSoundStartDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.AmbientSoundStopDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.MidiJingleDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.MidiSongStopDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.MidiSongV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.MidiSongWithSecondaryDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.MidiSwapDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.sound.SynthSoundDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.* +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.AnimSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.LocAnimSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.MapAnimSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.NpcAnimSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.NpcHeadIconSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.NpcSpotAnimSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.ObjAddSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.PlayerSpotAnimSpecificDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.specific.ProjAnimSpecificV4Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.unknown.UnknownStringDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp.VarpLargeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp.VarpResetDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp.VarpSmallDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.varp.VarpSyncDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.worldentity.SetActiveWorldV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.header.UpdateZoneFullFollowsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.header.UpdateZonePartialEnclosedDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.header.UpdateZonePartialFollowsDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocAddChangeV2Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocAnimDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocDelDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.LocMergeDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.MapAnimDecoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.zone.payload.SoundAreaDecoder + +internal object ServerMessageDecoderRepository { + @ExperimentalStdlibApi + fun build( + huffmanCodec: HuffmanCodec, + cache: CacheProvider, + ): MessageDecoderRepository { + val protRepository = ProtRepository.of() + val builder = + MessageDecoderRepositoryBuilder( + protRepository, + ).apply { + bind(CamRotateToDecoder()) + bind(CamRotateBy()) + bind(CamRotateToCoordinateV2Decoder()) + bind(CamRotateToCoordinateV3Decoder()) + bind(CamLookAtV2Decoder()) + bind(CamLookAtV3Decoder()) + bind(CamLookAtCyclesDecoder()) + bind(CamModeDecoder()) + bind(CamMoveToArcV2Decoder()) + bind(CamMoveToArcV3Decoder()) + bind(CamMoveToCyclesV2Decoder()) + bind(CamMoveToCyclesV3Decoder()) + bind(CamMoveToV2Decoder()) + bind(CamMoveToV3Decoder()) + bind(CamResetDecoder()) + bind(CamShakeDecoder()) + bind(CamSmoothResetDecoder()) + bind(CamTargetV3Decoder()) + bind(CamTargetV4Decoder()) + bind(OculusSyncDecoder()) + bind(CamSkyboxDecoder()) + bind(CamUnlockDecoder()) + + bind(ClanChannelDeltaDecoder()) + bind(ClanChannelFullDecoder()) + bind(ClanSettingsDeltaDecoder()) + bind(ClanSettingsFullDecoder()) + bind(MessageClanChannelDecoder(huffmanCodec)) + bind(MessageClanChannelSystemDecoder(huffmanCodec)) + bind(VarClanDisableDecoder()) + bind(VarClanEnableDecoder()) + bind(VarClanDecoder()) + bind(GroupFullDecoder(cache)) + bind(GroupVarDecoder()) + bind(GroupVarIntDecoder()) + bind(GroupVarLongDecoder()) + + bind(MessageFriendChannelDecoder(huffmanCodec)) + bind(UpdateFriendChatChannelFullV2Decoder()) + bind(UpdateFriendChatChannelSingleUserDecoder()) + + bind(PlayerInfoDecoder()) + bind(NpcInfoSmallV5Decoder()) + bind(NpcInfoLargeV5Decoder()) + bind(SetNpcUpdateOriginDecoder()) + bind(WorldEntityInfoV7Decoder(huffmanCodec, cache)) + + bind(IfClearInvDecoder()) + bind(IfCloseSubDecoder()) + bind(IfResyncV2Decoder()) + bind(IfMoveSubDecoder()) + bind(IfOpenSubDecoder()) + bind(IfOpenTopDecoder()) + bind(IfSetAngleDecoder()) + bind(IfSetAnimDecoder()) + bind(IfSetColourDecoder()) + bind(IfSetEventsV2Decoder()) + bind(IfSetHideDecoder()) + bind(IfSetModelV2Decoder()) + bind(IfSetNpcHeadActiveDecoder()) + bind(IfSetNpcHeadDecoder()) + bind(IfSetObjectDecoder()) + bind(IfSetPlayerHeadDecoder()) + bind(IfSetPlayerModelBaseColourDecoder()) + bind(IfSetPlayerModelBodyTypeDecoder()) + bind(IfSetPlayerModelObjDecoder()) + bind(IfSetPlayerModelSelfDecoder()) + bind(IfSetPositionDecoder()) + bind(IfSetRotateSpeedDecoder()) + bind(IfSetScrollPosDecoder()) + bind(IfSetTextDecoder()) + + bind(UpdateInvFullDecoder()) + bind(UpdateInvPartialDecoder()) + bind(UpdateInvStopTransmitDecoder()) + + bind(LogoutDecoder()) + bind(LogoutTransferDecoder()) + bind(LogoutWithReasonDecoder()) + + bind(ReconnectDecoder()) + bind(StaticRebuildV2Decoder(huffmanCodec, cache)) + bind(RebuildRegionV2Decoder()) + bind(RebuildWorldEntityV4Decoder()) + + bind(SetHeatmapEnabledDecoder()) + bind(HideLocOpsDecoder()) + bind(HideNpcOpsDecoder()) + bind(HideObjOpsDecoder()) + bind(SetInteractionModeDecoder()) + bind(ResetInteractionModeDecoder()) + bind(HintArrowDecoder()) + bind(HiscoreReplyDecoder()) + bind(MinimapToggleDecoder()) + bind(ReflectionCheckerDecoder()) + bind(ResetAnimsDecoder()) + bind(SendPingDecoder()) + bind(ServerTickEndDecoder()) + bind(UpdateRebootTimerV2Decoder()) + bind(SiteSettingsDecoder()) + bind(UpdateUid192Decoder()) + bind(UrlOpenDecoder()) + bind(PacketGroupStartDecoder()) + bind(PacketGroupEndDecoder()) + + bind(ChatFilterSettingsDecoder()) + bind(ChatFilterSettingsPrivateChatDecoder()) + bind(MessageGameDecoder()) + bind(RunClientScriptDecoder()) + bind(SetMapFlagV2Decoder()) + bind(SetPlayerOpDecoder()) + bind(TriggerOnDialogAbortDecoder()) + bind(UpdateRunEnergyDecoder()) + bind(UpdateRunWeightDecoder()) + bind(UpdateStatV2Decoder()) + bind(UpdateStockMarketSlotDecoder()) + bind(UpdateTradingPostDecoder()) + bind(AccountFlagsDecoder()) + + bind(FriendListLoadedDecoder()) + bind(MessagePrivateEchoDecoder(huffmanCodec)) + bind(MessagePrivateDecoder(huffmanCodec)) + bind(UpdateFriendListDecoder()) + bind(UpdateIgnoreListDecoder()) + + bind(MidiJingleDecoder()) + bind(MidiSongV2Decoder()) + bind(MidiSongStopDecoder()) + bind(MidiSongWithSecondaryDecoder()) + bind(MidiSwapDecoder()) + bind(SynthSoundDecoder()) + bind(AmbientSoundStartDecoder()) + bind(AmbientSoundStopDecoder()) + + bind(LocAnimSpecificDecoder()) + bind(MapAnimSpecificDecoder()) + bind(NpcAnimSpecificDecoder()) + bind(NpcHeadIconSpecificDecoder()) + bind(NpcSpotAnimSpecificDecoder()) + bind(AnimSpecificDecoder()) + bind(PlayerSpotAnimSpecificDecoder()) + bind(ProjAnimSpecificV4Decoder()) + bind(ObjAddSpecificDecoder()) + bind(ObjDelSpecificDecoder()) + bind(ObjCountSpecificDecoder()) + bind(ObjEnabledOpsSpecificDecoder()) + bind(ObjCustomiseSpecificDecoder()) + bind(ObjUncustomiseSpecificDecoder()) + + bind(VarpLargeDecoder()) + bind(VarpResetDecoder()) + bind(VarpSmallDecoder()) + bind(VarpSyncDecoder()) + + bind(SetActiveWorldV2Decoder()) + + bind(UpdateZonePartialEnclosedDecoder()) + bind(UpdateZoneFullFollowsDecoder()) + bind(UpdateZonePartialFollowsDecoder()) + + bind(LocAddChangeV2Decoder()) + bind(LocAnimDecoder()) + bind(LocDelDecoder()) + bind(LocMergeDecoder()) + bind(MapAnimDecoder()) + bind(SoundAreaDecoder()) + + bind(UnknownStringDecoder()) + } + return builder.build() + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt new file mode 100644 index 000000000..1f40af8e1 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -0,0 +1,1035 @@ +package net.rsprox.protocol.v240.game.outgoing.model.info.npcinfo + +import io.netty.buffer.ByteBuf +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.bitbuffer.BitBuf +import net.rsprot.buffer.bitbuffer.toBitBuf +import net.rsprot.buffer.extensions.toJagByteBuf +import net.rsprox.cache.api.CacheProvider +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.exceptions.DecodeError +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.MoveSpeed +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfoDecoder +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcUpdateType +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.BaseAnimationSetExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.BodyCustomisationExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.CombatLevelChangeExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.HeadCustomisationExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.HeadIconCustomisationExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.NameChangeExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.TransformationExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.customisation.ModelCustomisation +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.extendedinfo.customisation.ResetCustomisation +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.EnabledOpsExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExactMoveExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FaceExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FreezeExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Headbar +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HeadbarExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Hit +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitmarkExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SayExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Spotanim +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SpotanimExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.TintingExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.TransparencyExtendedInfo + +@Suppress("DuplicatedCode") +internal class NpcInfoClient( + val cache: CacheProvider, +) : NpcInfoDecoder { + private var deletedNPCCount: Int = 0 + private var deletedNPC = IntArray(1000) + private var npc = arrayOfNulls(65536) + private var transmittedNPCCount = 0 + private var transmittedNPC = IntArray(65536) + private var extraUpdateNPCCount: Int = 0 + private var extraUpdateNPC: IntArray = IntArray(250) + private var cycle = 0 + + private val updates: MutableMap = mutableMapOf() + private val extendedInfoBlocks: MutableMap> = mutableMapOf() + + override fun decode( + buffer: ByteBuf, + large: Boolean, + baseCoord: CoordGrid, + ): NpcInfo { + deletedNPCCount = 0 + extraUpdateNPCCount = 0 + buffer.toBitBuf().use { bitBuffer -> + processHighResolution(bitBuffer) + processLowResolution(large, bitBuffer, baseCoord) + } + processExtendedInfo(buffer.toJagByteBuf()) + for (i in 0..() + for ((index, update) in updates) { + when (update) { + UpdateType.IDLE -> { + // Too spammy, continue + continue + } + UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION -> { + val npc = checkNotNull(npc[index]) + val extendedInfo = this.extendedInfoBlocks[index] ?: emptyList() + result[index] = + NpcUpdateType.LowResolutionToHighResolution( + npc.id, + npc.spawnCycle, + npc.coord.x, + npc.coord.z, + npc.coord.level, + npc.angle, + npc.jump, + extendedInfo, + ) + } + UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION -> { + result[index] = NpcUpdateType.HighResolutionToLowResolution + } + UpdateType.ACTIVE -> { + val npc = checkNotNull(npc[index]) + val extendedInfo = this.extendedInfoBlocks[index] ?: emptyList() + result[index] = + NpcUpdateType.Active( + npc.coord.x, + npc.coord.z, + npc.coord.level, + npc.steps, + npc.moveSpeed, + extendedInfo, + npc.jump, + ) + } + } + } + this.updates.clear() + this.extendedInfoBlocks.clear() + return NpcInfo(result) + } + + private fun processExtendedInfo(buffer: JagByteBuf) { + for (i in 0..() + + this.extendedInfoBlocks[index] = blocks + + if (flag and UNUSED_FLAGS != 0) { + throw IllegalStateException("Unused flag used: $flag!") + } + + if (flag and BODY_CUSTOMISATION_V2 != 0) { + decodeBodyCustomisationV2(npc.id, buffer, blocks) + } + if (flag and LEVEL_CHANGE != 0) { + decodeCombatLevelChange(buffer, blocks) + } + if (flag and HEADICON_CUSTOMISATION != 0) { + decodeHeadiconCustomisation(buffer, blocks) + } + if (flag and OPS != 0) { + decodeEnabledOps(buffer, blocks) + } + if (flag and HITMARKS != 0) { + decodeHitmarks(buffer, blocks) + } + if (flag and EXACT_MOVE != 0) { + decodeExactMove(buffer, blocks) + } + if (flag and BODY_CUSTOMISATION_V3 != 0) { + decodeBodyCustomisationV3(buffer, blocks) + } + if (flag and HEADBARS != 0) { + decodeHeadbars(buffer, blocks) + } + if (flag and SEQUENCE != 0) { + decodeSequence(buffer, blocks) + } + if (flag and SAY != 0) { + decodeSay(buffer, blocks) + } + if (flag and TINTING != 0) { + decodeTinting(buffer, blocks) + } + if (flag and NPC_TRANSPARENCY != 0) { + decodeTransparency(buffer, blocks) + } + if (flag and BAS_CHANGE != 0) { + decodeBaseAnimationSet(buffer, blocks) + } + if (flag and NPC_FREEZE != 0) { + decodeFreeze(buffer, blocks) + } + if (flag and HEAD_CUSTOMISATION != 0) { + decodeHeadCustomisationV2(npc.id, buffer, blocks) + } + if (flag and SPOTANIM != 0) { + decodeSpotanim(buffer, blocks) + } + if (flag and NAME_CHANGE != 0) { + decodeNameChange(buffer, blocks) + } + if (flag and TRANSFORMATION != 0) { + decodeTransformation(buffer, blocks, npc) + } + if (flag and FACING != 0) { + decodeFacing(buffer, blocks) + } + } + } + + private fun decodeBaseAnimationSet( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val flag = buffer.g4Alt1() + val turnLeftAnim = if (flag and 0x1 != 0) buffer.g2() else null + val turnRightAnim = if (flag and 0x2 != 0) buffer.g2Alt3() else null + val walkAnim = if (flag and 0x4 != 0) buffer.g2Alt3() else null + val walkAnimBack = if (flag and 0x8 != 0) buffer.g2Alt1() else null + val walkAnimLeft = if (flag and 0x10 != 0) buffer.g2() else null + val walkAnimRight = if (flag and 0x20 != 0) buffer.g2Alt3() else null + val runAnim = if (flag and 0x40 != 0) buffer.g2Alt3() else null + val runAnimBack = if (flag and 0x80 != 0) buffer.g2Alt3() else null + val runAnimLeft = if (flag and 0x100 != 0) buffer.g2Alt2() else null + val runAnimRight = if (flag and 0x200 != 0) buffer.g2Alt2() else null + val crawlAnim = if (flag and 0x400 != 0) buffer.g2() else null + val crawlAnimBack = if (flag and 0x800 != 0) buffer.g2Alt1() else null + val crawlAnimLeft = if (flag and 0x1000 != 0) buffer.g2Alt2() else null + val crawlAnimRight = if (flag and 0x2000 != 0) buffer.g2Alt1() else null + val readyAnim = if (flag and 0x4000 != 0) buffer.g2() else null + blocks += + BaseAnimationSetExtendedInfo( + turnLeftAnim, + turnRightAnim, + walkAnim, + walkAnimBack, + walkAnimLeft, + walkAnimRight, + runAnim, + runAnimBack, + runAnimLeft, + runAnimRight, + crawlAnim, + crawlAnimBack, + crawlAnimLeft, + crawlAnimRight, + readyAnim, + ) + } + + private fun decodeHitmarks( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val hitCount = buffer.g1Alt1() + val hits = ArrayList(hitCount) + for (i in 0.., + ) { + val headbarCount = buffer.g1Alt2() + val headbars = ArrayList(headbarCount) + for (i in 0.. 0) { + buffer.g1Alt3() + } else { + startFill + } + headbars += + Headbar( + type, + startFill, + endFill, + startTime, + endTime, + ) + } + blocks += HeadbarExtendedInfo(headbars) + } + + private fun decodeSpotanim( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val spotanims = mutableMapOf() + val count = buffer.g1Alt2() + for (i in 0.., + ) { + val id = buffer.g2() + val delay = buffer.g1Alt2() + blocks += SequenceExtendedInfo(id, delay) + } + + private fun decodeCombatLevelChange( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val level = buffer.g4Alt1() + blocks += CombatLevelChangeExtendedInfo(level) + } + + private fun decodeFreeze( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val delay = buffer.g2() + val duration = buffer.g2() + val cancelSequence = buffer.g1Alt2() == 1 + blocks += FreezeExtendedInfo(delay, duration, cancelSequence) + } + + private fun decodeTransparency( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val start = buffer.g2sAlt3() + val end = buffer.g2s() + val startTransparency = buffer.g1sAlt1() + val endTransparency = buffer.g1sAlt2() + val useStartTransparency = buffer.g1Alt2() == 1 + blocks += + TransparencyExtendedInfo( + start, + end, + startTransparency, + endTransparency, + useStartTransparency, + ) + } + + private fun decodeTinting( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val start = buffer.g2Alt1() + val end = buffer.g2Alt2() + val hue = buffer.g1() + val saturation = buffer.g1Alt1() + val lightness = buffer.g1Alt1() + val weight = buffer.g1Alt1() + blocks += + TintingExtendedInfo( + start, + end, + hue, + saturation, + lightness, + weight, + ) + } + + private fun decodeTransformation( + buffer: JagByteBuf, + blocks: MutableList, + npc: Npc, + ) { + val id = buffer.g2Alt3() + blocks += TransformationExtendedInfo(id) + npc.id = id + } + + private fun decodeEnabledOps( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val flag = buffer.g1Alt2() + blocks += EnabledOpsExtendedInfo(flag) + } + + private fun decodeBodyCustomisationV3( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val flag = buffer.g1Alt2() + if (flag and 0x1 != 0) { + blocks += BodyCustomisationExtendedInfo(ResetCustomisation) + return + } + val models = + if (flag and 0x2 != 0) { + val count = buffer.g1Alt1() + val models = ArrayList(count) + for (i in 0..(count) + for (i in 0..(count) + for (i in 0.., + ) { + val flag = buffer.g1() + if (flag and 0x1 != 0) { + blocks += BodyCustomisationExtendedInfo(ResetCustomisation) + return + } + val models = + if (flag and 0x2 != 0) { + val count = buffer.g1() + val models = ArrayList(count) + for (i in 0..(length) + for (i in 0..(length) + for (i in 0.., + ) { + val flag = buffer.g1Alt1() + if (flag and 0x1 != 0) { + blocks += BodyCustomisationExtendedInfo(ResetCustomisation) + return + } + val models = + if (flag and 0x2 != 0) { + val count = buffer.g1Alt3() + val models = ArrayList(count) + for (i in 0..(length) + for (i in 0..(length) + for (i in 0.., + ) { + val text = buffer.gjstr() + blocks += SayExtendedInfo(text) + } + + private fun decodeExactMove( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val deltaX1 = buffer.g1sAlt3() + val deltaZ1 = buffer.g1s() + val deltaX2 = buffer.g1sAlt1() + val deltaZ2 = buffer.g1s() + val delay1 = buffer.g2Alt3() + val delay2 = buffer.g2Alt2() + val direction = buffer.g2Alt2() + blocks += + ExactMoveExtendedInfo( + deltaX1, + deltaZ1, + delay1, + deltaX2, + deltaZ2, + delay2, + direction, + ) + } + + private fun decodeNameChange( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val text = buffer.gjstr() + blocks += NameChangeExtendedInfo(text) + } + + private fun decodeHeadiconCustomisation( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val flag = buffer.g1Alt3() + val groups = IntArray(8) + val indices = IntArray(8) + for (i in 0..<8) { + if (flag and (1 shl i) != 0) { + groups[i] = buffer.gSmart2or4null() + indices[i] = buffer.gSmart1or2null() + } else { + groups[i] = -1 + indices[i] = -1 + } + } + blocks += HeadIconCustomisationExtendedInfo(groups, indices) + } + + private fun decodeFacing( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val flag = buffer.g1Alt1() + val walkType = + when (val walkTypeValue = flag and 0x7) { + 0 -> FaceExtendedInfo.WalkType.CancelOnWalk + 1 -> FaceExtendedInfo.WalkType.TurnOnWalk + else -> error("Unknown walk type: $walkTypeValue") + } + val kind = flag ushr 3 and 0x7 + val instant = (flag ushr 6 and 0x1) == 1 + when (kind) { + 0 -> { + val entityType = + when (val entityTypeValue = buffer.gSmart1or2()) { + 0 -> FaceExtendedInfo.EntityType.None + 1 -> FaceExtendedInfo.EntityType.Npc + 2 -> FaceExtendedInfo.EntityType.Player + 3 -> FaceExtendedInfo.EntityType.WorldEntity + else -> error("Unknown entity type: $entityTypeValue") + } + val index = buffer.gSmart2or4null() + val fallbackAngle = buffer.gSmart1or2() + blocks += + FaceExtendedInfo( + FaceExtendedInfo.EntityFaceType( + entityType, + index, + fallbackAngle, + ), + walkType, + instant, + ) + } + 1 -> { + val x = buffer.gSmart1or2() + val z = buffer.gSmart1or2() + val bitpackedSize = buffer.gSmart1or2() + val sizeX = bitpackedSize and 0xF + val sizeZ = bitpackedSize ushr 4 and 0xF + blocks += + FaceExtendedInfo( + FaceExtendedInfo.LocFaceType( + x, + z, + sizeX, + sizeZ, + ), + walkType, + instant, + ) + } + 2 -> { + val angle = buffer.gSmart1or2() + blocks += + FaceExtendedInfo( + FaceExtendedInfo.AngleFaceType( + angle, + ), + walkType, + instant, + ) + } + 3 -> { + blocks += + FaceExtendedInfo( + FaceExtendedInfo.ResetFaceType, + walkType, + instant, + ) + } + else -> error("Unknown kind: $kind") + } + } + + private fun processHighResolution(buffer: BitBuf) { + val count = buffer.gBits(8) + if (count < transmittedNPCCount) { + for (i in count.. { + transmittedNPC[transmittedNPCCount++] = index + npc.lastTransmitCycle = cycle + npc.clearMovement() + extraUpdateNPC[extraUpdateNPCCount++] = index + updates[index] = UpdateType.ACTIVE + } + 1 -> { + transmittedNPC[transmittedNPCCount++] = index + npc.lastTransmitCycle = cycle + val walkDirection = buffer.gBits(3) + npc.addRouteWaypointAdjacent( + walkDirection, + MoveSpeed.WALK, + ) + val extendedInfo = buffer.gBits(1) + if (extendedInfo == 1) { + this.extraUpdateNPC[extraUpdateNPCCount++] = index + } + updates[index] = UpdateType.ACTIVE + } + 2 -> { + transmittedNPC[transmittedNPCCount++] = index + npc.lastTransmitCycle = cycle + if (buffer.gBits(1) == 1) { + val walkDirection = buffer.gBits(3) + npc.addRouteWaypointAdjacent( + walkDirection, + MoveSpeed.RUN, + ) + val runDirection = buffer.gBits(3) + npc.addRouteWaypointAdjacent( + runDirection, + MoveSpeed.RUN, + ) + } else { + val crawlDirection = buffer.gBits(3) + npc.addRouteWaypointAdjacent( + crawlDirection, + MoveSpeed.CRAWL, + ) + } + val extendedInfo = buffer.gBits(1) + if (extendedInfo == 1) { + this.extraUpdateNPC[extraUpdateNPCCount++] = index + } + updates[index] = UpdateType.ACTIVE + } + 3 -> { + npc.clearMovement() + deletedNPC[deletedNPCCount++] = index + updates[index] = UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION + } + } + } + } + + private fun processLowResolution( + large: Boolean, + buffer: BitBuf, + baseCoord: CoordGrid, + ) { + while (true) { + val indexBitCount = 16 + val capacity = (1 shl indexBitCount) + if (buffer.readableBits() >= indexBitCount + 12) { + val index = buffer.gBits(indexBitCount) + if (capacity - 1 != index) { + var isNew = false + if (npc[index] == null) { + npc[index] = Npc(-1, CoordGrid.INVALID) + isNew = true + } + val existingType = updates[index] + if (existingType == UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION) { + // Teleport + updates[index] = UpdateType.ACTIVE + } else { + updates[index] = UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION + } + val npc = checkNotNull(npc[index]) + transmittedNPC[transmittedNPCCount++] = index + npc.lastTransmitCycle = cycle + + val hasSpawnCycle = buffer.gBits(1) == 1 + if (hasSpawnCycle) { + npc.spawnCycle = buffer.gBits(32) + } + val extendedInfo = buffer.gBits(1) + val deltaX = decodeDelta(large, buffer) + val angle = NPC_TURN_ANGLES[buffer.gBits(3)] + val deltaZ = decodeDelta(large, buffer) + val jump = buffer.gBits(1) + npc.id = buffer.gBits(14) + if (isNew) { + npc.turnAngle = angle + npc.angle = angle + } + // reset bas + if (npc.turnSpeed == 0) { + npc.angle = 0 + } + if (extendedInfo == 1) { + this.extraUpdateNPC[extraUpdateNPCCount++] = index + } + npc.addRouteWaypoint( + baseCoord, + deltaX, + deltaZ, + jump == 1, + ) + continue + } + } + return + } + } + + private fun decodeDelta( + large: Boolean, + buffer: BitBuf, + ): Int = + if (large) { + var delta = buffer.gBits(8) + if (delta > 127) { + delta -= 256 + } + delta + } else { + var delta = buffer.gBits(6) + if (delta > 31) { + delta -= 64 + } + delta + } + + private class Npc( + var id: Int, + var coord: CoordGrid, + ) { + var lastTransmitCycle: Int = 0 + var moveSpeed: MoveSpeed = MoveSpeed.STATIONARY + var turnAngle = 0 + var angle = 0 + var spawnCycle = 0 + var turnSpeed = 32 + var jump: Boolean = false + var steps: MutableList = mutableListOf() + + fun clearMovement() { + this.moveSpeed = MoveSpeed.STATIONARY + this.jump = false + } + + fun addRouteWaypoint( + baseCoord: CoordGrid, + relativeX: Int, + relativeZ: Int, + jump: Boolean, + ) { + coord = CoordGrid(baseCoord.level, baseCoord.x + relativeX, baseCoord.z + relativeZ) + moveSpeed = MoveSpeed.STATIONARY + this.jump = jump + } + + fun addRouteWaypointAdjacent( + opcode: Int, + speed: MoveSpeed, + ) { + steps += opcode + var x = coord.x + var z = coord.z + if (opcode == 0) { + --x + ++z + } + + if (opcode == 1) { + ++z + } + + if (opcode == 2) { + ++x + ++z + } + + if (opcode == 3) { + --x + } + + if (opcode == 4) { + ++x + } + + if (opcode == 5) { + --x + --z + } + + if (opcode == 6) { + --z + } + + if (opcode == 7) { + ++x + --z + } + + coord = CoordGrid(coord.level, x, z) + moveSpeed = speed + } + } + + private companion object { + private val NPC_TURN_ANGLES = intArrayOf(768, 1024, 1280, 512, 1536, 256, 0, 1792) + private const val EXTENDED_SHORT: Int = 0x40 + private const val EXTENDED_MEDIUM: Int = 0x800 + private const val EXTENDED_INT: Int = 0x200_000 + + private const val LEVEL_CHANGE: Int = 0x8_000 + private const val SEQUENCE: Int = 0x80 + private const val NAME_CHANGE: Int = 0x4000 + private const val OPS: Int = 0x1_000 + private const val SPOTANIM: Int = 0x40_000 + private const val HEADBARS: Int = 0x1_000_000 + private const val BAS_CHANGE: Int = 0x100_000 + private const val SAY: Int = 0x2 + private const val EXACT_MOVE: Int = 0x200 + private const val HITMARKS: Int = 0x80_000 + private const val TRANSFORMATION: Int = 0x1 + private const val FACING: Int = 0x8 + private const val HEADICON_CUSTOMISATION: Int = 0x400_000 + private const val BODY_CUSTOMISATION_V2: Int = 0x800_000 + private const val BODY_CUSTOMISATION_V3: Int = 0x2_000_000 + private const val HEAD_CUSTOMISATION: Int = 0x20_000 + private const val TINTING: Int = 0x100 + private const val NPC_TRANSPARENCY: Int = 0x400 + private const val NPC_FREEZE: Int = 0x20 + + private const val UNUSED_FLAGS = 0x10000 or 0x2000 or 0x10 or 0x4 + + private enum class UpdateType { + IDLE, + LOW_RESOLUTION_TO_HIGH_RESOLUTION, + HIGH_RESOLUTION_TO_LOW_RESOLUTION, + ACTIVE, + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt new file mode 100644 index 000000000..245751b98 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt @@ -0,0 +1,1180 @@ +package net.rsprox.protocol.v240.game.outgoing.model.info.playerinfo + +import io.netty.buffer.ByteBuf +import io.netty.buffer.Unpooled +import net.rsprot.buffer.JagByteBuf +import net.rsprot.buffer.bitbuffer.BitBuf +import net.rsprot.buffer.bitbuffer.toBitBuf +import net.rsprot.buffer.extensions.toJagByteBuf +import net.rsprot.compression.HuffmanCodec +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerInfoDecoder +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.PlayerUpdateType +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.AppearanceExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.ChatExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.MoveSpeedExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.NameExtrasExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.ObjTypeCustomisation +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.PlayerResetExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.TemporaryMoveSpeedExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.LowResolutionPosition +import net.rsprox.protocol.game.outgoing.model.info.playerinfo.util.PlayerInfoInitBlock +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExactMoveExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FaceExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FacePathingEntityExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.FreezeExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Headbar +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HeadbarExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Hit +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.HitmarkExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SayExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.Spotanim +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SpotanimExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.TintingExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.TransparencyExtendedInfo + +@Suppress("DuplicatedCode") +internal class PlayerInfoClient( + private val localIndex: Int, + private val huffmanCodec: HuffmanCodec, +) : PlayerInfoDecoder { + private var extendedInfoCount: Int = 0 + private val extendedInfoIndices: IntArray = IntArray(2048) + private var highResolutionCount: Int = 0 + private val highResolutionIndices: IntArray = IntArray(2048) + private var lowResolutionCount: Int = 0 + private val lowResolutionIndices: IntArray = IntArray(2048) + private val unmodifiedFlags: ByteArray = ByteArray(2048) + private val cachedPlayers: Array = arrayOfNulls(2048) + private val lowResolutionPositions: IntArray = IntArray(2048) + private val updateTypes: Array = + Array(2048) { + UpdateType.LOW_RESOLUTION_IDLE + } + + override fun gpiInit(initBlock: PlayerInfoInitBlock) { + val localPlayer = Player() + cachedPlayers[localIndex] = localPlayer + localPlayer.coord = initBlock.localPlayerCoord + highResolutionCount = 0 + highResolutionIndices[highResolutionCount++] = localIndex + unmodifiedFlags[localIndex] = 0 + lowResolutionCount = 0 + for (idx in 1..<2048) { + if (idx == localIndex) continue + val packed = initBlock.getLowResolutionPosition(idx).packed + val level = packed shr 16 + val x = packed shr 8 and 597 + val z = packed and 597 + lowResolutionPositions[idx] = CoordGrid(level, x, z).packed + lowResolutionIndices[lowResolutionCount++] = idx + unmodifiedFlags[idx] = 0 + } + } + + override fun reset() { + for (i in cachedPlayers.indices) { + cachedPlayers[i] = null + } + highResolutionCount = 0 + lowResolutionCount = 0 + unmodifiedFlags.fill(0) + lowResolutionPositions.fill(0) + lowResolutionIndices.fill(0) + } + + override fun decode(buffer: ByteBuf): PlayerInfo { + extendedInfoCount = 0 + updateTypes.fill(UpdateType.LOW_RESOLUTION_IDLE) + for (player in cachedPlayers) { + player?.extendedInfoBlocks = emptyList() + } + val updates = mutableMapOf() + decodeBitCodes(buffer) + for ((index, updateType) in updateTypes.withIndex()) { + when (updateType) { + UpdateType.LOW_RESOLUTION_IDLE -> { + // updates[index] = PlayerUpdateType.LowResolutionIdle + // ^Ignore these as they are too spammy + } + UpdateType.HIGH_RESOLUTION_IDLE -> { + val player = checkNotNull(cachedPlayers[index]) + updates[index] = PlayerUpdateType.HighResolutionIdle(player.extendedInfoBlocks) + } + UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION -> { + val player = checkNotNull(cachedPlayers[index]) + updates[index] = + PlayerUpdateType.LowResolutionToHighResolution( + player.coord, + player.extendedInfoBlocks, + ) + } + UpdateType.HIGH_RESOLUTION_MOVEMENT -> { + val player = checkNotNull(cachedPlayers[index]) + updates[index] = + PlayerUpdateType.HighResolutionMovement( + player.coord, + player.extendedInfoBlocks, + ) + } + UpdateType.LOW_RESOLUTION_MOVEMENT -> { + val coord = CoordGrid(this.lowResolutionPositions[index]) + val lowResX = coord.x + val lowResZ = coord.z + val level = coord.level + updates[index] = + PlayerUpdateType.LowResolutionMovement( + LowResolutionPosition( + lowResX, + lowResZ, + level, + ), + ) + } + UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION -> { + val coord = CoordGrid(this.lowResolutionPositions[index]) + val lowResX = coord.x + val lowResZ = coord.z + val level = coord.level + updates[index] = + PlayerUpdateType.HighResolutionToLowResolution( + LowResolutionPosition( + lowResX, + lowResZ, + level, + ), + ) + } + } + } + return PlayerInfo(updates) + } + + private fun setUpdateType( + idx: Int, + updateType: UpdateType, + ) { + this.updateTypes[idx] = updateType + } + + private fun decodeBitCodes(byteBuf: ByteBuf) { + byteBuf.toBitBuf().use { buffer -> + var skipped = 0 + for (i in 0.. 0) { + --skipped + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else { + val active = buffer.gBits(1) + if (active == 0) { + skipped = readStationary(buffer) + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else { + getHighResolutionPlayerPosition(buffer, idx) + } + } + } + } + if (skipped != 0) { + throw RuntimeException() + } + } + byteBuf.toBitBuf().use { buffer -> + var skipped = 0 + for (i in 0.. 0) { + --skipped + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else { + val active = buffer.gBits(1) + if (active == 0) { + skipped = readStationary(buffer) + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else { + getHighResolutionPlayerPosition(buffer, idx) + } + } + } + } + if (skipped != 0) { + throw RuntimeException() + } + } + + byteBuf.toBitBuf().use { buffer -> + var skipped = 0 + for (i in 0.. 0) { + --skipped + setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else { + val active = buffer.gBits(1) + if (active == 0) { + skipped = readStationary(buffer) + setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else if (getLowResolutionPlayerPosition(buffer, idx)) { + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } + } + } + } + if (skipped != 0) { + throw RuntimeException() + } + } + byteBuf.toBitBuf().use { buffer -> + var skipped = 0 + for (i in 0.. 0) { + --skipped + setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else { + val active = buffer.gBits(1) + if (active == 0) { + skipped = readStationary(buffer) + setUpdateType(idx, UpdateType.LOW_RESOLUTION_IDLE) + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } else if (getLowResolutionPlayerPosition(buffer, idx)) { + unmodifiedFlags[idx] = (unmodifiedFlags[idx].toInt() or NEXT_CYCLE_INACTIVE).toByte() + } + } + } + } + if (skipped != 0) { + throw RuntimeException() + } + } + lowResolutionCount = 0 + highResolutionCount = 0 + for (i in 1..<2048) { + unmodifiedFlags[i] = (unmodifiedFlags[i].toInt() shr 1).toByte() + val cachedPlayer = cachedPlayers[i] + if (cachedPlayer != null) { + highResolutionIndices[highResolutionCount++] = i + } else { + lowResolutionIndices[lowResolutionCount++] = i + } + } + decodeExtendedInfo(byteBuf.toJagByteBuf()) + } + + private fun decodeExtendedInfo(buffer: JagByteBuf) { + for (i in 0..() + player.extendedInfoBlocks = blocks + decodeExtendedInfoBlocks(buffer, flag, blocks) + } + } + + private fun decodeExtendedInfoBlocks( + buffer: JagByteBuf, + flags: Int, + blocks: MutableList, + ) { + if (flags and UNUSED_FLAGS != 0) { + throw IllegalStateException("Unused flags used!") + } + + if (flags and NAME_EXTRAS != 0) { + decodeNameExtras(buffer, blocks) + } + if (flags and HITMARKS != 0) { + decodeHitmark(buffer, blocks) + } + if (flags and PLAYER_RESET != 0) { + decodePlayerReset(buffer, blocks) + } + if (flags and FACE != 0) { + decodeFacing(buffer, blocks) + } + if (flags and MOVE_SPEED != 0) { + decodeMoveSpeed(buffer, blocks) + } + if (flags and SPOTANIM != 0) { + decodeSpotanims(buffer, blocks) + } + if (flags and FACE_PATHINGENTITY != 0) { + decodeFacePathingEntity(buffer, blocks) + } + if (flags and CHAT != 0) { + decodeChat(buffer, blocks) + } + if (flags and PLAYER_TRANSPARENCY != 0) { + decodeTransparency(buffer, blocks) + } + if (flags and TINTING != 0) { + decodeTinting(buffer, blocks) + } + if (flags and HEADBARS != 0) { + decodeHeadbar(buffer, blocks) + } + if (flags and SAY != 0) { + decodeSay(buffer, blocks) + } + if (flags and SEQUENCE != 0) { + decodeSequence(buffer, blocks) + } + if (flags and TEMP_MOVE_SPEED != 0) { + decodeTemporaryMoveSpeed(buffer, blocks) + } + if (flags and APPEARANCE != 0) { + val len = buffer.g1Alt3() + val data = ByteArray(len) + buffer.gdataAlt2(data) + decodeAppearance(Unpooled.wrappedBuffer(data).toJagByteBuf(), blocks) + } + if (flags and EXACT_MOVE != 0) { + decodeExactMove(buffer, blocks) + } + if (flags and PLAYER_FREEZE != 0) { + decodeFreeze(buffer, blocks) + } + } + + private fun decodeMoveSpeed( + buffer: JagByteBuf, + blocks: MutableList, + ) { + blocks += MoveSpeedExtendedInfo(buffer.g1sAlt2()) + } + + private fun decodeTemporaryMoveSpeed( + buffer: JagByteBuf, + blocks: MutableList, + ) { + blocks += TemporaryMoveSpeedExtendedInfo(buffer.g1s()) + } + + private fun decodeSequence( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val id = buffer.g2Alt2() + val delay = buffer.g1() + blocks += SequenceExtendedInfo(id, delay) + } + + private fun decodeFacePathingEntity( + buffer: JagByteBuf, + blocks: MutableList, + ) { + var index = buffer.g2Alt3() + index += buffer.g1() shl 16 + blocks += FacePathingEntityExtendedInfo(index) + } + + private fun decodeFacing( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val flag = buffer.g1Alt2() + val walkType = + when (val walkTypeValue = flag and 0x7) { + 0 -> FaceExtendedInfo.WalkType.CancelOnWalk + 1 -> FaceExtendedInfo.WalkType.TurnOnWalk + else -> error("Unknown walk type: $walkTypeValue") + } + val kind = flag ushr 3 and 0x7 + val instant = (flag ushr 6 and 0x1) == 1 + when (kind) { + 0 -> { + val entityType = + when (val entityTypeValue = buffer.gSmart1or2()) { + 0 -> FaceExtendedInfo.EntityType.None + 1 -> FaceExtendedInfo.EntityType.Npc + 2 -> FaceExtendedInfo.EntityType.Player + 3 -> FaceExtendedInfo.EntityType.WorldEntity + else -> error("Unknown entity type: $entityTypeValue") + } + val index = buffer.gSmart2or4null() + val fallbackAngle = buffer.gSmart1or2() + blocks += + FaceExtendedInfo( + FaceExtendedInfo.EntityFaceType( + entityType, + index, + fallbackAngle, + ), + walkType, + instant, + ) + } + 1 -> { + val x = buffer.gSmart1or2() + val z = buffer.gSmart1or2() + val bitpackedSize = buffer.gSmart1or2() + val sizeX = bitpackedSize and 0xF + val sizeZ = bitpackedSize ushr 4 and 0xF + blocks += + FaceExtendedInfo( + FaceExtendedInfo.LocFaceType( + x, + z, + sizeX, + sizeZ, + ), + walkType, + instant, + ) + } + 2 -> { + val angle = buffer.gSmart1or2() + blocks += + FaceExtendedInfo( + FaceExtendedInfo.AngleFaceType( + angle, + ), + walkType, + instant, + ) + } + 3 -> { + blocks += + FaceExtendedInfo( + FaceExtendedInfo.ResetFaceType, + walkType, + instant, + ) + } + else -> error("Unknown kind: $kind") + } + } + + private fun decodeSay( + buffer: JagByteBuf, + blocks: MutableList, + ) { + blocks += SayExtendedInfo(buffer.gjstr()) + } + + private fun decodeNameExtras( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val beforeName = buffer.gjstr() + val afterName = buffer.gjstr() + val afterCombatLevel = buffer.gjstr() + blocks += NameExtrasExtendedInfo(beforeName, afterName, afterCombatLevel) + } + + private fun decodeChat( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val colourAndEffectsPacked = buffer.g2Alt2() + val modIcon = buffer.g1Alt2() + val autotyper = buffer.g1Alt1() == 1 + val huffmanLength = buffer.g1Alt2() + val data = ByteArray(huffmanLength) + buffer.gdataAlt1(data) + val text = huffmanCodec.decode(Unpooled.wrappedBuffer(data)) + val colour = colourAndEffectsPacked ushr 8 + val effects = colourAndEffectsPacked and 0xFF + val patternLength = if (colour in 13..20) colour - 12 else 0 + val pattern = + if (patternLength in 1..8) { + val array = ByteArray(patternLength) + for (i in 0.., + ) { + val deltaX1 = buffer.g1s() + val deltaZ1 = buffer.g1sAlt1() + val deltaX2 = buffer.g1sAlt2() + val deltaZ2 = buffer.g1sAlt3() + val delay1 = buffer.g2() + val delay2 = buffer.g2Alt1() + val direction = buffer.g2Alt3() + blocks += + ExactMoveExtendedInfo( + deltaX1, + deltaZ1, + delay1, + deltaX2, + deltaZ2, + delay2, + direction, + ) + } + + private fun decodeSpotanims( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val spotanims = mutableMapOf() + val count = buffer.g1() + for (i in 0.., + ) { + val hitCount = buffer.g1Alt3() + val hits = ArrayList(hitCount) + for (i in 0.., + ) { + val headbarCount = buffer.g1Alt1() + val headbars = ArrayList(headbarCount) + for (i in 0.. 0) { + buffer.g1Alt2() + } else { + startFill + } + headbars += + Headbar( + type, + startFill, + endFill, + startTime, + endTime, + ) + } + blocks += HeadbarExtendedInfo(headbars) + } + + private fun decodePlayerReset( + buffer: JagByteBuf, + blocks: MutableList, + ) { + blocks += PlayerResetExtendedInfo(buffer.g1Alt2()) + } + + private fun decodeFreeze( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val delay = buffer.g2Alt3() + val duration = buffer.g2Alt3() + val cancelSequence = buffer.g1Alt1() == 1 + blocks += FreezeExtendedInfo(delay, duration, cancelSequence) + } + + private fun decodeTransparency( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val start = buffer.g2sAlt2() + val end = buffer.g2s() + val startTransparency = buffer.g1sAlt3() + val endTransparency = buffer.g1sAlt3() + val useStartTransparency = buffer.g1Alt3() == 1 + blocks += + TransparencyExtendedInfo( + start, + end, + startTransparency, + endTransparency, + useStartTransparency, + ) + } + + private fun decodeTinting( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val start = buffer.g2Alt1() + val end = buffer.g2() + val hue = buffer.g1sAlt2() + val saturation = buffer.g1s() + val lightness = buffer.g1sAlt3() + val weight = buffer.g1Alt3() + blocks += + TintingExtendedInfo( + start, + end, + hue, + saturation, + lightness, + weight, + ) + } + + private fun decodeAppearance( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val gender = buffer.g1s() + val skullIcon = buffer.g1s() + val overheadIcon = buffer.g1s() + val identKit = IntArray(12) + var transformedNpcId: Int = -1 + for (i in 0..<12) { + val flag = buffer.g1() + if (flag == 0) { + identKit[i] = 0 + continue + } + val extra = buffer.g1() + identKit[i] = (flag shl 8) + extra + if (i == 0 && identKit[i] == 65535) { + transformedNpcId = buffer.g2() + break + } + } + val interfaceInentKit = IntArray(12) + for (i in 0..<12) { + val value = buffer.g1() + if (value == 0) { + interfaceInentKit[i] = 0 + } else { + interfaceInentKit[i] = (value shl 8) + buffer.g1() + } + } + val colours = IntArray(5) + for (i in 0..<5) { + colours[i] = buffer.g1() + } + val readyAnim = buffer.g2() + val turnAnim = buffer.g2() + val walkAnim = buffer.g2() + val walkAnimBack = buffer.g2() + val walkAnimLeft = buffer.g2() + val walkAnimRight = buffer.g2() + val runAnim = buffer.g2() + val name = buffer.gjstr() + val combatLevel = buffer.g1() + val skillLevel = buffer.g2() + val hidden = buffer.g1() == 1 + val customisationFlag = buffer.g2() + val forceRefresh = customisationFlag shr 15 and 0x1 == 1 + val objTypeCustomisation: Array? = + if (customisationFlag > 0 && customisationFlag != 32768) { + val customisation = arrayOfNulls(12) + for (i in 0..<12) { + val hasCustomisation = customisationFlag shr (12 - i) and 1 + if (hasCustomisation == 1) { + var recolIndices: Int = -1 + var recol1: Int = -1 + var recol2: Int = -1 + var retexIndices: Int = -1 + var retex1: Int = -1 + var retex2: Int = -1 + var manWear: Int = -1 + var womanWear: Int = -1 + var manHead: Int = -1 + var womanHead: Int = -1 + + val slotFlag = buffer.g1() + val recol = slotFlag and 0x1 != 0 + val retex = slotFlag and 0x2 != 0 + val wearModels = slotFlag and 0x4 != 0 + val headModels = slotFlag and 0x8 != 0 + if (recol) { + recolIndices = buffer.g1() + val recolIndex1 = recolIndices and 15 + val recolIndex2 = recolIndices ushr 4 and 15 + recol1 = + if (recolIndex1 != 15) { + buffer.g2() + } else { + -1 + } + recol2 = + if (recolIndex2 != 15) { + buffer.g2() + } else { + -1 + } + } + + if (retex) { + retexIndices = buffer.g1() + val retexIndex1 = retexIndices and 15 + val retexIndex2 = retexIndices ushr 4 and 15 + retex1 = + if (retexIndex1 != 15) { + buffer.g2() + } else { + -1 + } + retex2 = + if (retexIndex2 != 15) { + buffer.g2() + } else { + -1 + } + } + + // Note: This branch is server-version checked, but we're pushing + // RSProx out after revision 237 is forced, + // meaning we can check this. RSprot does not support it either. + if (wearModels) { + manWear = buffer.g4() + womanWear = buffer.g4() + } + + if (headModels) { + manHead = buffer.g4() + womanHead = buffer.g4() + } + customisation[i] = + ObjTypeCustomisation( + recolIndices, + recol1, + recol2, + retexIndices, + retex1, + retex2, + manWear, + womanWear, + manHead, + womanHead, + ) + } + } + customisation + } else { + null + } + val beforeName = buffer.gjstr() + val afterName = buffer.gjstr() + val afterCombatLevel = buffer.gjstr() + val textGender = buffer.g1s() + blocks += + AppearanceExtendedInfo( + name, + combatLevel, + skillLevel, + hidden, + gender, + textGender, + skullIcon, + overheadIcon, + transformedNpcId, + identKit, + interfaceInentKit, + colours, + readyAnim, + turnAnim, + walkAnim, + walkAnimBack, + walkAnimLeft, + walkAnimRight, + runAnim, + beforeName, + afterName, + afterCombatLevel, + forceRefresh, + objTypeCustomisation, + ) + } + + private fun getHighResolutionPlayerPosition( + buffer: BitBuf, + idx: Int, + ) { + val extendedInfo = buffer.gBits(1) == 1 + if (extendedInfo) { + extendedInfoIndices[extendedInfoCount++] = idx + } + val opcode = buffer.gBits(2) + val cachedPlayer = checkNotNull(cachedPlayers[idx]) + if (opcode == 0) { + if (extendedInfo) { + cachedPlayer.queuedMove = false + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_IDLE) + } else if (localIndex == idx) { + throw RuntimeException() + } else { + lowResolutionPositions[idx] = + (cachedPlayer.coord.level shl 28) + .or(cachedPlayer.coord.z shr 13) + .or(cachedPlayer.coord.x shr 13 shl 14) + cachedPlayers[idx] = null + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_TO_LOW_RESOLUTION) + if (buffer.gBits(1) != 0) { + getLowResolutionPlayerPosition(buffer, idx) + } + } + } else if (opcode == 1) { + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_MOVEMENT) + val movementOpcode = buffer.gBits(3) + var curX = cachedPlayer.coord.x + var curZ = cachedPlayer.coord.z + when (movementOpcode) { + 0 -> { + --curX + --curZ + } + 1 -> { + --curZ + } + 2 -> { + ++curX + --curZ + } + 3 -> { + --curX + } + 4 -> { + ++curX + } + 5 -> { + --curX + ++curZ + } + 6 -> { + ++curZ + } + 7 -> { + ++curX + ++curZ + } + } + cachedPlayer.coord = CoordGrid(cachedPlayer.coord.level, curX, curZ) + cachedPlayer.queuedMove = extendedInfo + } else if (opcode == 2) { + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_MOVEMENT) + val movementOpcode = buffer.gBits(4) + var curX = cachedPlayer.coord.x + var curZ = cachedPlayer.coord.z + when (movementOpcode) { + 0 -> { + curX -= 2 + curZ -= 2 + } + 1 -> { + --curX + curZ -= 2 + } + 2 -> { + curZ -= 2 + } + 3 -> { + ++curX + curZ -= 2 + } + 4 -> { + curX += 2 + curZ -= 2 + } + 5 -> { + curX -= 2 + --curZ + } + 6 -> { + curX += 2 + --curZ + } + 7 -> { + curX -= 2 + } + 8 -> { + curX += 2 + } + 9 -> { + curX -= 2 + ++curZ + } + 10 -> { + curX += 2 + ++curZ + } + 11 -> { + curX -= 2 + curZ += 2 + } + 12 -> { + --curX + curZ += 2 + } + 13 -> { + curZ += 2 + } + 14 -> { + ++curX + curZ += 2 + } + 15 -> { + curX += 2 + curZ += 2 + } + } + cachedPlayer.coord = CoordGrid(cachedPlayer.coord.level, curX, curZ) + cachedPlayer.queuedMove = extendedInfo + } else { + setUpdateType(idx, UpdateType.HIGH_RESOLUTION_MOVEMENT) + val far = buffer.gBits(1) + if (far == 0) { + val coord = buffer.gBits(12) + val deltaLevel = coord shr 10 + var deltaX = coord shr 5 and 31 + if (deltaX > 15) { + deltaX -= 32 + } + var deltaZ = coord and 31 + if (deltaZ > 15) { + deltaZ -= 32 + } + var curLevel = cachedPlayer.coord.level + var curX = cachedPlayer.coord.x + var curZ = cachedPlayer.coord.z + curX += deltaX + curZ += deltaZ + curLevel = (curLevel + deltaLevel) and 0x3 + cachedPlayer.coord = CoordGrid(curLevel, curX, curZ) + cachedPlayer.queuedMove = extendedInfo + } else { + val coord = buffer.gBits(30) + val deltaLevel = coord shr 28 + val deltaX = coord shr 14 and 16383 + val deltaZ = coord and 16383 + var curLevel = cachedPlayer.coord.level + var curX = cachedPlayer.coord.x + var curZ = cachedPlayer.coord.z + curX = (curX + deltaX) and 16383 + curZ = (curZ + deltaZ) and 16383 + curLevel = (curLevel + deltaLevel) and 0x3 + cachedPlayer.coord = CoordGrid(curLevel, curX, curZ) + cachedPlayer.queuedMove = extendedInfo + } + } + } + + private fun getLowResolutionPlayerPosition( + buffer: BitBuf, + idx: Int, + ): Boolean { + val opcode = buffer.gBits(2) + when (opcode) { + 0 -> { + if (buffer.gBits(1) != 0) { + getLowResolutionPlayerPosition(buffer, idx) + } + val x = buffer.gBits(13) + val z = buffer.gBits(13) + val extendedInfo = buffer.gBits(1) == 1 + if (extendedInfo) { + this.extendedInfoIndices[extendedInfoCount++] = idx + } + if (cachedPlayers[idx] != null) { + throw RuntimeException() + } + val player = Player() + cachedPlayers[idx] = player + // cached appearance decoding + val lowResolutionPosition = lowResolutionPositions[idx] + val level = lowResolutionPosition shr 28 + val lowResX = lowResolutionPosition shr 14 and 0xFF + val lowResZ = lowResolutionPosition and 0xFF + player.coord = CoordGrid(level, (lowResX shl 13) + x, (lowResZ shl 13) + z) + player.queuedMove = false + setUpdateType(idx, UpdateType.LOW_RESOLUTION_TO_HIGH_RESOLUTION) + return true + } + 1 -> { + val levelDelta = buffer.gBits(2) + val lowResPosition = lowResolutionPositions[idx] + lowResolutionPositions[idx] = + ((((lowResPosition shr 28) + levelDelta) and 3 shl 28)) + .plus(lowResPosition and 268435455) + setUpdateType(idx, UpdateType.LOW_RESOLUTION_MOVEMENT) + return false + } + 2 -> { + setUpdateType(idx, UpdateType.LOW_RESOLUTION_MOVEMENT) + val bitpacked = buffer.gBits(5) + val levelDelta = bitpacked shr 3 + val movementCode = bitpacked and 7 + val lowResPosition = lowResolutionPositions[idx] + val level = (lowResPosition shr 28) + levelDelta and 3 + var x = lowResPosition shr 14 and 255 + var z = lowResPosition and 255 + if (movementCode == 0) { + --x + --z + } + + if (movementCode == 1) { + --z + } + + if (movementCode == 2) { + ++x + --z + } + + if (movementCode == 3) { + --x + } + + if (movementCode == 4) { + ++x + } + + if (movementCode == 5) { + --x + ++z + } + + if (movementCode == 6) { + ++z + } + + if (movementCode == 7) { + ++x + ++z + } + lowResolutionPositions[idx] = (x shl 14) + z + (level shl 28) + return false + } + else -> { + setUpdateType(idx, UpdateType.LOW_RESOLUTION_MOVEMENT) + val bitpacked = buffer.gBits(18) + val levelDelta = bitpacked shr 16 + val xDelta = bitpacked shr 8 and 255 + val zDelta = bitpacked and 255 + val lowResPosition = lowResolutionPositions[idx] + val level = (lowResPosition shr 28) + levelDelta and 3 + val x = (xDelta + (lowResPosition shr 14)) and 255 + val z = (zDelta + lowResPosition) and 255 + lowResolutionPositions[idx] = (x shl 14) + z + (level shl 28) + return false + } + } + } + + private fun readStationary(buffer: BitBuf): Int { + val type = buffer.gBits(2) + return when (type) { + 0 -> 0 + 1 -> buffer.gBits(5) + 2 -> buffer.gBits(8) + else -> buffer.gBits(11) + } + } + + private companion object { + private const val CUR_CYCLE_INACTIVE = 0x1 + private const val NEXT_CYCLE_INACTIVE = 0x2 + + private const val EXTENDED_SHORT = 0x8 + private const val EXTENDED_MEDIUM = 0x800 + + private const val SEQUENCE = 0x40 + private const val APPEARANCE = 0x20 + private const val FACE = 0x1 + private const val SAY = 0x4 + private const val CHAT = 0x100 + private const val NAME_EXTRAS = 0x2000 + private const val MOVE_SPEED = 0x400 + private const val TINTING = 0x200 + private const val EXACT_MOVE = 0x4000 + private const val PLAYER_TRANSPARENCY = 0x100000 + private const val TEMP_MOVE_SPEED = 0x1000 + private const val SPOTANIM = 0x20000 + private const val HEADBARS = 0x10000 + private const val HITMARKS = 0x40000 + private const val FACE_PATHINGENTITY = 0x10 + + private const val PLAYER_FREEZE = 0x80_000 + private const val PLAYER_RESET = 0x2 + private const val UNUSED_FLAGS = 0x80 + + private class Player { + var queuedMove: Boolean = false + var coord: CoordGrid = CoordGrid.INVALID + var extendedInfoBlocks: List = emptyList() + } + + private enum class UpdateType { + LOW_RESOLUTION_IDLE, + HIGH_RESOLUTION_IDLE, + LOW_RESOLUTION_TO_HIGH_RESOLUTION, + HIGH_RESOLUTION_MOVEMENT, + LOW_RESOLUTION_MOVEMENT, + HIGH_RESOLUTION_TO_LOW_RESOLUTION, + } + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt new file mode 100644 index 000000000..79949d379 --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt @@ -0,0 +1,649 @@ +package net.rsprox.protocol.v240.game.outgoing.model.info.worldentityinfo + +import net.rsprot.buffer.JagByteBuf +import net.rsprox.protocol.common.CoordFine +import net.rsprox.protocol.common.CoordGrid +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.EnabledOpsExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.SequenceExtendedInfo +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfo +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoDecoder +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV1 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV2 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV3 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV4 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV5 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV6 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV7 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityMoveSpeed +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityUpdateType + +public class WorldEntityInfoClient : WorldEntityInfoDecoder { + private var transmittedWorldEntityCount: Int = 0 + private val transmittedWorldEntity: IntArray = IntArray(25) + private val worldEntity: Array = arrayOfNulls(4096) + private val earlyRemovals: MutableSet = mutableSetOf() + private val updates: MutableMap = mutableMapOf() + + override fun decode( + buffer: JagByteBuf, + baseCoord: CoordGrid, + version: Int, + ): WorldEntityInfo { + updates.clear() + earlyRemovals.clear() + if (version >= 7) { + decodeHighResolutionV5(buffer) + decodeLowResolutionV5(buffer, baseCoord) + } else if (version >= 6) { + decodeHighResolutionV4(buffer) + decodeLowResolutionV4(buffer, baseCoord) + } else if (version >= 5) { + decodeHighResolutionV3(buffer) + decodeLowResolutionV3(buffer, baseCoord) + } else if (version >= 3) { + decodeHighResolutionV2(buffer) + decodeLowResolutionV2(buffer, baseCoord, version) + } else { + decodeHighResolutionV1(buffer) + decodeLowResolutionV1(buffer, baseCoord) + } + val updates = updates.toMap() + return when (version) { + 1 -> WorldEntityInfoV1(updates) + 2 -> WorldEntityInfoV2(updates) + 3 -> WorldEntityInfoV3(updates) + 4 -> WorldEntityInfoV4(updates) + 5 -> WorldEntityInfoV5(earlyRemovals, updates) + 6 -> WorldEntityInfoV6(earlyRemovals, updates) + 7 -> WorldEntityInfoV7(earlyRemovals, updates) + else -> error("Invalid version: $version") + } + } + + private fun decodeHighResolutionV1(buffer: JagByteBuf) { + val count = buffer.g1() + if (count < transmittedWorldEntityCount) { + throw RuntimeException("dang") + } + if (count > transmittedWorldEntityCount) { + throw RuntimeException("dang!") + } + this.transmittedWorldEntityCount = 0 + for (i in 0.. transmittedWorldEntityCount) { + throw RuntimeException("dang!") + } + this.transmittedWorldEntityCount = 0 + for (i in 0.. transmittedWorldEntityCount) { + throw RuntimeException("dang!") + } + this.transmittedWorldEntityCount = 0 + for (i in 0.. transmittedWorldEntityCount) { + throw RuntimeException("dang!") + } + this.transmittedWorldEntityCount = 0 + for (i in 0.. transmittedWorldEntityCount) { + throw RuntimeException("dang!") + } + this.transmittedWorldEntityCount = 0 + for (i in 0.. { + val flags = buffer.g1() + if (flags == 0) { + return emptyList() + } + val blocks = mutableListOf() + if (flags and 0x2 != 0) { + val id = buffer.g2() + val delay = buffer.g1() + blocks += SequenceExtendedInfo(id, delay) + } + + if (flags and 0x1 != 0) { + blocks += EnabledOpsExtendedInfo(buffer.g1()) + } + return blocks + } + + private fun decodeWorldEntityInfoExtendedInfoObfuscated( + buffer: JagByteBuf, + flags: Int, + ): List { + if (flags == 0) { + return emptyList() + } + val blocks = mutableListOf() + if (flags and 0x2 != 0) { + blocks += EnabledOpsExtendedInfo(buffer.g1Alt3()) + } + if (flags and 0x1 != 0) { + val id = buffer.g2() + val delay = buffer.g1() + blocks += SequenceExtendedInfo(id, delay) + } + return blocks + } + + private fun decodeAngledCoordFineComponent( + buffer: JagByteBuf, + bitpackedOpcode: Int, + shift: Int, + ): Int { + val opcode = (bitpackedOpcode shr shift) and 0x3 + return when (opcode) { + 3 -> buffer.g4() + 2 -> buffer.g2s() + 1 -> buffer.g1s() + else -> 0 + } + } + + private fun decodeLowResolutionV1( + buffer: JagByteBuf, + baseCoord: CoordGrid, + ) { + while (buffer.isReadable(10)) { + val index = buffer.g2() + this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index + val sizeX = buffer.g1() * 8 + val sizeZ = buffer.g1() * 8 + val xInBuildArea = buffer.g1() + val zInBuildArea = buffer.g1() + val angle = buffer.g2() + val unknownProperty = buffer.g2() + val coord = CoordGrid(baseCoord.level, baseCoord.x + xInBuildArea, baseCoord.z + zInBuildArea) + val worldEntity = + WorldEntityV1( + index, + sizeX, + sizeZ, + unknownProperty, + coord, + angle, + WorldEntityMoveSpeed.ZERO, + ) + this.worldEntity[index] = worldEntity + this.updates[index] = + WorldEntityUpdateType.LowResolutionToHighResolutionV1( + sizeX, + sizeZ, + angle, + unknownProperty, + coord, + ) + } + } + + private fun decodeLowResolutionV2( + buffer: JagByteBuf, + baseCoord: CoordGrid, + version: Int, + ) { + while (buffer.isReadable(10)) { + val index = buffer.g2() + this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index + val sizeX = buffer.g1() * 8 + val sizeZ = buffer.g1() * 8 + val level = buffer.g1s() + var coordFine = CoordFine(0, 0, 0) + var angle = 0 + val bitpackedAngledCoordFineOpcodes = buffer.g1s() + if (bitpackedAngledCoordFineOpcodes != 0) { + val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0) + val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2) + val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4) + angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6) + coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ) + } + coordFine = + CoordFine( + (baseCoord.x shl 7) + coordFine.x, + coordFine.y, + (baseCoord.z shl 7) + coordFine.z, + ) + val centerFineOffsetX = if (version >= 4) buffer.g2s() else null + val centerFineOffsetZ = if (version >= 4) buffer.g2s() else null + val worldEntity = + WorldEntityV2( + index, + sizeX, + sizeZ, + coordFine, + angle, + level, + centerFineOffsetX, + centerFineOffsetZ, + ) + this.worldEntity[index] = worldEntity + this.updates[index] = + WorldEntityUpdateType.LowResolutionToHighResolutionV2( + sizeX, + sizeZ, + angle, + coordFine, + level, + centerFineOffsetX, + centerFineOffsetZ, + ) + } + } + + private fun decodeLowResolutionV3( + buffer: JagByteBuf, + baseCoord: CoordGrid, + ) { + while (buffer.isReadable(10)) { + val index = buffer.g2() + this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index + val sizeX = buffer.g1() * 8 + val sizeZ = buffer.g1() * 8 + val id = buffer.g2() + var coordFine = CoordFine(0, 0, 0) + var angle = 0 + val bitpackedAngledCoordFineOpcodes = buffer.g1s() + if (bitpackedAngledCoordFineOpcodes != 0) { + val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0) + val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2) + val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4) + angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6) + coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ) + } + coordFine = + CoordFine( + (baseCoord.x shl 7) + coordFine.x, + coordFine.y, + (baseCoord.z shl 7) + coordFine.z, + ) + val priority = buffer.g1() + val worldEntity = + WorldEntityV3( + index, + id, + sizeX, + sizeZ, + priority, + coordFine, + angle, + ) + this.worldEntity[index] = worldEntity + this.updates[index] = + WorldEntityUpdateType.LowResolutionToHighResolutionV3( + id, + sizeX, + sizeZ, + angle, + priority, + coordFine, + ) + } + } + + private fun decodeLowResolutionV4( + buffer: JagByteBuf, + baseCoord: CoordGrid, + ) { + while (buffer.isReadable) { + val index = buffer.g2() + this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index + val sizeX = buffer.g1() * 8 + val sizeZ = buffer.g1() * 8 + val id = buffer.g2() + var coordFine = CoordFine(0, 0, 0) + var angle = 0 + val bitpackedAngledCoordFineOpcodes = buffer.g1s() + if (bitpackedAngledCoordFineOpcodes != 0) { + val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0) + val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2) + val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4) + angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6) + coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ) + } + coordFine = + CoordFine( + (baseCoord.x shl 7) + coordFine.x, + coordFine.y, + (baseCoord.z shl 7) + coordFine.z, + ) + val priority = buffer.g1() + val worldEntity = + WorldEntityV3( + index, + id, + sizeX, + sizeZ, + priority, + coordFine, + angle, + ) + val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer) + this.worldEntity[index] = worldEntity + this.updates[index] = + WorldEntityUpdateType.LowResolutionToHighResolutionV4( + id, + sizeX, + sizeZ, + angle, + priority, + coordFine, + extendedInfo, + ) + } + } + + private fun decodeLowResolutionV5( + buffer: JagByteBuf, + baseCoord: CoordGrid, + ) { + while (buffer.isReadable) { + val index = buffer.g2() + // Note: If serverVersion < 237, add +1 to index + this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index + val extendedInfoFlags = buffer.g1() + val packedSize = buffer.g1Alt2() + val priority = buffer.g1Alt1() + val id = buffer.g2sAlt1() + + var coordFine = CoordFine(0, 0, 0) + var angle = 0 + val bitpackedAngledCoordFineOpcodes = buffer.g1s() + if (bitpackedAngledCoordFineOpcodes != 0) { + val deltaX = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 0) + val deltaY = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 2) + val deltaZ = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 4) + angle = decodeAngledCoordFineComponent(buffer, bitpackedAngledCoordFineOpcodes, 6) + coordFine = CoordFine(coordFine.x + deltaX, coordFine.y + deltaY, coordFine.z + deltaZ) + } + coordFine = + CoordFine( + (baseCoord.x shl 7) + coordFine.x, + coordFine.y, + (baseCoord.z shl 7) + coordFine.z, + ) + + val sizeX = (packedSize ushr 4 and 0xF) * 8 + val sizeZ = (packedSize and 0xF) * 8 + val worldEntity = + WorldEntityV3( + index, + id, + sizeX, + sizeZ, + priority, + coordFine, + angle, + ) + val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, extendedInfoFlags) + this.worldEntity[index] = worldEntity + this.updates[index] = + WorldEntityUpdateType.LowResolutionToHighResolutionV4( + id, + sizeX, + sizeZ, + angle, + priority, + coordFine, + extendedInfo, + ) + } + } + + @Suppress("unused") + private class WorldEntityV1( + val index: Int, + val sizeX: Int, + val sizeZ: Int, + val unknownProperty: Int, + var coordGrid: CoordGrid, + var angle: Int, + var moveSpeed: WorldEntityMoveSpeed, + ) + + @Suppress("unused") + private class WorldEntityV2( + val index: Int, + val sizeX: Int, + val sizeZ: Int, + var coordFine: CoordFine, + var angle: Int, + val level: Int, + val centerFineOffsetX: Int?, + val centerFineOffsetZ: Int?, + ) + + @Suppress("unused") + private class WorldEntityV3( + val index: Int, + val id: Int, + val sizeX: Int, + val sizeZ: Int, + val priority: Int, + var coordFine: CoordFine, + var angle: Int, + ) +} From e2ba1acdcfcde95cb14d0476c162d0c774e0ef41 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:18:55 +0300 Subject: [PATCH 02/13] fix: unpin runelite & native --- proxy/src/main/kotlin/net/rsprox/proxy/ProxyService.kt | 5 +++-- .../src/main/kotlin/net/rsprox/proxy/config/RSProx.kt | 4 ++-- .../net/rsprox/proxy/runelite/RuneliteLauncher.kt | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/ProxyService.kt b/proxy/src/main/kotlin/net/rsprox/proxy/ProxyService.kt index eec9063f9..e4f4ad6a0 100644 --- a/proxy/src/main/kotlin/net/rsprox/proxy/ProxyService.kt +++ b/proxy/src/main/kotlin/net/rsprox/proxy/ProxyService.kt @@ -37,6 +37,7 @@ import net.rsprox.proxy.config.ProxyProperty.Companion.SELECTED_PROXY_TARGET import net.rsprox.proxy.config.ProxyProperty.Companion.WORLDLIST_ENDPOINT import net.rsprox.proxy.connection.ClientTypeDictionary import net.rsprox.proxy.connection.ProxyConnectionContainer +import net.rsprox.proxy.downloader.JagexNativeClientDownloader import net.rsprox.proxy.downloader.LostCityNativeClientDownloader import net.rsprox.proxy.exceptions.MissingLibraryException import net.rsprox.proxy.filters.DefaultPropertyFilterSetStore @@ -929,8 +930,8 @@ public class ProxyService( val targetRev = target.config.revision val binary = if (targetRev == null || targetRev == "latest_supported") { - // JagexNativeClientDownloader.download(nativeClientType) - getHistoricNativeClient("239.4", nativeClientType) + JagexNativeClientDownloader.download(nativeClientType) + // getHistoricNativeClient("239.4", nativeClientType) } else { getHistoricNativeClient(targetRev, nativeClientType) } diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt b/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt index e82e460b0..2de7a947f 100644 --- a/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt +++ b/proxy/src/main/kotlin/net/rsprox/proxy/config/RSProx.kt @@ -19,8 +19,8 @@ internal val BINARY_CREDENTIALS: Path = BINARY_CREDENTIALS_FOLDER.resolve("binar internal val FAKE_CERTIFICATE_FILE: Path = SIGN_KEY_DIRECTORY.resolve("fake-cert.jks") internal val JAGEX_ACCOUNTS_FILE: Path = CONFIGURATION_PATH.resolve("jagex-accounts.properties") internal val RUNELITE_LAUNCHER_REPO_DIRECTORY: Path = CONFIGURATION_PATH.resolve("runelite-launcher") -internal const val CURRENT_REVISION: Int = 239 -internal const val LATEST_SUPPORTED_PLUGIN: Int = 239 +internal const val CURRENT_REVISION: Int = 240 +internal const val LATEST_SUPPORTED_PLUGIN: Int = 240 /** * Http server port needs to be hard-coded as we modify it in a few RuneLite classes directly. diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt b/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt index 518633e9c..e4f536a89 100644 --- a/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt +++ b/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt @@ -82,13 +82,13 @@ public class RuneliteLauncher { // Pick the correct bootstrap commit from here: // https://github.com/runelite/static.runelite.net/commits/gh-pages/bootstrap.json val repository = "https://raw.githubusercontent.com/runelite/static.runelite.net" - val commit = "c95f866eaa693da187bf986cdf9c8f23b555ed4c" - val bootstrapUrl = "$repository/$commit/bootstrap.json" - val bootstrapSigUrl = "$repository/$commit/bootstrap.json.sha256" + // val commit = "c95f866eaa693da187bf986cdf9c8f23b555ed4c" + // val bootstrapUrl = "$repository/$commit/bootstrap.json" + // val bootstrapSigUrl = "$repository/$commit/bootstrap.json.sha256" // Any other time, just rely on the latest bootstrap. - // val bootstrapUrl = "https://static.runelite.net/bootstrap.json" - // val bootstrapSigUrl = "https://static.runelite.net/bootstrap.json.sha256" + val bootstrapUrl = "https://static.runelite.net/bootstrap.json" + val bootstrapSigUrl = "https://static.runelite.net/bootstrap.json.sha256" val localClasspath: String? = System.getProperty("rsprox.runelite.localClasspath") val defaultArgs = buildList { From 13b4e14e9c4e36a539cbb391895ed423d8418989 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:20:05 +0300 Subject: [PATCH 03/13] feat: add support for loading revision 240 --- .../net/rsprox/proxy/plugin/DecoderLoader.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt b/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt index 7f74de57e..068ee5965 100644 --- a/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt +++ b/proxy/src/main/kotlin/net/rsprox/proxy/plugin/DecoderLoader.kt @@ -72,6 +72,10 @@ import net.rsprox.protocol.v239.ClientPacketDecoderServiceV239 import net.rsprox.protocol.v239.GameClientProtProviderV239 import net.rsprox.protocol.v239.GameServerProtProviderV239 import net.rsprox.protocol.v239.ServerPacketDecoderServiceV239 +import net.rsprox.protocol.v240.ClientPacketDecoderServiceV240 +import net.rsprox.protocol.v240.GameClientProtProviderV240 +import net.rsprox.protocol.v240.GameServerProtProviderV240 +import net.rsprox.protocol.v240.ServerPacketDecoderServiceV240 import net.rsprox.proxy.huffman.HuffmanProvider import net.rsprox.transcriber.legacy.LegacyClientProt import net.rsprox.transcriber.legacy.LegacyServerProt @@ -209,6 +213,7 @@ public class DecoderLoader { 237 to Callable { loadRevision237(huffmanCodec, cache) }, 238 to Callable { loadRevision238(huffmanCodec, cache) }, 239 to Callable { loadRevision239(huffmanCodec, cache) }, + 240 to Callable { loadRevision240(huffmanCodec, cache) }, ) } @@ -450,6 +455,20 @@ public class DecoderLoader { ) } + private fun loadRevision240( + huffmanCodec: HuffmanCodec, + cache: CacheProvider, + ): RevisionDecoder { + logger.debug { "Loading revision 240 decoders" } + return RevisionDecoder( + 240, + ClientPacketDecoderServiceV240(huffmanCodec), + ServerPacketDecoderServiceV240(huffmanCodec, cache), + GameClientProtProviderV240, + GameServerProtProviderV240, + ) + } + public fun getDecoder( revision: Int, cache: CacheProvider, From cdb9f387d539432bc6e13c0bd6ce2235b7f7deb3 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:21:54 +0300 Subject: [PATCH 04/13] feat: define support for the new spotanim loop boolean --- .../outgoing/model/info/shared/extendedinfo/Spotanim.kt | 6 +++++- .../net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt | 4 ++++ .../rsprox/transcriber/text/TextPlayerInfoTranscriber.kt | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Spotanim.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Spotanim.kt index 67ed66744..d12ac4717 100644 --- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Spotanim.kt +++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/shared/extendedinfo/Spotanim.kt @@ -4,6 +4,7 @@ public class Spotanim( public val id: Int, public val delay: Int, public val height: Int, + public val loop: Boolean? = null, ) { override fun equals(other: Any?): Boolean { if (this === other) return true @@ -14,6 +15,7 @@ public class Spotanim( if (id != other.id) return false if (delay != other.delay) return false if (height != other.height) return false + if (loop != other.loop) return false return true } @@ -22,6 +24,7 @@ public class Spotanim( var result = id result = 31 * result + delay result = 31 * result + height + result = 31 * result + loop.hashCode() return result } @@ -29,7 +32,8 @@ public class Spotanim( return "Spotanim(" + "id=$id, " + "delay=$delay, " + - "height=$height" + + "height=$height, " + + "loop=$loop" + ")" } } diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt index 8d8f9fa0e..427e8b19b 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt @@ -728,6 +728,10 @@ public class TextNpcInfoTranscriber( scriptVarType("id", ScriptVarType.SPOTANIM, spotanim.id.maxUShortToMinusOne()) filteredInt("delay", spotanim.delay, 0) filteredInt("height", spotanim.height, 0) + val loop = spotanim.loop + if (loop != null) { + filteredBoolean("loop", loop) + } } } } diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt index 57b60d285..f63a64149 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextPlayerInfoTranscriber.kt @@ -741,6 +741,10 @@ public class TextPlayerInfoTranscriber( scriptVarType("id", ScriptVarType.SPOTANIM, spotanim.id.maxUShortToMinusOne()) filteredInt("delay", spotanim.delay, 0) filteredInt("height", spotanim.height, 0) + val loop = spotanim.loop + if (loop != null) { + filteredBoolean("loop", loop) + } } } } From d2a7b2defd514b1fc9b9c5b38de1cbceb667f3d3 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:38:26 +0300 Subject: [PATCH 05/13] feat: update packets --- .../decoder/codec/buttons/IfButtonDDecoder.kt | 9 +- .../decoder/codec/buttons/IfButtonTDecoder.kt | 14 +- .../codec/buttons/IfScriptTriggerDecoder.kt | 8 +- .../events/EventCameraPositionDecoder.kt | 4 +- .../codec/events/EventKeyboardDecoder.kt | 4 +- .../codec/events/EventMouseClickV2Decoder.kt | 8 +- .../friendchat/FriendChatSetRankDecoder.kt | 2 +- .../decoder/codec/locs/OpLoc1V2Decoder.kt | 10 +- .../decoder/codec/locs/OpLoc2V2Decoder.kt | 8 +- .../decoder/codec/locs/OpLoc3V2Decoder.kt | 8 +- .../decoder/codec/locs/OpLoc4V2Decoder.kt | 6 +- .../decoder/codec/locs/OpLoc5V2Decoder.kt | 10 +- .../decoder/codec/locs/OpLocTDecoder.kt | 16 +- .../codec/misc/client/SendPingReplyDecoder.kt | 4 +- .../codec/misc/user/IfCrmViewOpDecoder.kt | 12 +- .../codec/misc/user/MoveGameClickDecoder.kt | 6 +- .../misc/user/MoveMinimapClickDecoder.kt | 6 +- .../codec/misc/user/SetHeadingDecoder.kt | 2 +- .../codec/misc/user/TeleportDecoder.kt | 4 +- .../decoder/codec/npcs/OpNpc1V2Decoder.kt | 4 +- .../decoder/codec/npcs/OpNpc2V2Decoder.kt | 4 +- .../decoder/codec/npcs/OpNpc3V2Decoder.kt | 6 +- .../decoder/codec/npcs/OpNpc4V2Decoder.kt | 6 +- .../decoder/codec/npcs/OpNpc5V2Decoder.kt | 4 +- .../decoder/codec/npcs/OpNpc6Decoder.kt | 2 +- .../decoder/codec/npcs/OpNpcTDecoder.kt | 8 +- .../decoder/codec/objs/OpObj1V2Decoder.kt | 8 +- .../decoder/codec/objs/OpObj2V2Decoder.kt | 8 +- .../decoder/codec/objs/OpObj3V2Decoder.kt | 10 +- .../decoder/codec/objs/OpObj4V2Decoder.kt | 10 +- .../decoder/codec/objs/OpObj5V2Decoder.kt | 10 +- .../decoder/codec/objs/OpObj6Decoder.kt | 4 +- .../decoder/codec/objs/OpObjTDecoder.kt | 12 +- .../decoder/codec/players/OpPlayer1Decoder.kt | 4 +- .../decoder/codec/players/OpPlayer2Decoder.kt | 2 +- .../decoder/codec/players/OpPlayer3Decoder.kt | 4 +- .../decoder/codec/players/OpPlayer4Decoder.kt | 2 +- .../decoder/codec/players/OpPlayer5Decoder.kt | 4 +- .../decoder/codec/players/OpPlayer6Decoder.kt | 4 +- .../decoder/codec/players/OpPlayer7Decoder.kt | 4 +- .../decoder/codec/players/OpPlayer8Decoder.kt | 4 +- .../decoder/codec/players/OpPlayerTDecoder.kt | 8 +- .../codec/resumed/ResumePauseButtonDecoder.kt | 6 +- .../worldentities/OpWorldEntity1Decoder.kt | 4 +- .../worldentities/OpWorldEntity2Decoder.kt | 2 +- .../worldentities/OpWorldEntity3Decoder.kt | 2 +- .../worldentities/OpWorldEntity4Decoder.kt | 2 +- .../worldentities/OpWorldEntity5Decoder.kt | 2 +- .../worldentities/OpWorldEntity6Decoder.kt | 2 +- .../worldentities/OpWorldEntityTDecoder.kt | 12 +- .../incoming/decoder/prot/GameClientProtId.kt | 200 ++++++------ .../codec/camera/CamLookAtCyclesDecoder.kt | 10 +- .../codec/camera/CamLookAtV2Decoder.kt | 4 +- .../codec/camera/CamLookAtV3Decoder.kt | 8 +- .../codec/camera/CamMoveToArcV2Decoder.kt | 16 +- .../codec/camera/CamMoveToArcV3Decoder.kt | 12 +- .../codec/camera/CamMoveToCyclesV2Decoder.kt | 10 +- .../codec/camera/CamMoveToCyclesV3Decoder.kt | 12 +- .../codec/camera/CamMoveToV2Decoder.kt | 8 +- .../codec/camera/CamMoveToV3Decoder.kt | 8 +- .../camera/CamRotateToCoordinateV2Decoder.kt | 10 +- .../camera/CamRotateToCoordinateV3Decoder.kt | 12 +- .../codec/camera/CamTargetV4Decoder.kt | 4 +- .../decoder/codec/camera/CamUnlockDecoder.kt | 2 +- .../codec/interfaces/IfClearInvDecoder.kt | 4 +- .../codec/interfaces/IfMoveSubDecoder.kt | 7 +- .../codec/interfaces/IfOpenSubDecoder.kt | 2 +- .../codec/interfaces/IfOpenTopDecoder.kt | 2 +- .../codec/interfaces/IfSetAngleDecoder.kt | 8 +- .../codec/interfaces/IfSetAnimDecoder.kt | 6 +- .../codec/interfaces/IfSetColourDecoder.kt | 6 +- .../codec/interfaces/IfSetEventsV2Decoder.kt | 12 +- .../codec/interfaces/IfSetHideDecoder.kt | 6 +- .../codec/interfaces/IfSetModelV2Decoder.kt | 2 +- .../interfaces/IfSetNpcHeadActiveDecoder.kt | 6 +- .../codec/interfaces/IfSetNpcHeadDecoder.kt | 6 +- .../codec/interfaces/IfSetObjectDecoder.kt | 8 +- .../interfaces/IfSetPlayerHeadDecoder.kt | 4 +- .../IfSetPlayerModelBaseColourDecoder.kt | 8 +- .../IfSetPlayerModelBodyTypeDecoder.kt | 2 +- .../interfaces/IfSetPlayerModelObjDecoder.kt | 4 +- .../interfaces/IfSetPlayerModelSelfDecoder.kt | 4 +- .../codec/interfaces/IfSetPositionDecoder.kt | 8 +- .../interfaces/IfSetRotateSpeedDecoder.kt | 4 +- .../codec/interfaces/IfSetTextDecoder.kt | 2 +- .../decoder/codec/inv/UpdateInvFullDecoder.kt | 4 +- .../codec/inv/UpdateInvStopTransmitDecoder.kt | 2 +- .../codec/map/RebuildRegionV2Decoder.kt | 4 +- .../codec/map/StaticRebuildV2Decoder.kt | 6 +- .../misc/client/UpdateRebootTimerV2Decoder.kt | 2 +- .../misc/player/ChatFilterSettingsDecoder.kt | 4 +- .../codec/misc/player/SetPlayerOpDecoder.kt | 4 +- .../codec/misc/player/UpdateStatV2Decoder.kt | 6 +- .../decoder/codec/sound/MidiJingleDecoder.kt | 4 +- .../codec/sound/MidiSongStopDecoder.kt | 4 +- .../decoder/codec/sound/MidiSongV2Decoder.kt | 6 +- .../sound/MidiSongWithSecondaryDecoder.kt | 10 +- .../decoder/codec/sound/MidiSwapDecoder.kt | 6 +- .../codec/specific/AnimSpecificDecoder.kt | 4 +- .../codec/specific/LocAnimSpecificDecoder.kt | 6 +- .../codec/specific/MapAnimSpecificDecoder.kt | 8 +- .../codec/specific/NpcAnimSpecificDecoder.kt | 6 +- .../specific/NpcHeadIconSpecificDecoder.kt | 6 +- .../specific/NpcSpotAnimSpecificDecoder.kt | 6 +- .../codec/specific/ObjAddSpecificDecoder.kt | 14 +- .../codec/specific/ObjCountSpecificDecoder.kt | 6 +- .../specific/ObjCustomiseSpecificDecoder.kt | 16 +- .../codec/specific/ObjDelSpecificDecoder.kt | 6 +- .../specific/ObjEnabledOpsSpecificDecoder.kt | 4 +- .../specific/ObjUncustomiseSpecificDecoder.kt | 6 +- .../specific/PlayerSpotAnimSpecificDecoder.kt | 6 +- .../specific/ProjAnimSpecificV4Decoder.kt | 18 +- .../decoder/codec/varp/VarpLargeDecoder.kt | 2 +- .../decoder/codec/varp/VarpSmallDecoder.kt | 4 +- .../header/UpdateZoneFullFollowsDecoder.kt | 6 +- .../UpdateZonePartialEnclosedDecoder.kt | 22 +- .../header/UpdateZonePartialFollowsDecoder.kt | 6 +- .../zone/payload/LocAddChangeV2Decoder.kt | 12 +- .../codec/zone/payload/LocAnimDecoder.kt | 4 +- .../codec/zone/payload/LocDelDecoder.kt | 4 +- .../codec/zone/payload/LocMergeDecoder.kt | 14 +- .../codec/zone/payload/MapAnimDecoder.kt | 6 +- .../zone/payload/MapProjAnimV2Decoder.kt | 16 +- .../codec/zone/payload/ObjAddDecoder.kt | 10 +- .../codec/zone/payload/ObjCountDecoder.kt | 4 +- .../codec/zone/payload/ObjCustomiseDecoder.kt | 12 +- .../codec/zone/payload/ObjDelDecoder.kt | 6 +- .../zone/payload/ObjEnabledOpsDecoder.kt | 6 +- .../zone/payload/ObjUncustomiseDecoder.kt | 4 +- .../zone/payload/ScriptedProjAddDecoder.kt | 28 +- .../zone/payload/ScriptedProjChangeDecoder.kt | 14 +- .../codec/zone/payload/SoundAreaDecoder.kt | 10 +- .../outgoing/decoder/prot/GameServerProtId.kt | 287 +++++++++--------- .../model/info/npcinfo/NpcInfoClient.kt | 208 ++++++------- .../model/info/playerinfo/PlayerInfoClient.kt | 158 +++++----- 135 files changed, 873 insertions(+), 876 deletions(-) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt index a1ad7c181..2630691ec 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonDDecoder.kt @@ -3,7 +3,6 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt import net.rsprot.protocol.util.gCombinedId -import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.buttons.IfButtonD import net.rsprox.protocol.session.Session @@ -16,12 +15,12 @@ public class IfButtonDDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfButtonD { - val selectedCombinedId = buffer.gCombinedIdAlt1() - val selectedObj = buffer.g2Alt1() - val selectedSub = buffer.g2Alt3() + val selectedSub = buffer.g2Alt2() val targetCombinedId = buffer.gCombinedId() + val targetSub = buffer.g2() + val selectedCombinedId = buffer.gCombinedId() val targetObj = buffer.g2Alt2() - val targetSub = buffer.g2Alt2() + val selectedObj = buffer.g2Alt3() return IfButtonD( selectedCombinedId, selectedSub, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt index 8d05f4102..3e98122b9 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfButtonTDecoder.kt @@ -3,7 +3,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt import net.rsprot.protocol.util.gCombinedId -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedIdAlt3 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.buttons.IfButtonT import net.rsprox.protocol.session.Session @@ -16,12 +16,12 @@ public class IfButtonTDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfButtonT { - val targetCombinedId = buffer.gCombinedId() - val selectedSub = buffer.g2Alt2() - val targetObj = buffer.g2Alt3() - val targetSub = buffer.g2Alt1() - val selectedObj = buffer.g2Alt2() - val selectedCombinedId = buffer.gCombinedIdAlt2() + val selectedObj = buffer.g2Alt1() + val selectedCombinedId = buffer.gCombinedId() + val targetSub = buffer.g2Alt3() + val targetObj = buffer.g2Alt2() + val selectedSub = buffer.g2Alt3() + val targetCombinedId = buffer.gCombinedIdAlt3() return IfButtonT( selectedCombinedId, selectedSub, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt index d3e095ff8..aa229302f 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/buttons/IfScriptTriggerDecoder.kt @@ -3,7 +3,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.buttons import net.rsprot.buffer.JagByteBuf import net.rsprot.buffer.extensions.toByteArray import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprot.protocol.util.gCombinedIdAlt2 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.buttons.IfScriptTrigger import net.rsprox.protocol.session.Session @@ -17,10 +17,10 @@ public class IfScriptTriggerDecoder : ProxyMessageDecoder { session: Session, ): IfScriptTrigger { // Function is method(int combinedId, int sub, int obj, int crc, Object[] args) - val sub = buffer.g2Alt3() + val crc = buffer.g4Alt2() val obj = buffer.g2() - val combinedId = buffer.gCombinedIdAlt1() - val crc = buffer.g4Alt1() + val combinedId = buffer.gCombinedIdAlt2() + val sub = buffer.g2Alt1() val bytes = buffer.buffer.toByteArray() return IfScriptTrigger( combinedId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt index 6efe88426..83a7f7b52 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/events/EventCameraPositionDecoder.kt @@ -14,8 +14,8 @@ public class EventCameraPositionDecoder : ProxyMessageDecoder { val keys = ByteArray(count) var lastTransmittedKeyPress: Int = -1 for (i in 0.. { buffer: JagByteBuf, session: Session, ): EventMouseClickV2 { - val x = buffer.g2Alt2() - val packed = buffer.g2Alt3() - val y = buffer.g2Alt2() - val code = buffer.g1Alt3() + val code = buffer.g1() + val y = buffer.g2Alt3() + val packed = buffer.g2() + val x = buffer.g2Alt3() val rightClick = packed and 0x1 != 0 val lastTransmittedMouseClick = packed ushr 1 return EventMouseClickV2( diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt index dd8f7fba8..c8cb9823c 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/friendchat/FriendChatSetRankDecoder.kt @@ -14,7 +14,7 @@ public class FriendChatSetRankDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): FriendChatSetRank { - val rank = buffer.g1Alt3() + val rank = buffer.g1Alt2() val name = buffer.gjstr() return FriendChatSetRank( name, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt index 8d87aa957..c32faa05c 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc1V2Decoder.kt @@ -14,11 +14,11 @@ public class OpLoc1V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpLocV2 { - val z = buffer.g2Alt2() - val x = buffer.g2Alt1() - val controlKey = buffer.g1Alt1() == 1 - val subop = buffer.g1Alt1() - val id = buffer.g2() + val controlKey = buffer.g1Alt3() == 1 + val z = buffer.g2Alt3() + val subop = buffer.g1() + val x = buffer.g2Alt3() + val id = buffer.g2Alt2() return OpLocV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt index a3dbca4db..21f4a2034 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc2V2Decoder.kt @@ -14,11 +14,11 @@ public class OpLoc2V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpLocV2 { - val z = buffer.g2Alt3() - val id = buffer.g2Alt3() - val x = buffer.g2() + val z = buffer.g2() val subop = buffer.g1Alt2() - val controlKey = buffer.g1() == 1 + val controlKey = buffer.g1Alt3() == 1 + val id = buffer.g2() + val x = buffer.g2Alt1() return OpLocV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt index e2a5fd129..7e690ac11 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc3V2Decoder.kt @@ -14,11 +14,11 @@ public class OpLoc3V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpLocV2 { - val id = buffer.g2Alt2() val subop = buffer.g1Alt3() - val controlKey = buffer.g1() == 1 - val z = buffer.g2Alt3() - val x = buffer.g2Alt2() + val controlKey = buffer.g1Alt3() == 1 + val z = buffer.g2Alt2() + val id = buffer.g2Alt3() + val x = buffer.g2() return OpLocV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt index ce3ddbb8d..91ce9aea4 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc4V2Decoder.kt @@ -15,10 +15,10 @@ public class OpLoc4V2Decoder : ProxyMessageDecoder { session: Session, ): OpLocV2 { val controlKey = buffer.g1Alt1() == 1 - val x = buffer.g2Alt1() - val id = buffer.g2Alt3() - val subop = buffer.g1Alt2() + val id = buffer.g2Alt1() val z = buffer.g2() + val subop = buffer.g1Alt1() + val x = buffer.g2() return OpLocV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt index 446f4d964..97e0eb3d1 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLoc5V2Decoder.kt @@ -14,11 +14,11 @@ public class OpLoc5V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpLocV2 { - val z = buffer.g2Alt3() - val x = buffer.g2Alt1() - val controlKey = buffer.g1Alt1() == 1 - val subop = buffer.g1Alt2() - val id = buffer.g2() + val z = buffer.g2Alt1() + val x = buffer.g2() + val subop = buffer.g1Alt1() + val controlKey = buffer.g1Alt3() == 1 + val id = buffer.g2Alt3() return OpLocV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt index adff25fcd..26b75672f 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/locs/OpLocTDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.locs import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.locs.OpLocT import net.rsprox.protocol.session.Session @@ -15,13 +15,13 @@ public class OpLocTDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpLocT { - val controlKey = buffer.g1Alt2() == 1 - val selectedSub = buffer.g2Alt2() - val id = buffer.g2Alt1() - val selectedCombinedId = buffer.gCombinedIdAlt1() - val z = buffer.g2Alt3() - val x = buffer.g2Alt1() - val selectedObj = buffer.g2Alt1() + val controlKey = buffer.g1Alt1() == 1 + val x = buffer.g2() + val id = buffer.g2() + val selectedCombinedId = buffer.gCombinedId() + val selectedSub = buffer.g2Alt1() + val z = buffer.g2Alt1() + val selectedObj = buffer.g2Alt2() return OpLocT( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt index 075f6e12f..e84c640f2 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/client/SendPingReplyDecoder.kt @@ -14,10 +14,10 @@ public class SendPingReplyDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): SendPingReply { - val value1 = buffer.g4Alt3() - val value2 = buffer.g4() val fps = buffer.g1Alt1() val gcPercentTime = buffer.g1Alt2() + val value1 = buffer.g4Alt1() + val value2 = buffer.g4Alt3() return SendPingReply( fps, gcPercentTime, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt index 3aef5da22..7f4e1dba2 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/IfCrmViewOpDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.misc.user import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.misc.user.IfCrmViewOp import net.rsprox.protocol.session.Session @@ -15,12 +15,12 @@ public class IfCrmViewOpDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfCrmViewOp { - val combinedId = buffer.gCombinedIdAlt2() + val behaviour2 = buffer.g4() + val behaviour1 = buffer.g4Alt1() + val behaviour3 = buffer.g4Alt3() val serverTarget = buffer.g4() - val behaviour1 = buffer.g4Alt2() - val behaviour3 = buffer.g4Alt2() - val behaviour2 = buffer.g4Alt1() - val sub = buffer.g2Alt1() + val sub = buffer.g2Alt2() + val combinedId = buffer.gCombinedId() return IfCrmViewOp( serverTarget, combinedId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt index 68d819218..7a846f916 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveGameClickDecoder.kt @@ -14,9 +14,9 @@ public class MoveGameClickDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MoveGameClick { - val x = buffer.g2Alt1() - val z = buffer.g2Alt1() - val keyCombination = buffer.g1Alt3() + val z = buffer.g2Alt3() + val keyCombination = buffer.g1Alt2() + val x = buffer.g2Alt3() return MoveGameClick( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt index 5311577c9..4f2baa142 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/MoveMinimapClickDecoder.kt @@ -15,9 +15,9 @@ public class MoveMinimapClickDecoder : ProxyMessageDecoder { session: Session, ): MoveMinimapClick { // The x, z and keyCombination get scrambled between revisions - val x = buffer.g2Alt1() - val z = buffer.g2Alt1() - val keyCombination = buffer.g1Alt3() + val z = buffer.g2Alt3() + val keyCombination = buffer.g1Alt2() + val x = buffer.g2Alt3() // The arguments below are consistent across revisions val minimapWidth = buffer.g1() diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt index 41b3c3e9d..0ee2f62cd 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/SetHeadingDecoder.kt @@ -14,7 +14,7 @@ public class SetHeadingDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): SetHeading { - val heading = buffer.g1() + val heading = buffer.g1Alt1() return SetHeading(heading) } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt index d9f57916b..f13b3fe2d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/TeleportDecoder.kt @@ -14,10 +14,10 @@ public class TeleportDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): Teleport { + val level = buffer.g1Alt3() + val x = buffer.g2Alt3() val oculusSyncValue = buffer.g4() - val level = buffer.g1Alt1() val z = buffer.g2() - val x = buffer.g2Alt2() return Teleport( oculusSyncValue, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt index fb31a75d3..0f2073239 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc1V2Decoder.kt @@ -15,8 +15,8 @@ public class OpNpc1V2Decoder : ProxyMessageDecoder { session: Session, ): OpNpcV2 { val index = buffer.g2Alt1() - val subop = buffer.g1Alt2() - val controlKey = buffer.g1Alt3() == 1 + val subop = buffer.g1() + val controlKey = buffer.g1Alt1() == 1 return OpNpcV2( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt index 4d1dd25ed..f8c5ecf34 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc2V2Decoder.kt @@ -14,8 +14,8 @@ public class OpNpc2V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpNpcV2 { - val index = buffer.g2Alt3() - val subop = buffer.g1Alt2() + val index = buffer.g2Alt1() + val subop = buffer.g1Alt1() val controlKey = buffer.g1Alt3() == 1 return OpNpcV2( index, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt index bb031bf2f..685b2e57d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc3V2Decoder.kt @@ -14,9 +14,9 @@ public class OpNpc3V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpNpcV2 { - val controlKey = buffer.g1Alt2() == 1 - val subop = buffer.g1Alt3() - val index = buffer.g2Alt2() + val index = buffer.g2Alt1() + val controlKey = buffer.g1Alt3() == 1 + val subop = buffer.g1Alt2() return OpNpcV2( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt index 629719279..c3cb83d48 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc4V2Decoder.kt @@ -14,9 +14,9 @@ public class OpNpc4V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpNpcV2 { - val subop = buffer.g1Alt1() - val index = buffer.g2() - val controlKey = buffer.g1Alt2() == 1 + val controlKey = buffer.g1Alt3() == 1 + val subop = buffer.g1() + val index = buffer.g2Alt2() return OpNpcV2( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt index 91d5331b3..56b739391 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc5V2Decoder.kt @@ -14,9 +14,9 @@ public class OpNpc5V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpNpcV2 { - val subop = buffer.g1Alt1() + val subop = buffer.g1() val controlKey = buffer.g1Alt2() == 1 - val index = buffer.g2Alt2() + val index = buffer.g2() return OpNpcV2( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt index 64d013778..315b4d7ab 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpc6Decoder.kt @@ -14,7 +14,7 @@ public class OpNpc6Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpNpc6 { - val id = buffer.g2() + val id = buffer.g2Alt2() return OpNpc6(id) } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt index 031dda607..9de7dfebc 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/npcs/OpNpcTDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.npcs import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedId +import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.npcs.OpNpcT import net.rsprox.protocol.session.Session @@ -15,11 +15,11 @@ public class OpNpcTDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpNpcT { - val controlKey = buffer.g1Alt2() == 1 + val controlKey = buffer.g1Alt3() == 1 + val selectedCombinedId = buffer.gCombinedIdAlt1() val selectedSub = buffer.g2() + val selectedObj = buffer.g2Alt3() val index = buffer.g2Alt2() - val selectedObj = buffer.g2() - val selectedCombinedId = buffer.gCombinedId() return OpNpcT( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt index b5d7c2e0b..85cc5bad0 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj1V2Decoder.kt @@ -14,11 +14,11 @@ public class OpObj1V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObjV2 { - val id = buffer.g2Alt2() - val subop = buffer.g1Alt3() - val z = buffer.g2Alt2() + val subop = buffer.g1Alt2() + val x = buffer.g2Alt2() + val z = buffer.g2Alt3() val controlKey = buffer.g1Alt3() == 1 - val x = buffer.g2() + val id = buffer.g2() return OpObjV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt index 2d386378b..62785a528 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj2V2Decoder.kt @@ -14,11 +14,11 @@ public class OpObj2V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObjV2 { - val controlKey = buffer.g1Alt1() == 1 - val subop = buffer.g1Alt3() + val subop = buffer.g1Alt2() val z = buffer.g2() - val id = buffer.g2Alt1() - val x = buffer.g2Alt3() + val id = buffer.g2Alt2() + val x = buffer.g2Alt2() + val controlKey = buffer.g1Alt1() == 1 return OpObjV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt index 28c9cc668..c9f3e3958 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj3V2Decoder.kt @@ -14,11 +14,11 @@ public class OpObj3V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObjV2 { - val controlKey = buffer.g1Alt1() == 1 - val x = buffer.g2Alt1() - val id = buffer.g2Alt3() - val subop = buffer.g1Alt1() - val z = buffer.g2Alt2() + val x = buffer.g2Alt2() + val controlKey = buffer.g1Alt2() == 1 + val subop = buffer.g1() + val id = buffer.g2Alt1() + val z = buffer.g2() return OpObjV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt index e2d969abd..a986a8c1a 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj4V2Decoder.kt @@ -14,11 +14,11 @@ public class OpObj4V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObjV2 { - val subop = buffer.g1Alt3() - val id = buffer.g2() - val x = buffer.g2() - val z = buffer.g2Alt1() - val controlKey = buffer.g1Alt2() == 1 + val subop = buffer.g1Alt2() + val controlKey = buffer.g1Alt3() == 1 + val z = buffer.g2Alt3() + val id = buffer.g2Alt2() + val x = buffer.g2Alt1() return OpObjV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt index 2c56c81dc..ffd001403 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj5V2Decoder.kt @@ -14,11 +14,11 @@ public class OpObj5V2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObjV2 { - val subop = buffer.g1Alt2() - val x = buffer.g2Alt2() - val id = buffer.g2() - val z = buffer.g2Alt3() - val controlKey = buffer.g1Alt1() == 1 + val id = buffer.g2Alt3() + val subop = buffer.g1() + val x = buffer.g2Alt1() + val controlKey = buffer.g1Alt3() == 1 + val z = buffer.g2Alt2() return OpObjV2( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt index 8e862ab9e..433f29044 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObj6Decoder.kt @@ -14,9 +14,9 @@ public class OpObj6Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObj6 { - val z = buffer.g2Alt2() val id = buffer.g2Alt1() - val x = buffer.g2Alt1() + val z = buffer.g2Alt3() + val x = buffer.g2() return OpObj6( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt index cb459b93e..e61e20245 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/objs/OpObjTDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.objs import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.objs.OpObjT import net.rsprox.protocol.session.Session @@ -15,13 +15,13 @@ public class OpObjTDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpObjT { - val selectedObj = buffer.g2Alt1() - val id = buffer.g2Alt2() val x = buffer.g2() - val selectedCombinedId = buffer.gCombinedIdAlt2() - val controlKey = buffer.g1() == 1 + val selectedCombinedId = buffer.gCombinedId() + val controlKey = buffer.g1Alt3() == 1 val selectedSub = buffer.g2Alt1() - val z = buffer.g2() + val z = buffer.g2Alt3() + val id = buffer.g2Alt3() + val selectedObj = buffer.g2() return OpObjT( id, x, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt index 255706022..b3f1132ec 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer1Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer1Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { - val controlKey = buffer.g1Alt3() == 1 - val index = buffer.g2Alt1() + val controlKey = buffer.g1Alt2() == 1 + val index = buffer.g2() return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt index afca05f4c..d5c7618fb 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer2Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { + val controlKey = buffer.g1Alt3() == 1 val index = buffer.g2Alt1() - val controlKey = buffer.g1Alt2() == 1 return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt index 6e794a631..b3b5697fe 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer3Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer3Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { - val controlKey = buffer.g1Alt2() == 1 - val index = buffer.g2Alt3() + val index = buffer.g2Alt2() + val controlKey = buffer.g1Alt1() == 1 return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt index 9f97fef27..53b63610b 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer4Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer4Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { + val controlKey = buffer.g1Alt3() == 1 val index = buffer.g2() - val controlKey = buffer.g1() == 1 return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt index 8565d3bf9..1f28c23e3 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer5Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer5Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { - val controlKey = buffer.g1Alt3() == 1 - val index = buffer.g2() + val index = buffer.g2Alt2() + val controlKey = buffer.g1Alt1() == 1 return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt index a5ff72d12..830b4a0d5 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer6Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer6Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { - val index = buffer.g2Alt3() - val controlKey = buffer.g1Alt3() == 1 + val controlKey = buffer.g1Alt1() == 1 + val index = buffer.g2Alt1() return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt index e794e24d7..205381668 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer7Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer7Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { - val controlKey = buffer.g1() == 1 - val index = buffer.g2() + val controlKey = buffer.g1Alt1() == 1 + val index = buffer.g2Alt1() return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt index 31b04a955..de44efdf1 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayer8Decoder.kt @@ -14,8 +14,8 @@ public class OpPlayer8Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayer { - val index = buffer.g2() - val controlKey = buffer.g1Alt2() == 1 + val index = buffer.g2Alt2() + val controlKey = buffer.g1() == 1 return OpPlayer( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt index b9e0853a8..2186fc605 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/players/OpPlayerTDecoder.kt @@ -15,11 +15,11 @@ public class OpPlayerTDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpPlayerT { - val selectedSub = buffer.g2Alt2() - val controlKey = buffer.g1Alt1() == 1 - val selectedObj = buffer.g2Alt3() + val controlKey = buffer.g1Alt2() == 1 + val selectedSub = buffer.g2Alt1() val selectedCombinedId = buffer.gCombinedIdAlt2() - val index = buffer.g2() + val selectedObj = buffer.g2Alt1() + val index = buffer.g2Alt3() return OpPlayerT( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt index 3a89525d7..39b9a080e 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/resumed/ResumePauseButtonDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.resumed import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.resumed.ResumePauseButton import net.rsprox.protocol.session.Session @@ -15,8 +15,8 @@ public class ResumePauseButtonDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ResumePauseButton { - val combinedId = buffer.gCombinedIdAlt3() - val sub = buffer.g2() + val combinedId = buffer.gCombinedId() + val sub = buffer.g2Alt3() return ResumePauseButton( combinedId, sub, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt index 30911c0b7..d6732f3ae 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity1Decoder.kt @@ -14,8 +14,8 @@ public class OpWorldEntity1Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpWorldEntity { - val index = buffer.g2Alt1() - val controlKey = buffer.g1Alt3() == 1 + val index = buffer.g2() + val controlKey = buffer.g1Alt2() == 1 return OpWorldEntity( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt index 94bef6ef6..0a6c4bc9f 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity2Decoder.kt @@ -14,8 +14,8 @@ public class OpWorldEntity2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpWorldEntity { - val index = buffer.g2Alt2() val controlKey = buffer.g1Alt1() == 1 + val index = buffer.g2() return OpWorldEntity( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt index 5cb74901a..4f6349c9a 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity3Decoder.kt @@ -15,7 +15,7 @@ public class OpWorldEntity3Decoder : ProxyMessageDecoder { session: Session, ): OpWorldEntity { val index = buffer.g2() - val controlKey = buffer.g1Alt3() == 1 + val controlKey = buffer.g1() == 1 return OpWorldEntity( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt index bf36224b6..5db3e8948 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity4Decoder.kt @@ -15,7 +15,7 @@ public class OpWorldEntity4Decoder : ProxyMessageDecoder { session: Session, ): OpWorldEntity { val index = buffer.g2() - val controlKey = buffer.g1() == 1 + val controlKey = buffer.g1Alt2() == 1 return OpWorldEntity( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt index 54db91367..1199ffbac 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity5Decoder.kt @@ -15,7 +15,7 @@ public class OpWorldEntity5Decoder : ProxyMessageDecoder { session: Session, ): OpWorldEntity { val controlKey = buffer.g1Alt1() == 1 - val index = buffer.g2Alt2() + val index = buffer.g2Alt3() return OpWorldEntity( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt index c13706e18..cb9261e4a 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntity6Decoder.kt @@ -14,7 +14,7 @@ public class OpWorldEntity6Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpWorldEntity6 { - val id = buffer.g2Alt3() + val id = buffer.g2Alt2() return OpWorldEntity6(id) } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt index d9ecccbe5..947e05e24 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/worldentities/OpWorldEntityTDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.incoming.decoder.codec.worldentities import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.incoming.model.worldentities.OpWorldEntityT import net.rsprox.protocol.session.Session @@ -15,11 +15,11 @@ public class OpWorldEntityTDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): OpWorldEntityT { - val index = buffer.g2Alt2() - val selectedCombinedId = buffer.gCombinedIdAlt2() - val selectedObj = buffer.g2Alt3() - val selectedSub = buffer.g2Alt3() - val controlKey = buffer.g1Alt2() == 1 + val index = buffer.g2Alt3() + val selectedSub = buffer.g2Alt2() + val selectedObj = buffer.g2() + val selectedCombinedId = buffer.gCombinedId() + val controlKey = buffer.g1Alt3() == 1 return OpWorldEntityT( index, controlKey, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt index 07a0e70da..84113ce25 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/prot/GameClientProtId.kt @@ -1,105 +1,105 @@ package net.rsprox.protocol.v240.game.incoming.decoder.prot internal object GameClientProtId { - const val OPNPC6 = 0 - const val SEND_PING_REPLY = 1 - const val CLANSETTINGS_FULL_REQUEST = 2 - const val OPPLAYER2 = 3 - const val IDLE = 4 - const val EXIT_FREECAM = 5 - const val EVENT_NATIVE_MOUSE_MOVE = 6 - const val OPOBJ3_V2 = 7 - const val EVENT_CAMERA_POSITION = 8 - const val IGNORELIST_DEL = 9 - const val WINDOW_STATUS = 10 + const val EVENT_MOUSE_CLICK_V1 = 0 + const val IF_BUTTONX = 1 + const val OPWORLDENTITY4 = 2 + const val RESUME_P_OBJDIALOG = 3 + const val OPPLAYER6 = 4 + const val IDLE = 7 + const val OPLOC3_V2 = 8 + const val OPOBJ6 = 9 + const val OPWORLDENTITYT = 10 + const val IF_BUTTON = 11 const val REFLECTION_CHECK_REPLY = 12 - const val OPNPC2_V2 = 13 - const val OPWORLDENTITY1 = 14 - const val OPLOC4_V2 = 15 - const val EVENT_MOUSE_SCROLL = 16 - const val HISCORE_REQUEST = 17 - const val OPNPC3_V2 = 19 - const val FRIENDCHAT_JOIN_LEAVE = 20 - const val OPPLAYER7 = 22 - const val OPNPCU = 23 - const val MAP_BUILD_COMPLETE = 24 - const val RESUME_P_NAMEDIALOG = 26 - const val IF_BUTTONT = 27 - const val FRIENDLIST_ADD = 28 - const val EVENT_APPLET_FOCUS = 29 - const val OPOBJ4_V2 = 31 - const val RESUME_P_OBJDIALOG = 32 - const val DETECT_MODIFIED_CLIENT = 33 - const val CLIENT_CHEAT = 34 - const val EVENT_MOUSE_CLICK_V2 = 35 - const val OPPLAYER4 = 37 - const val CLANCHANNEL_KICKUSER = 38 - const val SOUND_JINGLEEND = 39 - const val IF_SUBOP = 40 - const val OPOBJ5_V2 = 43 - const val SET_HEADING = 44 - const val OPNPC4_V2 = 45 - const val OPOBJ1_V2 = 46 - const val IF_BUTTONX = 47 - const val IF_BUTTOND = 48 - const val TELEPORT = 50 - const val IF_BUTTON = 51 - const val OPLOCU = 52 - const val OPPLAYER8 = 53 - const val EVENT_KEYBOARD = 54 - const val FRIENDCHAT_SETRANK = 55 - const val IF_SCRIPT_TRIGGER = 56 - const val OPPLAYER5 = 57 - const val OPOBJ6 = 58 - const val SET_CHATFILTERSETTINGS = 59 - const val SEND_SNAPSHOT = 60 - const val MEMBERSHIP_PROMOTION_ELIGIBILITY = 61 - const val OPLOCT = 62 - const val RESUME_P_COUNTDIALOG_LONG = 63 - const val RESUME_P_STRINGDIALOG = 64 - const val FRIENDLIST_DEL = 65 - const val EVENT_MOUSE_CLICK_V1 = 66 - const val MOVE_MINIMAPCLICK = 67 - const val MESSAGE_PUBLIC = 69 - const val OPPLAYER6 = 70 - const val OPWORLDENTITYT = 72 - const val OPLOC1_V2 = 73 - const val OPOBJ2_V2 = 74 - const val RESUME_P_COUNTDIALOG = 75 - const val OPOBJT = 76 - const val UPDATE_PLAYER_MODEL_V2 = 77 - const val OPLOC6 = 78 - const val OPPLAYERT = 79 - const val OPWORLDENTITY2 = 80 - const val IGNORELIST_ADD = 82 - const val OPWORLDENTITY4 = 83 - const val AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = 84 - const val OPNPC5_V2 = 85 - const val OPNPCT = 86 - const val OPPLAYERU = 87 - const val NO_TIMEOUT = 89 - const val OPWORLDENTITYU = 90 - const val IF_CRMVIEW_OP = 91 - const val OPPLAYER3 = 92 - const val OPPLAYER1 = 93 - const val CLOSE_MODAL = 95 - const val AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = 96 - const val CONNECTION_TELEMETRY = 97 - const val OPWORLDENTITY6 = 98 - const val CLICKWORLDMAP = 99 - const val OPWORLDENTITY3 = 100 - const val FRIENDCHAT_KICK = 101 - const val OPNPC1_V2 = 102 - const val OPLOC2_V2 = 103 - const val OPLOC3_V2 = 104 - const val RSEVEN_STATUS = 105 - const val OPWORLDENTITY5 = 106 - const val BUG_REPORT = 108 - const val EVENT_MOUSE_MOVE = 110 - const val MESSAGE_PRIVATE = 111 - const val CLANCHANNEL_FULL_REQUEST = 112 - const val OPOBJU = 113 - const val MOVE_GAMECLICK = 114 - const val RESUME_PAUSEBUTTON = 115 - const val OPLOC5_V2 = 116 + const val TELEPORT = 13 + const val BUG_REPORT = 14 + const val IF_CRMVIEW_OP = 15 + const val SET_CHATFILTERSETTINGS = 16 + const val AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = 17 + const val OPPLAYER2 = 21 + const val OPOBJ3_V2 = 22 + const val OPWORLDENTITY6 = 25 + const val MAP_BUILD_COMPLETE = 27 + const val CONNECTION_TELEMETRY = 29 + const val EVENT_APPLET_FOCUS = 30 + const val SEND_PING_REPLY = 32 + const val CLANCHANNEL_FULL_REQUEST = 33 + const val OPNPC4_V2 = 35 + const val OPPLAYER3 = 36 + const val CLANCHANNEL_KICKUSER = 37 + const val OPOBJT = 38 + const val IF_BUTTOND = 39 + const val EVENT_MOUSE_CLICK_V2 = 40 + const val OPPLAYER8 = 41 + const val OPPLAYERU = 42 + const val OPNPC3_V2 = 43 + const val WINDOW_STATUS = 44 + const val OPPLAYERT = 45 + const val SOUND_JINGLEEND = 46 + const val EVENT_KEYBOARD = 47 + const val OPWORLDENTITY2 = 48 + const val OPWORLDENTITY3 = 49 + const val OPPLAYER7 = 50 + const val FRIENDCHAT_KICK = 51 + const val OPPLAYER5 = 52 + const val RESUME_P_STRINGDIALOG = 54 + const val EVENT_CAMERA_POSITION = 55 + const val MESSAGE_PUBLIC = 56 + const val OPPLAYER1 = 57 + const val IF_SCRIPT_TRIGGER = 58 + const val OPNPC1_V2 = 59 + const val AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = 60 + const val MOVE_MINIMAPCLICK = 61 + const val RESUME_P_COUNTDIALOG = 62 + const val OPNPCT = 63 + const val OPPLAYER4 = 64 + const val OPOBJ4_V2 = 65 + const val FRIENDCHAT_SETRANK = 66 + const val FRIENDLIST_ADD = 67 + const val OPLOCT = 68 + const val OPLOC4_V2 = 69 + const val RESUME_P_NAMEDIALOG = 70 + const val EXIT_FREECAM = 71 + const val OPNPC5_V2 = 73 + const val OPLOC1_V2 = 74 + const val OPOBJ5_V2 = 75 + const val MEMBERSHIP_PROMOTION_ELIGIBILITY = 76 + const val OPLOC5_V2 = 77 + const val CLICKWORLDMAP = 78 + const val CLIENT_CHEAT = 79 + const val IF_BUTTONT = 80 + const val IGNORELIST_ADD = 81 + const val RESUME_PAUSEBUTTON = 82 + const val EVENT_MOUSE_SCROLL = 83 + const val OPOBJU = 84 + const val OPWORLDENTITYU = 85 + const val IGNORELIST_DEL = 86 + const val OPNPC2_V2 = 87 + const val EVENT_NATIVE_MOUSE_MOVE = 88 + const val RSEVEN_STATUS = 89 + const val OPLOC2_V2 = 90 + const val UPDATE_PLAYER_MODEL_V2 = 91 + const val SEND_SNAPSHOT = 92 + const val OPWORLDENTITY5 = 93 + const val IF_SUBOP = 95 + const val OPWORLDENTITY1 = 96 + const val FRIENDCHAT_JOIN_LEAVE = 97 + const val CLOSE_MODAL = 98 + const val NO_TIMEOUT = 99 + const val CLANSETTINGS_FULL_REQUEST = 100 + const val OPNPC6 = 101 + const val MOVE_GAMECLICK = 102 + const val DETECT_MODIFIED_CLIENT = 103 + const val OPLOC6 = 105 + const val OPNPCU = 107 + const val MESSAGE_PRIVATE = 108 + const val SET_HEADING = 109 + const val HISCORE_REQUEST = 110 + const val RESUME_P_COUNTDIALOG_LONG = 111 + const val OPOBJ1_V2 = 112 + const val OPOBJ2_V2 = 113 + const val EVENT_MOUSE_MOVE = 114 + const val FRIENDLIST_DEL = 115 + const val OPLOCU = 116 } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt index 6fbc8b98c..071d0eedb 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtCyclesDecoder.kt @@ -14,12 +14,12 @@ internal class CamLookAtCyclesDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamLookAtCycles { - val cycles = buffer.g2() - val heightRelative = buffer.g1Alt3() == 1 - val x = buffer.g2() - val easing = buffer.g1Alt2() + val x = buffer.g2Alt2() + val cycles = buffer.g2Alt2() + val easing = buffer.g1Alt3() val z = buffer.g2() - val height = buffer.g2sAlt2() + val heightRelative = buffer.g1Alt3() == 1 + val height = buffer.g2sAlt1() return CamLookAtCycles( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt index 7b5773441..fbf7386aa 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV2Decoder.kt @@ -14,9 +14,9 @@ internal class CamLookAtV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamLookAtV2 { + val rate2 = buffer.g1Alt3() + val height = buffer.g2() val z = buffer.g2() - val height = buffer.g2Alt2() - val rate2 = buffer.g1() val rate = buffer.g1Alt3() val x = buffer.g2Alt1() return CamLookAtV2( diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt index 0a6214001..0ddf72567 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamLookAtV3Decoder.kt @@ -14,12 +14,12 @@ internal class CamLookAtV3Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamLookAtV3 { - val heightRelative = buffer.g1Alt3() == 1 val rate = buffer.g1Alt2() val height = buffer.g2s() - val z = buffer.g2Alt3() - val x = buffer.g2() - val rate2 = buffer.g1Alt3() + val x = buffer.g2Alt3() + val z = buffer.g2() + val rate2 = buffer.g1Alt2() + val heightRelative = buffer.g1Alt3() == 1 return CamLookAtV3( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt index 7bb4ff361..1c2e90f61 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV2Decoder.kt @@ -14,14 +14,14 @@ internal class CamMoveToArcV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamMoveToArcV2 { - val cycles = buffer.g2Alt3() - val destinationZ = buffer.g2Alt2() - val centerZ = buffer.g2Alt2() - val height = buffer.g2() - val easing = buffer.g1Alt2() - val destinationX = buffer.g2Alt2() - val ignoreTerrain = buffer.g1Alt3() == 1 - val centerX = buffer.g2Alt1() + val destinationX = buffer.g2Alt3() + val centerZ = buffer.g2Alt3() + val easing = buffer.g1Alt3() + val centerX = buffer.g2Alt2() + val cycles = buffer.g2Alt1() + val height = buffer.g2Alt2() + val destinationZ = buffer.g2() + val ignoreTerrain = buffer.g1Alt1() == 1 return CamMoveToArcV2( centerX, centerZ, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt index 7b7757b93..e9aa0ca07 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToArcV3Decoder.kt @@ -14,15 +14,15 @@ internal class CamMoveToArcV3Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamMoveToArcV3 { - val centerX = buffer.g2Alt1() - val destinationZ = buffer.g2() val centerZ = buffer.g2Alt2() - val height = buffer.g2sAlt1() - val ignoreTerrain = buffer.g1Alt1() == 1 - val easing = buffer.g1Alt2() - val destinationX = buffer.g2Alt1() val heightRelative = buffer.g1Alt1() == 1 + val height = buffer.g2sAlt3() + val easing = buffer.g1Alt2() + val destinationZ = buffer.g2Alt3() val cycles = buffer.g2Alt2() + val ignoreTerrain = buffer.g1() == 1 + val centerX = buffer.g2Alt3() + val destinationX = buffer.g2Alt1() return CamMoveToArcV3( centerX, centerZ, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt index 10f6e98fd..0a988278d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV2Decoder.kt @@ -14,12 +14,12 @@ internal class CamMoveToCyclesV2Decoder : ProxyMessageDecoder buffer: JagByteBuf, session: Session, ): CamMoveToCyclesV2 { - val cycles = buffer.g2Alt3() - val x = buffer.g2() - val easing = buffer.g1Alt1() - val height = buffer.g2Alt2() + val ignoreTerrain = buffer.g1() == 1 val z = buffer.g2Alt3() - val ignoreTerrain = buffer.g1Alt3() == 1 + val cycles = buffer.g2Alt2() + val height = buffer.g2Alt1() + val easing = buffer.g1() + val x = buffer.g2() return CamMoveToCyclesV2( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt index 21f3fbc64..4c76892ab 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToCyclesV3Decoder.kt @@ -14,13 +14,13 @@ internal class CamMoveToCyclesV3Decoder : ProxyMessageDecoder buffer: JagByteBuf, session: Session, ): CamMoveToCyclesV3 { - val ignoreTerrain = buffer.g1() == 1 - val x = buffer.g2Alt2() + val ignoreTerrain = buffer.g1Alt2() == 1 + val easing = buffer.g1Alt1() + val heightRelative = buffer.g1() == 1 + val height = buffer.g2sAlt3() + val z = buffer.g2Alt2() val cycles = buffer.g2Alt1() - val easing = buffer.g1Alt2() - val heightRelative = buffer.g1Alt1() == 1 - val z = buffer.g2() - val height = buffer.g2sAlt2() + val x = buffer.g2Alt3() return CamMoveToCyclesV3( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt index 50a317b7e..d30ee26f8 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV2Decoder.kt @@ -14,11 +14,11 @@ internal class CamMoveToV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamMoveToV2 { - val x = buffer.g2Alt1() - val rate = buffer.g1Alt2() - val height = buffer.g2Alt1() - val rate2 = buffer.g1Alt2() val z = buffer.g2() + val rate2 = buffer.g1Alt1() + val height = buffer.g2() + val x = buffer.g2Alt3() + val rate = buffer.g1Alt3() return CamMoveToV2( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt index 956d094d8..e206f10cf 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamMoveToV3Decoder.kt @@ -14,12 +14,12 @@ internal class CamMoveToV3Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamMoveToV3 { + val rate = buffer.g1Alt2() val z = buffer.g2() - val heightRelative = buffer.g1() == 1 - val rate = buffer.g1() - val height = buffer.g2sAlt2() - val x = buffer.g2Alt1() val rate2 = buffer.g1Alt1() + val height = buffer.g2sAlt1() + val x = buffer.g2Alt3() + val heightRelative = buffer.g1() == 1 return CamMoveToV3( x, z, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt index 48f9e161e..399bd98b0 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamRotateToCoordinateV2Decoder.kt @@ -14,11 +14,11 @@ internal class CamRotateToCoordinateV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamTargetV4 { - val value = buffer.g4() - val type = buffer.g1Alt2() + val type = buffer.g1Alt3() + val value = buffer.g4Alt3() return CamTargetV4( when (type) { 0 -> CamTargetV4.PlayerCamTarget(if (value == 65535) -1 else value) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt index 6c677be41..335e98c77 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/camera/CamUnlockDecoder.kt @@ -14,7 +14,7 @@ internal class CamUnlockDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): CamUnlock { - val unlock = buffer.g1() == 1 + val unlock = buffer.g1Alt1() == 1 return CamUnlock( unlock, ) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt index 37fbe6bb3..b9ade510c 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfClearInvDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfClearInv import net.rsprox.protocol.session.Session @@ -15,7 +15,7 @@ internal class IfClearInvDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfClearInv { - val combinedId = buffer.gCombinedIdAlt2() + val combinedId = buffer.gCombinedIdAlt1() return IfClearInv( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt index b654b5c2f..13ea4a451 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfMoveSubDecoder.kt @@ -2,8 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedId -import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprot.protocol.util.gCombinedIdAlt3 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfMoveSub import net.rsprox.protocol.session.Session @@ -16,8 +15,8 @@ internal class IfMoveSubDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfMoveSub { - val destinationCombinedId = buffer.gCombinedIdAlt1() - val sourceCombinedId = buffer.gCombinedId() + val sourceCombinedId = buffer.gCombinedIdAlt3() + val destinationCombinedId = buffer.gCombinedIdAlt3() return IfMoveSub( sourceCombinedId.interfaceId, sourceCombinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt index f0e6878d1..f98a97d44 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenSubDecoder.kt @@ -15,9 +15,9 @@ internal class IfOpenSubDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfOpenSub { + val type = buffer.g1() val interfaceId = buffer.g2Alt3() val combinedId = buffer.gCombinedIdAlt3() - val type = buffer.g1() return IfOpenSub( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt index 36f513a3a..3102314cf 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfOpenTopDecoder.kt @@ -14,7 +14,7 @@ internal class IfOpenTopDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfOpenTop { - val interfaceId = buffer.g2Alt2() + val interfaceId = buffer.g2Alt3() return IfOpenTop( interfaceId, ) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt index 999f3fa91..c39f08a2b 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAngleDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetAngle import net.rsprox.protocol.session.Session @@ -15,10 +15,10 @@ internal class IfSetAngleDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetAngle { - val combinedId = buffer.gCombinedIdAlt3() - val zoom = buffer.g2() + val combinedId = buffer.gCombinedIdAlt1() + val angleY = buffer.g2Alt2() val angleX = buffer.g2() - val angleY = buffer.g2Alt3() + val zoom = buffer.g2() return IfSetAngle( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt index b6c365028..d4ec20c71 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetAnimDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt1 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetAnim import net.rsprox.protocol.session.Session @@ -15,8 +15,8 @@ internal class IfSetAnimDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetAnim { - val combinedId = buffer.gCombinedIdAlt1() - val anim = buffer.g2sAlt1() + val combinedId = buffer.gCombinedId() + val anim = buffer.g2sAlt2() return IfSetAnim( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt index d768a9493..eada9a878 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetColourDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetColour import net.rsprox.protocol.session.Session @@ -15,8 +15,8 @@ internal class IfSetColourDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetColour { - val colour15BitPacked = buffer.g2() - val combinedId = buffer.gCombinedIdAlt2() + val colour15BitPacked = buffer.g2Alt3() + val combinedId = buffer.gCombinedIdAlt1() return IfSetColour( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt index beef957e6..4b2c13b90 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetEventsV2Decoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprot.protocol.util.gCombinedId import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetEventsV2 import net.rsprox.protocol.session.Session @@ -15,11 +15,11 @@ internal class IfSetEventsV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetEventsV2 { - val end = buffer.g2Alt2() - val events2 = buffer.g4() - val events1 = buffer.g4Alt2() - val start = buffer.g2() - val combinedId = buffer.gCombinedIdAlt3() + val combinedId = buffer.gCombinedId() + val events1 = buffer.g4Alt3() + val start = buffer.g2Alt2() + val events2 = buffer.g4Alt1() + val end = buffer.g2Alt1() return IfSetEventsV2( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt index 6b8014a83..d57a4746b 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetHideDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt3 +import net.rsprot.protocol.util.gCombinedIdAlt2 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetHide import net.rsprox.protocol.session.Session @@ -15,8 +15,8 @@ internal class IfSetHideDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetHide { - val combinedId = buffer.gCombinedIdAlt3() - val hidden = buffer.g1Alt1() == 1 + val hidden = buffer.g1Alt3() == 1 + val combinedId = buffer.gCombinedIdAlt2() return IfSetHide( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt index 3b59b165f..0fe87d283 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetModelV2Decoder.kt @@ -15,7 +15,7 @@ internal class IfSetModelV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetModelV2 { - val model = buffer.g4Alt2() + val model = buffer.g4Alt1() val combinedId = buffer.gCombinedIdAlt1() return IfSetModelV2( combinedId.interfaceId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt index 95b3c4256..be5101a52 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetNpcHeadActiveDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetNpcHeadActive import net.rsprox.protocol.session.Session @@ -15,8 +15,8 @@ internal class IfSetNpcHeadActiveDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetNpcHead { - val combinedId = buffer.gCombinedId() - val npc = buffer.g2Alt3() + val combinedId = buffer.gCombinedIdAlt2() + val npc = buffer.g2Alt1() return IfSetNpcHead( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt index 1a953eeac..6d79094fe 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetObjectDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedIdAlt3 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetObject import net.rsprox.protocol.session.Session @@ -15,9 +15,9 @@ internal class IfSetObjectDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetObject { - val combinedId = buffer.gCombinedIdAlt2() - val obj = buffer.g2Alt2() - val count = buffer.g4() + val obj = buffer.g2Alt3() + val count = buffer.g4Alt3() + val combinedId = buffer.gCombinedIdAlt3() return IfSetObject( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt index 7ecf30200..bc0663c65 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerHeadDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedIdAlt2 +import net.rsprot.protocol.util.gCombinedIdAlt1 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerHead import net.rsprox.protocol.session.Session @@ -15,7 +15,7 @@ internal class IfSetPlayerHeadDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetPlayerHead { - val combinedId = buffer.gCombinedIdAlt2() + val combinedId = buffer.gCombinedIdAlt1() return IfSetPlayerHead( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt index babd5fa4d..7922bfb4b 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetPlayerModelBaseColourDecoder.kt @@ -2,7 +2,7 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.codec.interfaces import net.rsprot.buffer.JagByteBuf import net.rsprot.protocol.ClientProt -import net.rsprot.protocol.util.gCombinedId +import net.rsprot.protocol.util.gCombinedIdAlt2 import net.rsprox.protocol.ProxyMessageDecoder import net.rsprox.protocol.game.outgoing.model.interfaces.IfSetPlayerModelBaseColour import net.rsprox.protocol.session.Session @@ -15,9 +15,9 @@ internal class IfSetPlayerModelBaseColourDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetPosition { - val y = buffer.g2sAlt3() - val combinedId = buffer.gCombinedIdAlt2() - val x = buffer.g2sAlt3() + val x = buffer.g2sAlt2() + val y = buffer.g2sAlt2() + val combinedId = buffer.gCombinedIdAlt1() return IfSetPosition( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt index 480bf357a..b9c3b9475 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetRotateSpeedDecoder.kt @@ -15,9 +15,9 @@ internal class IfSetRotateSpeedDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetRotateSpeed { - val ySpeed = buffer.g2() - val xSpeed = buffer.g2Alt2() + val xSpeed = buffer.g2Alt1() val combinedId = buffer.gCombinedIdAlt3() + val ySpeed = buffer.g2Alt1() return IfSetRotateSpeed( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt index d3d69ed4d..3f4440993 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/interfaces/IfSetTextDecoder.kt @@ -15,8 +15,8 @@ internal class IfSetTextDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): IfSetText { - val text = buffer.gjstr() val combinedId = buffer.gCombinedIdAlt2() + val text = buffer.gjstr() return IfSetText( combinedId.interfaceId, combinedId.componentId, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt index 693f2548d..537bdb5b9 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvFullDecoder.kt @@ -23,9 +23,9 @@ internal class UpdateInvFullDecoder : ProxyMessageDecoder { for (i in 0..= 0xFF) { - count = buffer.g4Alt3() + count = buffer.g4() } - val id = buffer.g2Alt1() + val id = buffer.g2() add(UpdateInvFull.Obj(id - 1, count)) } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt index 864450240..88f9f54a5 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/inv/UpdateInvStopTransmitDecoder.kt @@ -14,7 +14,7 @@ internal class UpdateInvStopTransmitDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): RebuildRegionV2 { - val zoneZ = buffer.g2() - val zoneX = buffer.g2() + val zoneZ = buffer.g2Alt2() + val zoneX = buffer.g2Alt1() val reload = buffer.g1Alt1() == 1 @Suppress("UnusedVariable", "unused") diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt index a8872ccd9..fc3822d81 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/map/StaticRebuildV2Decoder.kt @@ -49,9 +49,9 @@ internal class StaticRebuildV2Decoder( } else { null } - val worldArea = buffer.g2sAlt1() - val zoneZ = buffer.g2Alt2() - val zoneX = buffer.g2Alt2() + val zoneZ = buffer.g2Alt3() + val worldArea = buffer.g2sAlt3() + val zoneX = buffer.g2Alt3() return if (playerInfoInitBlock != null) { val message = RebuildLoginV2( diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt index 70b91ff56..03a70019f 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/client/UpdateRebootTimerV2Decoder.kt @@ -15,7 +15,7 @@ internal class UpdateRebootTimerV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): SetPlayerOp { - val priority = buffer.g1() == 1 - val id = buffer.g1Alt1() + val id = buffer.g1Alt3() + val priority = buffer.g1Alt3() == 1 val op = buffer.gjstr() return SetPlayerOp( id, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt index 68081b021..9f1ca7f86 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/misc/player/UpdateStatV2Decoder.kt @@ -14,10 +14,10 @@ internal class UpdateStatV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): UpdateStatV2 { + val stat = buffer.g1Alt3() + val experience = buffer.g4Alt1() val invisibleBoostedLevel = buffer.g1() - val currentLevel = buffer.g1() - val stat = buffer.g1Alt1() - val experience = buffer.g4Alt2() + val currentLevel = buffer.g1Alt3() return UpdateStatV2( stat, currentLevel, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt index 029b8cdd2..b7d21b0e6 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiJingleDecoder.kt @@ -14,8 +14,8 @@ internal class MidiJingleDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MidiJingle { - val lengthInMillis = buffer.g3() - val id = buffer.g2Alt3() + val id = buffer.g2() + val lengthInMillis = buffer.g3Alt1() return MidiJingle( id, lengthInMillis, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt index 662201fb6..ec9925847 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongStopDecoder.kt @@ -14,8 +14,8 @@ internal class MidiSongStopDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MidiSongStop { - val fadeOutDelay = buffer.g2Alt3() - val fadeOutSpeed = buffer.g2Alt3() + val fadeOutDelay = buffer.g2Alt2() + val fadeOutSpeed = buffer.g2Alt1() return MidiSongStop( fadeOutDelay, fadeOutSpeed, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt index 873516109..27f60d0ee 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongV2Decoder.kt @@ -14,11 +14,11 @@ internal class MidiSongV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MidiSongV2 { + val fadeOutSpeed = buffer.g2() val fadeInDelay = buffer.g2Alt1() + val fadeInSpeed = buffer.g2Alt2() val fadeOutDelay = buffer.g2() - val id = buffer.g2Alt3() - val fadeInSpeed = buffer.g2() - val fadeOutSpeed = buffer.g2Alt3() + val id = buffer.g2() return MidiSongV2( id, fadeOutDelay, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt index a732674c4..fc8003159 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/sound/MidiSongWithSecondaryDecoder.kt @@ -14,12 +14,12 @@ internal class MidiSongWithSecondaryDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MidiSwap { - val fadeOutSpeed = buffer.g2() - val fadeInDelay = buffer.g2() - val fadeInSpeed = buffer.g2Alt2() + val fadeInDelay = buffer.g2Alt3() + val fadeOutSpeed = buffer.g2Alt1() val fadeOutDelay = buffer.g2() + val fadeInSpeed = buffer.g2() return MidiSwap( fadeOutDelay, fadeOutSpeed, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt index e9b5222a2..8033fa44d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/AnimSpecificDecoder.kt @@ -14,8 +14,8 @@ internal class AnimSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): AnimSpecific { - val delay = buffer.g1Alt2() - val id = buffer.g2Alt1() + val delay = buffer.g1Alt1() + val id = buffer.g2Alt2() return AnimSpecific( id, delay, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt index 302702038..ef44d6797 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/LocAnimSpecificDecoder.kt @@ -16,9 +16,9 @@ internal class LocAnimSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): LocAnimSpecific { - val locProperties = LocProperties(buffer.g1Alt1()) - val id = buffer.g2() - val coordInBuildArea = CoordInBuildArea(buffer.g3Alt1()) + val id = buffer.g2Alt3() + val coordInBuildArea = CoordInBuildArea(buffer.g3()) + val locProperties = LocProperties(buffer.g1Alt3()) return LocAnimSpecific( id, coordInBuildArea, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt index 58c4be2f9..a6dcfbf88 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/MapAnimSpecificDecoder.kt @@ -15,10 +15,10 @@ internal class MapAnimSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MapAnimSpecific { - val height = buffer.g1Alt2() - val id = buffer.g2Alt2() - val coordInBuildArea = CoordInBuildArea(buffer.g3Alt2()) - val delay = buffer.g2Alt2() + val id = buffer.g2Alt3() + val delay = buffer.g2Alt3() + val height = buffer.g1() + val coordInBuildArea = CoordInBuildArea(buffer.g3()) return MapAnimSpecific( id, delay, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt index 18872e3e2..5bf4f06cd 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcAnimSpecificDecoder.kt @@ -14,9 +14,9 @@ internal class NpcAnimSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): NpcAnimSpecific { - val delay = buffer.g1Alt2() - val index = buffer.g2Alt2() - val id = buffer.g2() + val index = buffer.g2Alt1() + val id = buffer.g2Alt1() + val delay = buffer.g1Alt1() return NpcAnimSpecific( index, id, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt index 592a3dab0..c6674b7ad 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/NpcHeadIconSpecificDecoder.kt @@ -14,10 +14,10 @@ internal class NpcHeadIconSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjAddSpecific { - val timeUntilPublic = buffer.g2() - val id = buffer.g2Alt1() - val timeUntilDespawn = buffer.g2Alt1() - val neverBecomesPublic = buffer.g1Alt3() == 1 - val ownershipType = buffer.g1() + val quantity = buffer.g4Alt1() val opFlags = OpFlags(buffer.g1Alt2()) - val coordGrid = CoordGrid(buffer.g4Alt2()) - val quantity = buffer.g4Alt3() + val coordGrid = CoordGrid(buffer.g4Alt3()) + val neverBecomesPublic = buffer.g1Alt2() == 1 + val id = buffer.g2Alt2() + val timeUntilDespawn = buffer.g2() + val ownershipType = buffer.g1() + val timeUntilPublic = buffer.g2Alt1() return ObjAddSpecific( id, quantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt index 3e0e429a4..6bc39366e 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCountSpecificDecoder.kt @@ -15,10 +15,10 @@ internal class ObjCountSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjCountSpecific { + val id = buffer.g2Alt1() + val coordGrid = CoordGrid(buffer.g4Alt2()) val oldQuantity = buffer.g4Alt1() - val newQuantity = buffer.g4() - val coordGrid = CoordGrid(buffer.g4()) - val id = buffer.g2() + val newQuantity = buffer.g4Alt2() return ObjCountSpecific( id, oldQuantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt index db89859bb..8ff661f1c 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjCustomiseSpecificDecoder.kt @@ -15,14 +15,14 @@ internal class ObjCustomiseSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjDelSpecific { - val id = buffer.g2Alt2() - val quantity = buffer.g4() - val coordGrid = CoordGrid(buffer.g4()) + val quantity = buffer.g4Alt3() + val coordGrid = CoordGrid(buffer.g4Alt1()) + val id = buffer.g2Alt3() return ObjDelSpecific( id, quantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt index 909e64590..2d9fb6534 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/specific/ObjEnabledOpsSpecificDecoder.kt @@ -16,9 +16,9 @@ internal class ObjEnabledOpsSpecificDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): VarpLarge { - val id = buffer.g2Alt2() + val id = buffer.g2Alt3() val value = buffer.g4Alt1() return VarpLarge( id, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt index 0f658d7f0..73828d57d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/varp/VarpSmallDecoder.kt @@ -14,8 +14,8 @@ internal class VarpSmallDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): VarpSmall { - val value = buffer.g1sAlt1() - val id = buffer.g2Alt3() + val id = buffer.g2Alt2() + val value = buffer.g1sAlt2() return VarpSmall( id, value, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt index 606063c0b..bd19a1565 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZoneFullFollowsDecoder.kt @@ -14,9 +14,9 @@ internal class UpdateZoneFullFollowsDecoder : ProxyMessageDecoder, ) { - LOC_DEL(LocDelDecoder()), + LOC_ADD_CHANGE_V2(LocAddChangeV2Decoder()), SCRIPTEDPROJ_CHANGE(ScriptedProjChangeDecoder()), + SCRIPTEDPROJ_ADD(ScriptedProjAddDecoder()), + LOC_ANIM(LocAnimDecoder()), + MAP_PROJANIM_V2(MapProjAnimV2Decoder()), LOC_MERGE(LocMergeDecoder()), + OBJ_ADD(ObjAddDecoder()), OBJ_CUSTOMISE(ObjCustomiseDecoder()), OBJ_COUNT(ObjCountDecoder()), - MAP_ANIM(MapAnimDecoder()), - OBJ_UNCUSTOMISE(ObjUncustomiseDecoder()), - LOC_ADD_CHANGE_V2(LocAddChangeV2Decoder()), - OBJ_ADD(ObjAddDecoder()), - LOC_ANIM(LocAnimDecoder()), - OBJ_DEL(ObjDelDecoder()), + LOC_DEL(LocDelDecoder()), OBJ_ENABLED_OPS(ObjEnabledOpsDecoder()), - SCRIPTEDPROJ_ADD(ScriptedProjAddDecoder()), - MAP_PROJANIM_V2(MapProjAnimV2Decoder()), SOUND_AREA(SoundAreaDecoder()), + OBJ_DEL(ObjDelDecoder()), + OBJ_UNCUSTOMISE(ObjUncustomiseDecoder()), + MAP_ANIM(MapAnimDecoder()), } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt index 6d90610f7..2037281a6 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/header/UpdateZonePartialFollowsDecoder.kt @@ -14,9 +14,9 @@ internal class UpdateZonePartialFollowsDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): LocAddChangeV2 { - val opOverrideCount = buffer.g1Alt1() + val opFlags = OpFlags(buffer.g1Alt3()) + val opOverrideCount = buffer.g1() val opOverrides: Map? = if (opOverrideCount > 0) { buildMap { for (i in 0.. { } else { null } - val opFlags = OpFlags(buffer.g1Alt3()) - val locProperties = LocProperties(buffer.g1Alt1()) - val coordInZone = CoordInZone(buffer.g1Alt2()) - val id = buffer.g2Alt3() + val coordInZone = CoordInZone(buffer.g1()) + val id = buffer.g2Alt2() + val locProperties = LocProperties(buffer.g1()) return LocAddChangeV2( id, coordInZone, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt index ad3063315..c8472226c 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocAnimDecoder.kt @@ -16,9 +16,9 @@ internal class LocAnimDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): LocAnim { + val coordInZone = CoordInZone(buffer.g1Alt1()) val locProperties = LocProperties(buffer.g1()) - val coordInZone = CoordInZone(buffer.g1Alt3()) - val id = buffer.g2Alt3() + val id = buffer.g2Alt2() return LocAnim( id, coordInZone, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt index 1dd7f296d..1bc6c593f 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocDelDecoder.kt @@ -16,8 +16,8 @@ internal class LocDelDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): LocDel { - val locProperties = LocProperties(buffer.g1()) - val coordInZone = CoordInZone(buffer.g1Alt2()) + val coordInZone = CoordInZone(buffer.g1()) + val locProperties = LocProperties(buffer.g1Alt3()) return LocDel( coordInZone, locProperties, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt index b648c4d35..b26e5ffcf 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/LocMergeDecoder.kt @@ -16,16 +16,16 @@ internal class LocMergeDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): LocMerge { - val minX = buffer.g1s() - val index = buffer.g2Alt1() - val locProperties = LocProperties(buffer.g1()) val minZ = buffer.g1s() - val id = buffer.g2Alt1() + val id = buffer.g2Alt3() val end = buffer.g2() + val locProperties = LocProperties(buffer.g1Alt2()) val start = buffer.g2Alt3() - val maxX = buffer.g1sAlt1() - val coordInZone = CoordInZone(buffer.g1Alt3()) - val maxZ = buffer.g1sAlt3() + val maxZ = buffer.g1sAlt2() + val minX = buffer.g1s() + val maxX = buffer.g1sAlt2() + val index = buffer.g2Alt2() + val coordInZone = CoordInZone(buffer.g1Alt2()) return LocMerge( index, id, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt index b00d9b7a5..ed19c07c2 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapAnimDecoder.kt @@ -15,10 +15,10 @@ internal class MapAnimDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MapAnim { - val height = buffer.g1() - val id = buffer.g2Alt1() - val delay = buffer.g2Alt1() + val id = buffer.g2Alt3() + val delay = buffer.g2Alt3() val coordInZone = CoordInZone(buffer.g1()) + val height = buffer.g1Alt2() return MapAnim( id, delay, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt index 5e8e0d8ba..5480ac5fa 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/MapProjAnimV2Decoder.kt @@ -16,17 +16,17 @@ internal class MapProjAnimV2Decoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): MapProjAnimV2 { - val startTime = buffer.g2() - val coordInZone = CoordInZone(buffer.g1()) val progress = buffer.g2Alt2() - val id = buffer.g2Alt2() - val endTime = buffer.g2Alt1() - val end = CoordGrid(buffer.g4Alt1()) + val id = buffer.g2() + val angle = buffer.g1Alt3() val endHeight = buffer.g2Alt3() - val sourceIndex = buffer.g3sAlt2() - val angle = buffer.g1Alt2() + val targetIndex = buffer.g3sAlt1() + val end = CoordGrid(buffer.g4()) + val coordInZone = CoordInZone(buffer.g1Alt2()) val startHeight = buffer.g2() - val targetIndex = buffer.g3s() + val endTime = buffer.g2Alt3() + val sourceIndex = buffer.g3s() + val startTime = buffer.g2Alt3() return MapProjAnimV2( id, startHeight, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt index 229580074..25df014ee 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjAddDecoder.kt @@ -16,14 +16,14 @@ internal class ObjAddDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjAdd { - val coordInZone = CoordInZone(buffer.g1Alt1()) + val timeUntilDespawn = buffer.g2() val timeUntilPublic = buffer.g2() - val ownershipType = buffer.g1() - val id = buffer.g2Alt2() + val quantity = buffer.g4Alt3() val neverBecomesPublic = buffer.g1() == 1 + val id = buffer.g2Alt1() + val coordInZone = CoordInZone(buffer.g1Alt1()) val opFlags = OpFlags(buffer.g1Alt2()) - val timeUntilDespawn = buffer.g2Alt3() - val quantity = buffer.g4Alt1() + val ownershipType = buffer.g1Alt2() return ObjAdd( id, quantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt index d5de0b97b..e42b73b82 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCountDecoder.kt @@ -15,9 +15,9 @@ internal class ObjCountDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjCount { + val coordInZone = CoordInZone(buffer.g1Alt3()) val oldQuantity = buffer.g4Alt3() - val coordInZone = CoordInZone(buffer.g1Alt1()) - val newQuantity = buffer.g4Alt1() + val newQuantity = buffer.g4() val id = buffer.g2Alt3() return ObjCount( id, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt index 2bb93c6c7..65f91f88d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjCustomiseDecoder.kt @@ -15,14 +15,14 @@ internal class ObjCustomiseDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjCustomise { - val model = buffer.g2() val recolIndex = buffer.g2sAlt1() - val id = buffer.g2Alt1() - val coordInZone = CoordInZone(buffer.g1Alt3()) - val retex = buffer.g2sAlt2() + val id = buffer.g2Alt2() + val coordInZone = CoordInZone(buffer.g1Alt1()) + val recol = buffer.g2sAlt1() + val retexIndex = buffer.g2sAlt1() + val retex = buffer.g2sAlt3() val quantity = buffer.g4Alt3() - val recol = buffer.g2sAlt3() - val retexIndex = buffer.g2sAlt2() + val model = buffer.g2Alt3() return ObjCustomise( id, quantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt index e9d99c675..d79698b93 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjDelDecoder.kt @@ -15,9 +15,9 @@ internal class ObjDelDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjDel { - val id = buffer.g2() - val coordInZone = CoordInZone(buffer.g1()) - val quantity = buffer.g4Alt2() + val id = buffer.g2Alt1() + val coordInZone = CoordInZone(buffer.g1Alt3()) + val quantity = buffer.g4() return ObjDel( id, quantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt index f4d9b02e9..a40c10970 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjEnabledOpsDecoder.kt @@ -16,9 +16,9 @@ internal class ObjEnabledOpsDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjEnabledOps { - val coordInZone = CoordInZone(buffer.g1Alt1()) - val id = buffer.g2Alt3() - val opFlags = OpFlags(buffer.g1()) + val id = buffer.g2Alt2() + val opFlags = OpFlags(buffer.g1Alt2()) + val coordInZone = CoordInZone(buffer.g1Alt3()) return ObjEnabledOps( id, opFlags, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt index cfafe74d1..b0e1394e5 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ObjUncustomiseDecoder.kt @@ -15,9 +15,9 @@ internal class ObjUncustomiseDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ObjUncustomise { - val id = buffer.g2() - val quantity = buffer.g4() + val quantity = buffer.g4Alt3() val coordInZone = CoordInZone(buffer.g1Alt1()) + val id = buffer.g2Alt1() return ObjUncustomise( id, quantity, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt index a025ec4e4..297e58fca 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjAddDecoder.kt @@ -16,23 +16,23 @@ internal class ScriptedProjAddDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): ScriptedProjAdd { - val sourceOffsetX = buffer.g2sAlt1() - val id = buffer.g2() - val targetOffsetZ = buffer.g2s() - val targetCoord = CoordGrid(buffer.g4Alt3()) - val startTime = buffer.g2Alt2() - val sourceHeight = buffer.g2s() - val curveScriptA = buffer.g2Alt1() val targetIndex = buffer.g3sAlt3() - val slot = buffer.g2() - val endTime = buffer.g2Alt1() - val coordInZone = CoordInZone(buffer.g1()) + val targetHeight = buffer.g2s() + val endTime = buffer.g2Alt3() + val slot = buffer.g2Alt3() + val sourceOffsetZ = buffer.g2s() + val sourceIndex = buffer.g3sAlt1() + val curveScriptH = buffer.g2Alt2() + val id = buffer.g2Alt1() + val sourceOffsetX = buffer.g2sAlt3() + val sourceHeight = buffer.g2s() + val coordInZone = CoordInZone(buffer.g1Alt1()) + val targetCoord = CoordGrid(buffer.g4Alt1()) + val startTime = buffer.g2() + val targetOffsetZ = buffer.g2sAlt2() val targetOffsetX = buffer.g2s() - val curveScriptH = buffer.g2Alt1() - val sourceOffsetZ = buffer.g2sAlt3() - val targetHeight = buffer.g2sAlt1() - val sourceIndex = buffer.g3sAlt2() val curveScriptT = buffer.g2Alt1() + val curveScriptA = buffer.g2Alt3() return ScriptedProjAdd( slot, id, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt index b7392fb96..6fd6416f8 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/zone/payload/ScriptedProjChangeDecoder.kt @@ -15,14 +15,14 @@ internal class ScriptedProjChangeDecoder : ProxyMessageDecoder { buffer: JagByteBuf, session: Session, ): SoundArea { - val coordInZone = CoordInZone(buffer.g1Alt3()) - val size = buffer.g1Alt2() - val radius = buffer.g1() - val delay = buffer.g1Alt2() + val size = buffer.g1Alt1() val loops = buffer.g1Alt1() - val id = buffer.g2() + val delay = buffer.g1Alt3() + val coordInZone = CoordInZone(buffer.g1Alt1()) + val radius = buffer.g1Alt2() + val id = buffer.g2Alt3() return SoundArea( id, delay, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt index 3f67f37f6..6e2d480c4 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt @@ -1,153 +1,156 @@ package net.rsprox.protocol.v240.game.outgoing.decoder.prot internal object GameServerProtId { - const val MIDI_SONG_STOP = 0 - const val CAM_TARGET_V3 = 1 - const val NPC_INFO_LARGE_V5 = 2 - const val CAM_RESET = 3 - const val NPC_HEADICON_SPECIFIC = 4 - const val CHAT_FILTER_SETTINGS_PRIVATECHAT = 5 - const val SET_PLAYER_OP = 6 - const val IF_OPENSUB = 7 - const val REFLECTION_CHECKER = 8 - const val UPDATE_ZONE_PARTIAL_FOLLOWS = 9 - const val LOC_DEL = 10 - const val VARCLAN = 11 - const val VARP_LARGE = 12 - const val OBJ_COUNT_SPECIFIC = 13 - const val IF_SETROTATESPEED = 14 - const val MESSAGE_PRIVATE_ECHO = 15 - const val IF_SETPLAYERMODEL_BASECOLOUR = 16 - const val IF_SETANGLE = 17 - const val UPDATE_INV_PARTIAL = 18 - const val MESSAGE_PRIVATE = 19 - const val NPC_ANIM_SPECIFIC = 20 - const val HIDELOCOPS = 21 - const val UPDATE_INV_FULL = 22 - const val IF_CLOSESUB = 23 - const val UNKNOWN_STRING = 24 - const val IF_RESYNC_V2 = 25 - const val SET_HEATMAP_ENABLED = 26 - const val UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = 27 - const val PLAYER_INFO = 28 - const val CAM_SMOOTHRESET = 29 - const val LOC_ANIM_SPECIFIC = 30 - const val UPDATE_RUNWEIGHT = 31 - const val SOUND_AREA = 32 - const val LOC_ADD_CHANGE_V2 = 33 - const val LOC_MERGE = 34 - const val MIDI_SONG_V2 = 35 - const val FRIENDLIST_LOADED = 36 - const val UPDATE_REBOOT_TIMER_V2 = 37 - const val CAM_MODE = 38 - const val URL_OPEN = 39 - const val CAM_ROTATETO = 40 - const val OBJ_DEL_SPECIFIC = 41 - const val UPDATE_IGNORELIST = 42 - const val MINIMAP_TOGGLE = 43 - const val VARP_RESET = 44 - const val UPDATE_INV_STOPTRANSMIT = 45 - const val UPDATE_STAT_V2 = 46 - const val SET_ACTIVE_WORLD_V2 = 47 - const val PROJANIM_SPECIFIC_V4 = 48 - const val REBUILD_NORMAL_V2 = 49 - const val HINT_ARROW = 50 - const val CAM_ROTATEBY = 51 + const val CAM_TARGET_V4 = 0 + const val IF_SETOBJECT = 1 + const val MESSAGE_FRIENDCHANNEL = 2 + const val HINT_ARROW = 3 + const val IF_SETANGLE = 4 + const val CLANSETTINGS_DELTA = 5 + const val SET_INTERACTION_MODE = 6 + const val CLANCHANNEL_FULL = 7 + const val MIDI_SONG_STOP = 8 + const val UPDATE_IGNORELIST = 9 + const val RUNCLIENTSCRIPT = 10 + const val IF_SETTEXT = 11 + const val REBUILD_REGION_V2 = 12 + const val MAP_ANIM = 13 + const val UPDATE_INV_STOPTRANSMIT = 14 + const val SET_HEATMAP_ENABLED = 15 + const val SOUND_AREA = 16 + const val CAM_RESET = 17 + const val CHAT_FILTER_SETTINGS = 18 + const val UPDATE_RUNWEIGHT = 19 + const val SET_ACTIVE_WORLD_V2 = 20 + const val VARCLAN = 21 + const val IF_SETPLAYERHEAD = 22 + const val UPDATE_INV_PARTIAL = 23 + const val UPDATE_FRIENDLIST = 24 + const val VARCLAN_DISABLE = 25 + const val LOGOUT_TRANSFER = 26 + const val MESSAGE_PRIVATE_ECHO = 27 + const val IF_SETCOLOUR = 28 + const val UPDATE_TRADINGPOST = 29 + const val IF_RESYNC_V2 = 30 + const val MIDI_SWAP = 31 + const val CAM_MODE = 32 + const val CAM_ROTATETO = 33 + const val CAM_SMOOTHRESET = 34 + const val IF_OPENTOP = 35 + const val MESSAGE_PRIVATE = 36 + const val LOGOUT = 37 + const val LOC_ADD_CHANGE_V2 = 38 + const val REBUILD_NORMAL_V2 = 39 + const val MIDI_JINGLE = 40 + const val LOC_DEL = 41 + const val IF_SETPLAYERMODEL_BASECOLOUR = 42 + const val MESSAGE_CLANCHANNEL = 43 + const val UNKNOWN_STRING = 44 + const val IF_OPENSUB = 45 + const val CLANCHANNEL_DELTA = 46 + const val MIDI_SONG_WITHSECONDARY = 47 + const val LOC_MERGE = 48 + const val UPDATE_ZONE_PARTIAL_ENCLOSED = 49 + const val IF_SETPLAYERMODEL_OBJ = 50 + const val IF_MOVESUB = 51 const val OBJ_CUSTOMISE_SPECIFIC = 52 - const val UPDATE_STOCKMARKET_SLOT = 53 - const val UPDATE_ZONE_FULL_FOLLOWS = 54 - const val IF_SETCOLOUR = 55 - const val UPDATE_TRADINGPOST = 56 - const val LOGOUT = 57 - const val LOGOUT_WITHREASON = 58 + const val SITE_SETTINGS = 53 + const val IF_SETHIDE = 54 + const val HIDELOCOPS = 55 + const val LOGOUT_WITHREASON = 56 + const val PACKET_GROUP_START = 57 + const val RESET_ANIMS = 58 const val IF_SETANIM = 59 - const val VARCLAN_DISABLE = 60 - const val MESSAGE_FRIENDCHANNEL = 61 - const val MESSAGE_CLANCHANNEL_SYSTEM = 62 - const val IF_SETHIDE = 63 - const val UPDATE_RUNENERGY = 64 + const val IF_CLEARINV = 60 + const val IF_SETNPCHEAD = 61 + const val IF_SETPLAYERMODEL_SELF = 62 + const val UPDATE_STAT_V2 = 63 + const val IF_SETPLAYERMODEL_BODYTYPE = 64 const val OCULUS_SYNC = 65 - const val RESET_INTERACTION_MODE = 66 - const val SITE_SETTINGS = 67 - const val ACCOUNT_FLAGS = 68 - const val CLANCHANNEL_FULL = 69 - const val OBJ_ENABLED_OPS_SPECIFIC = 70 - const val CLANSETTINGS_DELTA = 71 - const val PLAYER_SPOTANIM_SPECIFIC = 72 - const val HIDEOBJOPS = 73 - const val MESSAGE_GAME = 74 - const val HIDENPCOPS = 75 - const val VARP_SYNC = 76 - const val SYNTH_SOUND = 77 - const val OBJ_ADD_SPECIFIC = 78 - const val SET_INTERACTION_MODE = 79 - const val IF_SETTEXT = 80 - const val CLANSETTINGS_FULL = 81 - const val IF_SETSCROLLPOS = 82 - const val SERVER_TICK_END = 83 - const val IF_SETNPCHEAD = 84 - const val NPC_INFO_SMALL_V5 = 85 - const val MAP_ANIM = 86 - const val CAM_TARGET_V4 = 87 - const val VARCLAN_ENABLE = 88 - const val IF_SETNPCHEAD_ACTIVE = 89 + const val UPDATE_REBOOT_TIMER_V2 = 66 + const val IF_SETNPCHEAD_ACTIVE = 67 + const val VARP_RESET = 68 + const val HISCORE_REPLY = 69 + const val FRIENDLIST_LOADED = 70 + const val CAM_TARGET_V3 = 71 + const val PROJANIM_SPECIFIC_V4 = 72 + const val MESSAGE_GAME = 73 + const val UPDATE_INV_FULL = 74 + const val REBUILD_WORLDENTITY_V4 = 75 + const val CHAT_FILTER_SETTINGS_PRIVATECHAT = 76 + const val TRIGGER_ONDIALOGABORT = 77 + const val IF_SETSCROLLPOS = 78 + const val MESSAGE_CLANCHANNEL_SYSTEM = 79 + const val WORLDENTITY_INFO_V7 = 80 + const val MIDI_SONG_V2 = 81 + const val ACCOUNT_FLAGS = 82 + const val PLAYER_SPOTANIM_SPECIFIC = 83 + const val LOC_ANIM_SPECIFIC = 84 + const val SET_PLAYER_OP = 85 + const val OBJ_DEL_SPECIFIC = 86 + const val OBJ_ENABLED_OPS_SPECIFIC = 87 + const val UPDATE_FRIENDCHAT_CHANNEL_FULL_V2 = 88 + const val OBJ_UNCUSTOMISE_SPECIFIC = 89 const val MAP_ANIM_SPECIFIC = 90 - const val LOGOUT_TRANSFER = 91 - const val RESET_ANIMS = 92 - const val PACKET_GROUP_START = 93 - const val IF_CLEARINV = 94 - const val CLANCHANNEL_DELTA = 95 - const val IF_OPENTOP = 96 - const val VARP_SMALL = 97 - const val IF_SETPLAYERMODEL_OBJ = 98 - const val MIDI_SONG_WITHSECONDARY = 99 - const val IF_SETPLAYERMODEL_BODYTYPE = 100 + const val PLAYER_INFO = 91 + const val SERVER_TICK_END = 92 + const val NPC_INFO_LARGE_V5 = 93 + const val VARP_LARGE = 94 + const val CAM_ROTATEBY = 95 + const val NPC_HEADICON_SPECIFIC = 96 + const val CLANSETTINGS_FULL = 97 + const val SYNTH_SOUND = 98 + const val UPDATE_UID192 = 99 + const val VARP_SYNC = 100 const val NPC_SPOTANIM_SPECIFIC = 101 - const val IF_SETPOSITION = 102 - const val CAM_SHAKE = 103 - const val OBJ_UNCUSTOMISE_SPECIFIC = 104 - const val UPDATE_ZONE_PARTIAL_ENCLOSED = 105 - const val IF_SETOBJECT = 106 - const val MIDI_SWAP = 107 - const val IF_SETEVENTS_V2 = 108 - const val REBUILD_WORLDENTITY_V4 = 109 - const val LOC_ANIM = 110 - const val UPDATE_FRIENDLIST = 111 - const val UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER = 112 - const val UPDATE_UID192 = 113 - const val RUNCLIENTSCRIPT = 114 + const val ANIM_SPECIFIC = 102 + const val UPDATE_STOCKMARKET_SLOT = 103 + const val VARCLAN_ENABLE = 104 + const val IF_SETROTATESPEED = 105 + const val IF_SETEVENTS_V2 = 106 + const val URL_OPEN = 107 + const val IF_SETPOSITION = 108 + const val UPDATE_FRIENDCHAT_CHANNEL_SINGLEUSER = 109 + const val HIDENPCOPS = 110 + const val SET_NPC_UPDATE_ORIGIN = 111 + const val HIDEOBJOPS = 112 + const val CAM_SHAKE = 113 + const val OBJ_ADD_SPECIFIC = 114 const val SEND_PING = 115 - const val SET_NPC_UPDATE_ORIGIN = 116 - const val TRIGGER_ONDIALOGABORT = 117 - const val MIDI_JINGLE = 118 - const val ANIM_SPECIFIC = 119 - const val IF_SETPLAYERHEAD = 120 - const val IF_SETPLAYERMODEL_SELF = 121 - const val WORLDENTITY_INFO_V7 = 122 - const val IF_MOVESUB = 123 - const val CHAT_FILTER_SETTINGS = 124 - const val REBUILD_REGION_V2 = 125 - const val HISCORE_REPLY = 126 - const val MESSAGE_CLANCHANNEL = 127 - const val CAM_MOVETO_ARC_V3 = 128 - const val CAM_MOVETO_ARC_V2 = 129 + const val IF_CLOSESUB = 116 + const val NPC_ANIM_SPECIFIC = 117 + const val UPDATE_ZONE_PARTIAL_FOLLOWS = 118 + const val NPC_INFO_SMALL_V5 = 119 + const val UPDATE_RUNENERGY = 120 + const val RESET_INTERACTION_MODE = 121 + const val MINIMAP_TOGGLE = 122 + const val LOC_ANIM = 123 + const val OBJ_COUNT_SPECIFIC = 124 + const val REFLECTION_CHECKER = 125 + const val UPDATE_ZONE_FULL_FOLLOWS = 126 + const val VARP_SMALL = 127 + const val CAM_ROTATETO_COORDINATE_V3 = 128 + const val UNHANDLED_4 = 129 const val CAM_MOVETO_CYCLES_V3 = 130 - const val CAM_UNLOCK = 131 - const val GROUP_FULL = 132 - const val GROUP_VAR_LONG = 133 - const val CAM_MOVETO_CYCLES_V2 = 134 - const val CAM_SKYBOX = 135 - const val GROUP_VAR = 136 - const val CAM_LOOKAT_CYCLES = 137 - const val AMBIENTSOUND_STOP = 138 - const val CAM_LOOKAT_V2 = 139 - const val GROUP_VAR_INT = 140 - const val CAM_ROTATETO_COORDINATE_V2 = 141 - const val IF_SETMODEL_V2 = 142 - const val SET_MAP_FLAG_V2 = 143 - const val CAM_LOOKAT_V3 = 144 - const val AMBIENTSOUND_START = 145 - const val CAM_MOVETO_V2 = 146 - const val CAM_MOVETO_V3 = 147 - const val CAM_ROTATETO_COORDINATE_V3 = 148 + const val CAM_MOVETO_ARC_V3 = 131 + const val IF_SETMODEL_V2 = 132 + const val CAM_ROTATETO_COORDINATE_V2 = 133 + const val CAM_MOVETO_V3 = 134 + const val AMBIENCE_START = 135 + const val SET_MAP_FLAG_V2 = 136 + const val GROUP_VAR_LONG = 137 + const val AMBIENCE_STOP = 138 + const val GROUP_FULL = 139 + const val CAM_SKYBOX = 140 + const val NPC_INFO_LARGE_V6 = 141 + const val GROUP_VAR = 142 + const val CAM_MOVETO_ARC_V2 = 143 + const val GROUP_VAR_INT = 144 + const val CAM_LOOKAT_CYCLES = 145 + const val CAM_LOOKAT_V2 = 146 + const val CAM_MOVETO_CYCLES_V2 = 147 + const val CAM_LOOKAT_V3 = 148 + const val CAM_UNLOCK = 149 + const val NPC_INFO_SMALL_V6 = 150 + const val CAM_MOVETO_V2 = 151 } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 1f40af8e1..383918067 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -148,11 +148,14 @@ internal class NpcInfoClient( throw IllegalStateException("Unused flag used: $flag!") } - if (flag and BODY_CUSTOMISATION_V2 != 0) { - decodeBodyCustomisationV2(npc.id, buffer, blocks) + if (flag and TINTING != 0) { + decodeTinting(buffer, blocks) } - if (flag and LEVEL_CHANGE != 0) { - decodeCombatLevelChange(buffer, blocks) + if (flag and BAS_CHANGE != 0) { + decodeBaseAnimationSet(buffer, blocks) + } + if (flag and HEAD_CUSTOMISATION != 0) { + decodeHeadCustomisationV2(npc.id, buffer, blocks) } if (flag and HEADICON_CUSTOMISATION != 0) { decodeHeadiconCustomisation(buffer, blocks) @@ -160,42 +163,36 @@ internal class NpcInfoClient( if (flag and OPS != 0) { decodeEnabledOps(buffer, blocks) } - if (flag and HITMARKS != 0) { - decodeHitmarks(buffer, blocks) - } - if (flag and EXACT_MOVE != 0) { - decodeExactMove(buffer, blocks) - } if (flag and BODY_CUSTOMISATION_V3 != 0) { decodeBodyCustomisationV3(buffer, blocks) } - if (flag and HEADBARS != 0) { - decodeHeadbars(buffer, blocks) - } - if (flag and SEQUENCE != 0) { - decodeSequence(buffer, blocks) - } if (flag and SAY != 0) { decodeSay(buffer, blocks) } - if (flag and TINTING != 0) { - decodeTinting(buffer, blocks) + if (flag and NPC_FREEZE != 0) { + decodeFreeze(buffer, blocks) } - if (flag and NPC_TRANSPARENCY != 0) { - decodeTransparency(buffer, blocks) + if (flag and LEVEL_CHANGE != 0) { + decodeCombatLevelChange(buffer, blocks) } - if (flag and BAS_CHANGE != 0) { - decodeBaseAnimationSet(buffer, blocks) + if (flag and EXACT_MOVE != 0) { + decodeExactMove(buffer, blocks) } - if (flag and NPC_FREEZE != 0) { - decodeFreeze(buffer, blocks) + if (flag and SEQUENCE != 0) { + decodeSequence(buffer, blocks) } - if (flag and HEAD_CUSTOMISATION != 0) { - decodeHeadCustomisationV2(npc.id, buffer, blocks) + if (flag and HITMARKS != 0) { + decodeHitmarks(buffer, blocks) } if (flag and SPOTANIM != 0) { decodeSpotanim(buffer, blocks) } + if (flag and NPC_TRANSPARENCY != 0) { + decodeTransparency(buffer, blocks) + } + if (flag and BODY_CUSTOMISATION_V2 != 0) { + decodeBodyCustomisationV2(npc.id, buffer, blocks) + } if (flag and NAME_CHANGE != 0) { decodeNameChange(buffer, blocks) } @@ -205,6 +202,9 @@ internal class NpcInfoClient( if (flag and FACING != 0) { decodeFacing(buffer, blocks) } + if (flag and HEADBARS != 0) { + decodeHeadbars(buffer, blocks) + } } } @@ -212,21 +212,21 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val flag = buffer.g4Alt1() - val turnLeftAnim = if (flag and 0x1 != 0) buffer.g2() else null - val turnRightAnim = if (flag and 0x2 != 0) buffer.g2Alt3() else null - val walkAnim = if (flag and 0x4 != 0) buffer.g2Alt3() else null + val flag = buffer.g4Alt3() + val turnLeftAnim = if (flag and 0x1 != 0) buffer.g2Alt3() else null + val turnRightAnim = if (flag and 0x2 != 0) buffer.g2Alt1() else null + val walkAnim = if (flag and 0x4 != 0) buffer.g2() else null val walkAnimBack = if (flag and 0x8 != 0) buffer.g2Alt1() else null - val walkAnimLeft = if (flag and 0x10 != 0) buffer.g2() else null + val walkAnimLeft = if (flag and 0x10 != 0) buffer.g2Alt1() else null val walkAnimRight = if (flag and 0x20 != 0) buffer.g2Alt3() else null - val runAnim = if (flag and 0x40 != 0) buffer.g2Alt3() else null - val runAnimBack = if (flag and 0x80 != 0) buffer.g2Alt3() else null - val runAnimLeft = if (flag and 0x100 != 0) buffer.g2Alt2() else null + val runAnim = if (flag and 0x40 != 0) buffer.g2() else null + val runAnimBack = if (flag and 0x80 != 0) buffer.g2Alt2() else null + val runAnimLeft = if (flag and 0x100 != 0) buffer.g2Alt1() else null val runAnimRight = if (flag and 0x200 != 0) buffer.g2Alt2() else null - val crawlAnim = if (flag and 0x400 != 0) buffer.g2() else null - val crawlAnimBack = if (flag and 0x800 != 0) buffer.g2Alt1() else null - val crawlAnimLeft = if (flag and 0x1000 != 0) buffer.g2Alt2() else null - val crawlAnimRight = if (flag and 0x2000 != 0) buffer.g2Alt1() else null + val crawlAnim = if (flag and 0x400 != 0) buffer.g2Alt1() else null + val crawlAnimBack = if (flag and 0x800 != 0) buffer.g2Alt2() else null + val crawlAnimLeft = if (flag and 0x1000 != 0) buffer.g2Alt3() else null + val crawlAnimRight = if (flag and 0x2000 != 0) buffer.g2() else null val readyAnim = if (flag and 0x4000 != 0) buffer.g2() else null blocks += BaseAnimationSetExtendedInfo( @@ -276,7 +276,7 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val headbarCount = buffer.g1Alt2() + val headbarCount = buffer.g1Alt1() val headbars = ArrayList(headbarCount) for (i in 0.. 0) { - buffer.g1Alt3() + buffer.g1Alt2() } else { startFill } @@ -317,11 +317,11 @@ internal class NpcInfoClient( blocks: MutableList, ) { val spotanims = mutableMapOf() - val count = buffer.g1Alt2() + val count = buffer.g1Alt1() for (i in 0.., ) { - val id = buffer.g2() - val delay = buffer.g1Alt2() + val id = buffer.g2Alt1() + val delay = buffer.g1Alt1() blocks += SequenceExtendedInfo(id, delay) } @@ -350,9 +350,9 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val delay = buffer.g2() - val duration = buffer.g2() - val cancelSequence = buffer.g1Alt2() == 1 + val delay = buffer.g2Alt3() + val duration = buffer.g2Alt2() + val cancelSequence = buffer.g1() == 1 blocks += FreezeExtendedInfo(delay, duration, cancelSequence) } @@ -360,11 +360,11 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val start = buffer.g2sAlt3() + val start = buffer.g2sAlt1() val end = buffer.g2s() val startTransparency = buffer.g1sAlt1() - val endTransparency = buffer.g1sAlt2() - val useStartTransparency = buffer.g1Alt2() == 1 + val endTransparency = buffer.g1s() + val useStartTransparency = buffer.g1() == 1 blocks += TransparencyExtendedInfo( start, @@ -379,12 +379,12 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val start = buffer.g2Alt1() + val start = buffer.g2() val end = buffer.g2Alt2() - val hue = buffer.g1() - val saturation = buffer.g1Alt1() - val lightness = buffer.g1Alt1() - val weight = buffer.g1Alt1() + val hue = buffer.g1Alt2() + val saturation = buffer.g1Alt3() + val lightness = buffer.g1Alt3() + val weight = buffer.g1Alt2() blocks += TintingExtendedInfo( start, @@ -401,7 +401,7 @@ internal class NpcInfoClient( blocks: MutableList, npc: Npc, ) { - val id = buffer.g2Alt3() + val id = buffer.g2Alt2() blocks += TransformationExtendedInfo(id) npc.id = id } @@ -410,7 +410,7 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val flag = buffer.g1Alt2() + val flag = buffer.g1Alt3() blocks += EnabledOpsExtendedInfo(flag) } @@ -418,14 +418,14 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val flag = buffer.g1Alt2() + val flag = buffer.g1Alt3() if (flag and 0x1 != 0) { blocks += BodyCustomisationExtendedInfo(ResetCustomisation) return } val models = if (flag and 0x2 != 0) { - val count = buffer.g1Alt1() + val count = buffer.g1() val models = ArrayList(count) for (i in 0..(count) for (i in 0..(count) for (i in 0.., ) { - val flag = buffer.g1() + val flag = buffer.g1Alt1() if (flag and 0x1 != 0) { blocks += BodyCustomisationExtendedInfo(ResetCustomisation) return } val models = if (flag and 0x2 != 0) { - val count = buffer.g1() + val count = buffer.g1Alt2() val models = ArrayList(count) for (i in 0..(length) for (i in 0..(length) for (i in 0..(count) for (i in 0..(length) for (i in 0.., ) { - val deltaX1 = buffer.g1sAlt3() - val deltaZ1 = buffer.g1s() - val deltaX2 = buffer.g1sAlt1() - val deltaZ2 = buffer.g1s() - val delay1 = buffer.g2Alt3() + val deltaX1 = buffer.g1sAlt1() + val deltaZ1 = buffer.g1sAlt3() + val deltaX2 = buffer.g1s() + val deltaZ2 = buffer.g1sAlt1() + val delay1 = buffer.g2Alt1() val delay2 = buffer.g2Alt2() - val direction = buffer.g2Alt2() + val direction = buffer.g2Alt1() blocks += ExactMoveExtendedInfo( deltaX1, @@ -666,7 +666,7 @@ internal class NpcInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val flag = buffer.g1Alt3() + val flag = buffer.g1Alt1() val groups = IntArray(8) val indices = IntArray(8) for (i in 0..<8) { @@ -872,12 +872,12 @@ internal class NpcInfoClient( if (hasSpawnCycle) { npc.spawnCycle = buffer.gBits(32) } + npc.id = buffer.gBits(14) val extendedInfo = buffer.gBits(1) val deltaX = decodeDelta(large, buffer) val angle = NPC_TURN_ANGLES[buffer.gBits(3)] - val deltaZ = decodeDelta(large, buffer) val jump = buffer.gBits(1) - npc.id = buffer.gBits(14) + val deltaZ = decodeDelta(large, buffer) if (isNew) { npc.turnAngle = angle npc.angle = angle @@ -999,29 +999,29 @@ internal class NpcInfoClient( private companion object { private val NPC_TURN_ANGLES = intArrayOf(768, 1024, 1280, 512, 1536, 256, 0, 1792) - private const val EXTENDED_SHORT: Int = 0x40 - private const val EXTENDED_MEDIUM: Int = 0x800 - private const val EXTENDED_INT: Int = 0x200_000 + private const val EXTENDED_SHORT: Int = 0x20 + private const val EXTENDED_MEDIUM: Int = 0x1000 + private const val EXTENDED_INT: Int = 0x40_000 - private const val LEVEL_CHANGE: Int = 0x8_000 - private const val SEQUENCE: Int = 0x80 - private const val NAME_CHANGE: Int = 0x4000 - private const val OPS: Int = 0x1_000 - private const val SPOTANIM: Int = 0x40_000 + private const val LEVEL_CHANGE: Int = 0x800 + private const val SEQUENCE: Int = 0x4 + private const val NAME_CHANGE: Int = 0x100 + private const val OPS: Int = 0x400 + private const val SPOTANIM: Int = 0x400_000 private const val HEADBARS: Int = 0x1_000_000 - private const val BAS_CHANGE: Int = 0x100_000 - private const val SAY: Int = 0x2 - private const val EXACT_MOVE: Int = 0x200 - private const val HITMARKS: Int = 0x80_000 - private const val TRANSFORMATION: Int = 0x1 - private const val FACING: Int = 0x8 - private const val HEADICON_CUSTOMISATION: Int = 0x400_000 - private const val BODY_CUSTOMISATION_V2: Int = 0x800_000 + private const val BAS_CHANGE: Int = 0x200_000 + private const val SAY: Int = 0x10 + private const val EXACT_MOVE: Int = 0x2000 + private const val HITMARKS: Int = 0x20_000 + private const val TRANSFORMATION: Int = 0x8 + private const val FACING: Int = 0x80 + private const val HEADICON_CUSTOMISATION: Int = 0x10_000 + private const val BODY_CUSTOMISATION_V2: Int = 0x100_000 private const val BODY_CUSTOMISATION_V3: Int = 0x2_000_000 - private const val HEAD_CUSTOMISATION: Int = 0x20_000 - private const val TINTING: Int = 0x100 - private const val NPC_TRANSPARENCY: Int = 0x400 - private const val NPC_FREEZE: Int = 0x20 + private const val HEAD_CUSTOMISATION: Int = 0x80_000 + private const val TINTING: Int = 0x200 + private const val NPC_TRANSPARENCY: Int = 0x8000 + private const val NPC_FREEZE: Int = 0x1 private const val UNUSED_FLAGS = 0x10000 or 0x2000 or 0x10 or 0x4 diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt index 245751b98..9f444148d 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt @@ -302,59 +302,56 @@ internal class PlayerInfoClient( throw IllegalStateException("Unused flags used!") } - if (flags and NAME_EXTRAS != 0) { - decodeNameExtras(buffer, blocks) + if (flags and CHAT != 0) { + decodeChat(buffer, blocks) } - if (flags and HITMARKS != 0) { - decodeHitmark(buffer, blocks) + if (flags and HEADBARS != 0) { + decodeHeadbar(buffer, blocks) } - if (flags and PLAYER_RESET != 0) { - decodePlayerReset(buffer, blocks) + if (flags and APPEARANCE != 0) { + val len = buffer.g1Alt3() + val data = ByteArray(len) + buffer.gdataAlt1(data) + decodeAppearance(Unpooled.wrappedBuffer(data).toJagByteBuf(), blocks) + } + if (flags and PLAYER_FREEZE != 0) { + decodeFreeze(buffer, blocks) } if (flags and FACE != 0) { decodeFacing(buffer, blocks) } + if (flags and NAME_EXTRAS != 0) { + decodeNameExtras(buffer, blocks) + } if (flags and MOVE_SPEED != 0) { decodeMoveSpeed(buffer, blocks) } + if (flags and TEMP_MOVE_SPEED != 0) { + decodeTemporaryMoveSpeed(buffer, blocks) + } if (flags and SPOTANIM != 0) { decodeSpotanims(buffer, blocks) } - if (flags and FACE_PATHINGENTITY != 0) { - decodeFacePathingEntity(buffer, blocks) - } - if (flags and CHAT != 0) { - decodeChat(buffer, blocks) - } if (flags and PLAYER_TRANSPARENCY != 0) { decodeTransparency(buffer, blocks) } - if (flags and TINTING != 0) { - decodeTinting(buffer, blocks) - } - if (flags and HEADBARS != 0) { - decodeHeadbar(buffer, blocks) + if (flags and HITMARKS != 0) { + decodeHitmark(buffer, blocks) } - if (flags and SAY != 0) { - decodeSay(buffer, blocks) + if (flags and EXACT_MOVE != 0) { + decodeExactMove(buffer, blocks) } if (flags and SEQUENCE != 0) { decodeSequence(buffer, blocks) } - if (flags and TEMP_MOVE_SPEED != 0) { - decodeTemporaryMoveSpeed(buffer, blocks) - } - if (flags and APPEARANCE != 0) { - val len = buffer.g1Alt3() - val data = ByteArray(len) - buffer.gdataAlt2(data) - decodeAppearance(Unpooled.wrappedBuffer(data).toJagByteBuf(), blocks) + if (flags and TINTING != 0) { + decodeTinting(buffer, blocks) } - if (flags and EXACT_MOVE != 0) { - decodeExactMove(buffer, blocks) + if (flags and PLAYER_RESET != 0) { + decodePlayerReset(buffer, blocks) } - if (flags and PLAYER_FREEZE != 0) { - decodeFreeze(buffer, blocks) + if (flags and SAY != 0) { + decodeSay(buffer, blocks) } } @@ -362,22 +359,22 @@ internal class PlayerInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - blocks += MoveSpeedExtendedInfo(buffer.g1sAlt2()) + blocks += MoveSpeedExtendedInfo(buffer.g1sAlt3()) } private fun decodeTemporaryMoveSpeed( buffer: JagByteBuf, blocks: MutableList, ) { - blocks += TemporaryMoveSpeedExtendedInfo(buffer.g1s()) + blocks += TemporaryMoveSpeedExtendedInfo(buffer.g1sAlt2()) } private fun decodeSequence( buffer: JagByteBuf, blocks: MutableList, ) { - val id = buffer.g2Alt2() - val delay = buffer.g1() + val id = buffer.g2Alt3() + val delay = buffer.g1Alt1() blocks += SequenceExtendedInfo(id, delay) } @@ -394,7 +391,7 @@ internal class PlayerInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val flag = buffer.g1Alt2() + val flag = buffer.g1() val walkType = when (val walkTypeValue = flag and 0x7) { 0 -> FaceExtendedInfo.WalkType.CancelOnWalk @@ -488,12 +485,12 @@ internal class PlayerInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val colourAndEffectsPacked = buffer.g2Alt2() - val modIcon = buffer.g1Alt2() - val autotyper = buffer.g1Alt1() == 1 - val huffmanLength = buffer.g1Alt2() + val colourAndEffectsPacked = buffer.g2() + val modIcon = buffer.g1Alt1() + val autotyper = buffer.g1Alt2() == 1 + val huffmanLength = buffer.g1Alt1() val data = ByteArray(huffmanLength) - buffer.gdataAlt1(data) + buffer.gdataAlt3(data) val text = huffmanCodec.decode(Unpooled.wrappedBuffer(data)) val colour = colourAndEffectsPacked ushr 8 val effects = colourAndEffectsPacked and 0xFF @@ -524,11 +521,11 @@ internal class PlayerInfoClient( blocks: MutableList, ) { val deltaX1 = buffer.g1s() - val deltaZ1 = buffer.g1sAlt1() - val deltaX2 = buffer.g1sAlt2() - val deltaZ2 = buffer.g1sAlt3() - val delay1 = buffer.g2() - val delay2 = buffer.g2Alt1() + val deltaZ1 = buffer.g1sAlt3() + val deltaX2 = buffer.g1s() + val deltaZ2 = buffer.g1s() + val delay1 = buffer.g2Alt3() + val delay2 = buffer.g2Alt3() val direction = buffer.g2Alt3() blocks += ExactMoveExtendedInfo( @@ -547,11 +544,11 @@ internal class PlayerInfoClient( blocks: MutableList, ) { val spotanims = mutableMapOf() - val count = buffer.g1() + val count = buffer.g1Alt3() for (i in 0.., ) { - val hitCount = buffer.g1Alt3() + val hitCount = buffer.g1() val hits = ArrayList(hitCount) for (i in 0.., ) { - val headbarCount = buffer.g1Alt1() + val headbarCount = buffer.g1Alt3() val headbars = ArrayList(headbarCount) for (i in 0.. 0) { buffer.g1Alt2() @@ -634,9 +631,9 @@ internal class PlayerInfoClient( buffer: JagByteBuf, blocks: MutableList, ) { - val delay = buffer.g2Alt3() - val duration = buffer.g2Alt3() - val cancelSequence = buffer.g1Alt1() == 1 + val delay = buffer.g2Alt2() + val duration = buffer.g2Alt1() + val cancelSequence = buffer.g1Alt2() == 1 blocks += FreezeExtendedInfo(delay, duration, cancelSequence) } @@ -645,7 +642,7 @@ internal class PlayerInfoClient( blocks: MutableList, ) { val start = buffer.g2sAlt2() - val end = buffer.g2s() + val end = buffer.g2sAlt3() val startTransparency = buffer.g1sAlt3() val endTransparency = buffer.g1sAlt3() val useStartTransparency = buffer.g1Alt3() == 1 @@ -664,11 +661,11 @@ internal class PlayerInfoClient( blocks: MutableList, ) { val start = buffer.g2Alt1() - val end = buffer.g2() + val end = buffer.g2Alt3() val hue = buffer.g1sAlt2() - val saturation = buffer.g1s() - val lightness = buffer.g1sAlt3() - val weight = buffer.g1Alt3() + val saturation = buffer.g1sAlt1() + val lightness = buffer.g1s() + val weight = buffer.g1Alt1() blocks += TintingExtendedInfo( start, @@ -1139,28 +1136,27 @@ internal class PlayerInfoClient( private const val CUR_CYCLE_INACTIVE = 0x1 private const val NEXT_CYCLE_INACTIVE = 0x2 - private const val EXTENDED_SHORT = 0x8 - private const val EXTENDED_MEDIUM = 0x800 + private const val EXTENDED_SHORT = 0x80 + private const val EXTENDED_MEDIUM = 0x2000 - private const val SEQUENCE = 0x40 - private const val APPEARANCE = 0x20 - private const val FACE = 0x1 - private const val SAY = 0x4 - private const val CHAT = 0x100 - private const val NAME_EXTRAS = 0x2000 - private const val MOVE_SPEED = 0x400 - private const val TINTING = 0x200 - private const val EXACT_MOVE = 0x4000 - private const val PLAYER_TRANSPARENCY = 0x100000 - private const val TEMP_MOVE_SPEED = 0x1000 - private const val SPOTANIM = 0x20000 - private const val HEADBARS = 0x10000 - private const val HITMARKS = 0x40000 - private const val FACE_PATHINGENTITY = 0x10 + private const val SEQUENCE = 0x10 + private const val APPEARANCE = 0x4 + private const val FACE = 0x40 + private const val SAY = 0x1 + private const val CHAT = 0x1000 + private const val NAME_EXTRAS = 0x200 + private const val MOVE_SPEED = 0x4000 + private const val TINTING = 0x400 + private const val EXACT_MOVE = 0x8000 + private const val PLAYER_TRANSPARENCY = 0x10000 + private const val TEMP_MOVE_SPEED = 0x800 + private const val SPOTANIM = 0x80000 + private const val HEADBARS = 0x20000 + private const val HITMARKS = 0x100000 - private const val PLAYER_FREEZE = 0x80_000 - private const val PLAYER_RESET = 0x2 - private const val UNUSED_FLAGS = 0x80 + private const val PLAYER_FREEZE = 0x40_000 + private const val PLAYER_RESET = 0x8 + private const val UNUSED_FLAGS = 0x2 or 0x20 private class Player { var queuedMove: Boolean = false From 733d8040169be9960f6f09860be3d9478938c4ac Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:41:53 +0300 Subject: [PATCH 06/13] feat: client cheat changes --- .../codec/misc/user/ClientCheatDecoder.kt | 11 ++++++++++- .../incoming/model/misc/user/ClientCheat.kt | 19 ++++++++++++++++--- .../text/TextClientPacketTranscriber.kt | 4 ++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt index be88f4589..673f9cbd4 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/incoming/decoder/codec/misc/user/ClientCheatDecoder.kt @@ -17,6 +17,15 @@ public class ClientCheatDecoder : ProxyMessageDecoder { session: Session, ): ClientCheat { val command = buffer.gjstr() - return ClientCheat(command) + val unknown = + if (!buffer.isReadable) { + null + } else { + buffer.g1() + } + return ClientCheat( + command, + unknown, + ) } } diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/misc/user/ClientCheat.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/misc/user/ClientCheat.kt index 5419c34e5..43e7772d3 100644 --- a/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/misc/user/ClientCheat.kt +++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/incoming/model/misc/user/ClientCheat.kt @@ -10,6 +10,7 @@ import net.rsprox.protocol.game.incoming.model.GameClientProtCategory */ public class ClientCheat( public val command: String, + public val unknown: Int? = null, ) : IncomingGameMessage { override val category: ClientProtCategory get() = GameClientProtCategory.USER_EVENT @@ -20,10 +21,22 @@ public class ClientCheat( other as ClientCheat - return command == other.command + if (unknown != other.unknown) return false + if (command != other.command) return false + + return true } - override fun hashCode(): Int = command.hashCode() + override fun hashCode(): Int { + var result = unknown.hashCode() + result = 31 * result + command.hashCode() + return result + } - override fun toString(): String = "ClientCheat(command='$command')" + override fun toString(): String { + return "ClientCheat(" + + "command='$command', " + + "unknown=$unknown" + + ")" + } } diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt index fccbd2217..facd1ef5a 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextClientPacketTranscriber.kt @@ -648,6 +648,10 @@ public open class TextClientPacketTranscriber( override fun clientCheat(message: ClientCheat) { if (!filters[PropertyFilter.CLIENT_CHEAT]) return omit() root.string("cheat", message.command) + val unknown = message.unknown + if (unknown != null) { + root.int("unknown", unknown) + } } override fun closeModal(message: CloseModal) { From 69129f7ed0ca975ad468fa8971539f07ad5748b9 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:55:15 +0300 Subject: [PATCH 07/13] fet: player and npcinfo changes --- .../model/info/npcinfo/NpcInfoClient.kt | 42 +++++++++++++++---- .../model/info/playerinfo/PlayerInfoClient.kt | 32 +++++++++++--- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 383918067..fdeaf2981 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -154,6 +154,9 @@ internal class NpcInfoClient( if (flag and BAS_CHANGE != 0) { decodeBaseAnimationSet(buffer, blocks) } + if (flag and SPOTANIM != 0) { + decodeSpotanim(buffer, blocks) + } if (flag and HEAD_CUSTOMISATION != 0) { decodeHeadCustomisationV2(npc.id, buffer, blocks) } @@ -184,8 +187,8 @@ internal class NpcInfoClient( if (flag and HITMARKS != 0) { decodeHitmarks(buffer, blocks) } - if (flag and SPOTANIM != 0) { - decodeSpotanim(buffer, blocks) + if (flag and SPOTANIM_OLD != 0) { + decodeSpotanimOld(buffer, blocks) } if (flag and NPC_TRANSPARENCY != 0) { decodeTransparency(buffer, blocks) @@ -312,7 +315,7 @@ internal class NpcInfoClient( blocks += HeadbarExtendedInfo(headbars) } - private fun decodeSpotanim( + private fun decodeSpotanimOld( buffer: JagByteBuf, blocks: MutableList, ) { @@ -329,6 +332,24 @@ internal class NpcInfoClient( blocks += SpotanimExtendedInfo(spotanims) } + private fun decodeSpotanim( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val spotanims = mutableMapOf() + val count = buffer.g1Alt3() + for (i in 0.., @@ -870,9 +891,13 @@ internal class NpcInfoClient( val hasSpawnCycle = buffer.gBits(1) == 1 if (hasSpawnCycle) { - npc.spawnCycle = buffer.gBits(32) + val index = buffer.gBits(2) + npc.spawnCycle = buffer.gBits(spawnClockBitcodes[index]) } - npc.id = buffer.gBits(14) + + val idBitCount = buffer.gBits(2) + npc.id = buffer.gBits(typeBitcodes[idBitCount]) + val extendedInfo = buffer.gBits(1) val deltaX = decodeDelta(large, buffer) val angle = NPC_TURN_ANGLES[buffer.gBits(3)] @@ -999,6 +1024,8 @@ internal class NpcInfoClient( private companion object { private val NPC_TURN_ANGLES = intArrayOf(768, 1024, 1280, 512, 1536, 256, 0, 1792) + private val spawnClockBitcodes = intArrayOf(18, 19, 20, 32) + private val typeBitcodes = intArrayOf(12, 14, 17, 24) private const val EXTENDED_SHORT: Int = 0x20 private const val EXTENDED_MEDIUM: Int = 0x1000 private const val EXTENDED_INT: Int = 0x40_000 @@ -1007,7 +1034,8 @@ internal class NpcInfoClient( private const val SEQUENCE: Int = 0x4 private const val NAME_CHANGE: Int = 0x100 private const val OPS: Int = 0x400 - private const val SPOTANIM: Int = 0x400_000 + private const val SPOTANIM: Int = 0x2 + private const val SPOTANIM_OLD: Int = 0x400_000 private const val HEADBARS: Int = 0x1_000_000 private const val BAS_CHANGE: Int = 0x200_000 private const val SAY: Int = 0x10 @@ -1023,7 +1051,7 @@ internal class NpcInfoClient( private const val NPC_TRANSPARENCY: Int = 0x8000 private const val NPC_FREEZE: Int = 0x1 - private const val UNUSED_FLAGS = 0x10000 or 0x2000 or 0x10 or 0x4 + private const val UNUSED_FLAGS = 0x800000 or 0x4000 or 0x40 // 0x10000 or 0x2000 or 0x10 or 0x4 private enum class UpdateType { IDLE, diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt index 9f444148d..36fea431b 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/playerinfo/PlayerInfoClient.kt @@ -302,6 +302,9 @@ internal class PlayerInfoClient( throw IllegalStateException("Unused flags used!") } + if (flags and SPOTANIM != 0) { + decodeSpotanims(buffer, blocks) + } if (flags and CHAT != 0) { decodeChat(buffer, blocks) } @@ -329,8 +332,8 @@ internal class PlayerInfoClient( if (flags and TEMP_MOVE_SPEED != 0) { decodeTemporaryMoveSpeed(buffer, blocks) } - if (flags and SPOTANIM != 0) { - decodeSpotanims(buffer, blocks) + if (flags and SPOTANIM_OLD != 0) { + decodeSpotanimsOld(buffer, blocks) } if (flags and PLAYER_TRANSPARENCY != 0) { decodeTransparency(buffer, blocks) @@ -539,7 +542,7 @@ internal class PlayerInfoClient( ) } - private fun decodeSpotanims( + private fun decodeSpotanimsOld( buffer: JagByteBuf, blocks: MutableList, ) { @@ -556,6 +559,24 @@ internal class PlayerInfoClient( blocks += SpotanimExtendedInfo(spotanims) } + private fun decodeSpotanims( + buffer: JagByteBuf, + blocks: MutableList, + ) { + val spotanims = mutableMapOf() + val count = buffer.g1Alt1() + for (i in 0.., @@ -1150,13 +1171,14 @@ internal class PlayerInfoClient( private const val EXACT_MOVE = 0x8000 private const val PLAYER_TRANSPARENCY = 0x10000 private const val TEMP_MOVE_SPEED = 0x800 - private const val SPOTANIM = 0x80000 + private const val SPOTANIM_OLD = 0x80000 + private const val SPOTANIM = 0x20 private const val HEADBARS = 0x20000 private const val HITMARKS = 0x100000 private const val PLAYER_FREEZE = 0x40_000 private const val PLAYER_RESET = 0x8 - private const val UNUSED_FLAGS = 0x2 or 0x20 + private const val UNUSED_FLAGS = 0x2 private class Player { var queuedMove: Boolean = false From 7aaa0e0d4bd5dd00344faf267bee06600204e746 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 16:59:40 +0300 Subject: [PATCH 08/13] feat: pass in version to npc info clients --- .../decoder/codec/info/NpcInfoLargeDecoder.kt | 1 + .../decoder/codec/info/NpcInfoSmallDecoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../decoder/codec/info/NpcInfoLargeDecoder.kt | 1 + .../decoder/codec/info/NpcInfoSmallDecoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../decoder/codec/info/NpcInfoLargeDecoder.kt | 1 + .../decoder/codec/info/NpcInfoSmallDecoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../codec/info/NpcInfoLargeV5Decoder.kt | 1 + .../codec/info/NpcInfoLargeV6Decoder.kt | 29 +++++++++++++++++++ .../codec/info/NpcInfoSmallV5Decoder.kt | 1 + .../codec/info/NpcInfoSmallV6Decoder.kt | 29 +++++++++++++++++++ .../outgoing/decoder/prot/GameServerProt.kt | 2 ++ .../prot/ServerMessageDecoderRepository.kt | 4 +++ .../model/info/npcinfo/NpcInfoClient.kt | 1 + .../model/info/npcinfo/NpcInfoDecoder.kt | 1 + 59 files changed, 119 insertions(+) create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV6Decoder.kt create mode 100644 protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV6Decoder.kt diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt index 4a510e5aa..dcdd04578 100644 --- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt +++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeDecoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 4, ) } } diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt index d4042a54d..98102544d 100644 --- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt +++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallDecoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 4, ) } } diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index e6105066c..2f0bd7735 100644 --- a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -56,6 +56,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt index 67129c465..0a0dca793 100644 --- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt +++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeDecoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 4, ) } } diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt index 46f661992..1a177f754 100644 --- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt +++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallDecoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 4, ) } } diff --git a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index bdcb095b8..4eff4a046 100644 --- a/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-224/src/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -56,6 +56,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt index ec2a07efb..2f93f64f0 100644 --- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt +++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoLargeDecoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeDecoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 4, ) } } diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt index d76154c0a..da5f8b503 100644 --- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt +++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/decoder/codec/info/NpcInfoSmallDecoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallDecoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 4, ) } } diff --git a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index e3d9e85a2..eca4da9f9 100644 --- a/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-225/src/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 836f8add3..383553cca 100644 --- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 86f19246a..041ac99f6 100644 --- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index f9ffbb69e..e71ce202d 100644 --- a/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-226/src/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 0ff2681ba..df984ac5b 100644 --- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index a5248622a..56a91d8b5 100644 --- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 04fe73802..a5b438a1d 100644 --- a/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-227/src/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 95e5f6ad8..cdb85df19 100644 --- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 528b6eede..d147a7df2 100644 --- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 0f631fede..e8b4c5afc 100644 --- a/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-228/src/main/kotlin/net/rsprox/protocol/v228/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 86f1ae010..f35cee40c 100644 --- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index cb0449e67..48aaeaeb0 100644 --- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 3c953c522..23fadc243 100644 --- a/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-229/src/main/kotlin/net/rsprox/protocol/v229/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index a122fe315..dfdab8219 100644 --- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 0f77b6643..dd0654602 100644 --- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index a4addaa80..b2875852f 100644 --- a/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-230/src/main/kotlin/net/rsprox/protocol/v230/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index bb6ff28a1..257dbdd6d 100644 --- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 3407bb473..d1a0dd20f 100644 --- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index ad9f9da74..5226ea0d3 100644 --- a/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-231/src/main/kotlin/net/rsprox/protocol/v231/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -56,6 +56,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 7b2a60af0..8ee994a55 100644 --- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 6775eb179..3153f3899 100644 --- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index f9cadea06..f13650734 100644 --- a/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-232/src/main/kotlin/net/rsprox/protocol/v232/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index d82a02754..052aacb4f 100644 --- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index a3d6c15f3..037964e6a 100644 --- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 5b3669931..6ba0ea330 100644 --- a/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-233/src/main/kotlin/net/rsprox/protocol/v233/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index d7fa5e02b..d416f7453 100644 --- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 7b9aa2482..0c5922bf5 100644 --- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 96a71bc98..c5f8a51e2 100644 --- a/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-234/src/main/kotlin/net/rsprox/protocol/v234/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 732741e1e..5cff6021d 100644 --- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 594787462..804d33281 100644 --- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 6e324cc71..1c37e0183 100644 --- a/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-235/src/main/kotlin/net/rsprox/protocol/v235/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 86bdbb08b..676ab99f7 100644 --- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 33eed6c84..baa5eef4c 100644 --- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 81f5416a1..ef2b75dae 100644 --- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -55,6 +55,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index e520317c5..23ffe2afe 100644 --- a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index e145a578a..5799c0c30 100644 --- a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 09486d43a..6e5fd4da6 100644 --- a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -57,6 +57,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 67bd70545..569a96072 100644 --- a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 82b5bf145..b1951b525 100644 --- a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 5a37b7ddc..346f2b4ac 100644 --- a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -57,6 +57,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 800bf669c..421976b7d 100644 --- a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index a5a4a037f..14c19284d 100644 --- a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 94adea49d..cd1f595d7 100644 --- a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -57,6 +57,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt index 8bc45620e..301353d30 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoLargeV5Decoder : ProxyMessageDecoder { buffer.buffer, true, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV6Decoder.kt new file mode 100644 index 000000000..d64c9a20c --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoLargeV6Decoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getNpcInfoBaseCoord +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcInfoLargeV6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_INFO_LARGE_V6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcInfo { + val activeWorld = session.getActiveWorld() + val world = session.getWorld(activeWorld) + return world.npcInfo.decode( + buffer.buffer, + true, + session.getNpcInfoBaseCoord(), + 6, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt index 50c11c86c..91114d032 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV5Decoder.kt @@ -23,6 +23,7 @@ internal class NpcInfoSmallV5Decoder : ProxyMessageDecoder { buffer.buffer, false, session.getNpcInfoBaseCoord(), + 5, ) } } diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV6Decoder.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV6Decoder.kt new file mode 100644 index 000000000..c105f0adf --- /dev/null +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/codec/info/NpcInfoSmallV6Decoder.kt @@ -0,0 +1,29 @@ +package net.rsprox.protocol.v240.game.outgoing.decoder.codec.info + +import net.rsprot.buffer.JagByteBuf +import net.rsprot.protocol.ClientProt +import net.rsprox.protocol.ProxyMessageDecoder +import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo +import net.rsprox.protocol.session.Session +import net.rsprox.protocol.session.getActiveWorld +import net.rsprox.protocol.session.getNpcInfoBaseCoord +import net.rsprox.protocol.session.getWorld +import net.rsprox.protocol.v240.game.outgoing.decoder.prot.GameServerProt + +internal class NpcInfoSmallV6Decoder : ProxyMessageDecoder { + override val prot: ClientProt = GameServerProt.NPC_INFO_SMALL_V6 + + override fun decode( + buffer: JagByteBuf, + session: Session, + ): NpcInfo { + val activeWorld = session.getActiveWorld() + val world = session.getWorld(activeWorld) + return world.npcInfo.decode( + buffer.buffer, + false, + session.getNpcInfoBaseCoord(), + 6, + ) + } +} diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt index 0f2306bdc..a3fd258c1 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt @@ -90,6 +90,8 @@ public enum class GameServerProt( PLAYER_INFO(GameServerProtId.PLAYER_INFO, Prot.VAR_SHORT), NPC_INFO_SMALL_V5(GameServerProtId.NPC_INFO_SMALL_V5, Prot.VAR_SHORT), NPC_INFO_LARGE_V5(GameServerProtId.NPC_INFO_LARGE_V5, Prot.VAR_SHORT), + NPC_INFO_SMALL_V6(GameServerProtId.NPC_INFO_SMALL_V6, Prot.VAR_SHORT), + NPC_INFO_LARGE_V6(GameServerProtId.NPC_INFO_LARGE_V6, Prot.VAR_SHORT), SET_NPC_UPDATE_ORIGIN(GameServerProtId.SET_NPC_UPDATE_ORIGIN, 2), diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt index 689e6ffe6..ef9c710d6 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/ServerMessageDecoderRepository.kt @@ -44,7 +44,9 @@ import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupVarDecode import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupVarIntDecoder import net.rsprox.protocol.v240.game.outgoing.decoder.codec.group.GroupVarLongDecoder import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.NpcInfoLargeV5Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.NpcInfoLargeV6Decoder import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.NpcInfoSmallV5Decoder +import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.NpcInfoSmallV6Decoder import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.PlayerInfoDecoder import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.SetNpcUpdateOriginDecoder import net.rsprox.protocol.v240.game.outgoing.decoder.codec.info.WorldEntityInfoV7Decoder @@ -207,6 +209,8 @@ internal object ServerMessageDecoderRepository { bind(PlayerInfoDecoder()) bind(NpcInfoSmallV5Decoder()) bind(NpcInfoLargeV5Decoder()) + bind(NpcInfoSmallV6Decoder()) + bind(NpcInfoLargeV6Decoder()) bind(SetNpcUpdateOriginDecoder()) bind(WorldEntityInfoV7Decoder(huffmanCodec, cache)) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index fdeaf2981..29c20b1de 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -57,6 +57,7 @@ internal class NpcInfoClient( buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo { deletedNPCCount = 0 extraUpdateNPCCount = 0 diff --git a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/npcinfo/NpcInfoDecoder.kt b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/npcinfo/NpcInfoDecoder.kt index 3a4e73803..508ae41e7 100644 --- a/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/npcinfo/NpcInfoDecoder.kt +++ b/protocol/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/npcinfo/NpcInfoDecoder.kt @@ -8,5 +8,6 @@ public interface NpcInfoDecoder { buffer: ByteBuf, large: Boolean, baseCoord: CoordGrid, + version: Int, ): NpcInfo } From e63d10c9dfd6a0fc3e40ac90eaeaa32834ac53e9 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 17:02:08 +0300 Subject: [PATCH 09/13] fix: support both v5 and v6 npc info low res decoding --- .../model/info/npcinfo/NpcInfoClient.kt | 75 +++++++++++++------ 1 file changed, 52 insertions(+), 23 deletions(-) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt index 29c20b1de..bf9f41d91 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/npcinfo/NpcInfoClient.kt @@ -63,7 +63,7 @@ internal class NpcInfoClient( extraUpdateNPCCount = 0 buffer.toBitBuf().use { bitBuffer -> processHighResolution(bitBuffer) - processLowResolution(large, bitBuffer, baseCoord) + processLowResolution(large, bitBuffer, baseCoord, version) } processExtendedInfo(buffer.toJagByteBuf()) for (i in 0.. Date: Tue, 4 Aug 2026 17:03:38 +0300 Subject: [PATCH 10/13] fix: bank pin and keyboard press erasure --- .../kotlin/net/rsprox/proxy/client/ClientGameHandler.kt | 6 ++++++ .../kotlin/net/rsprox/proxy/server/ServerGameHandler.kt | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt b/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt index b7faf61bd..0562c6d41 100644 --- a/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt +++ b/proxy/src/main/kotlin/net/rsprox/proxy/client/ClientGameHandler.kt @@ -166,6 +166,12 @@ public class ClientGameHandler( replacement.p1Alt2(0) replacement.p3Alt1(delta) } + 240 -> { + buffer.g1() // Key + val delta = buffer.g3() + replacement.p1(0) + replacement.p3(delta) + } } } diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt b/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt index 5010273ff..812c3b937 100644 --- a/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt +++ b/proxy/src/main/kotlin/net/rsprox/proxy/server/ServerGameHandler.kt @@ -234,6 +234,11 @@ public class ServerGameHandler( targetComponent = buf.gCombinedIdAlt3() buf.skipRead(1) } + 240 -> { + buf.skipRead(1) + interfaceId = buf.g2Alt3() + targetComponent = buf.gCombinedIdAlt3() + } else -> { error("Unsupported revision: $revision") From b2536ddb9e14b004a59487644debe483ada666b1 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 17:05:05 +0300 Subject: [PATCH 11/13] fix: add support for unhandled prot --- .../v240/game/outgoing/decoder/prot/GameServerProt.kt | 1 + .../game/outgoing/decoder/prot/GameServerProtId.kt | 6 +++--- .../net/rsprox/transcriber/TranscriberPlugin.kt | 11 +++++++---- .../rsprox/transcriber/indexer/IndexerTranscriber.kt | 2 +- .../transcriber/interfaces/NpcInfoTranscriber.kt | 2 +- .../net/rsprox/transcriber/prot/GameServerProt.kt | 3 +++ .../rsprox/transcriber/text/TextNpcInfoTranscriber.kt | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt index a3fd258c1..3e95c00d7 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProt.kt @@ -214,6 +214,7 @@ public enum class GameServerProt( // Unknown packets UNKNOWN_STRING(GameServerProtId.UNKNOWN_STRING, Prot.VAR_BYTE), + UNHANDLED(GameServerProtId.UNHANDLED, Prot.VAR_SHORT), PACKET_GROUP_END(0xFE, 0), RECONNECT(0xFF, Prot.VAR_SHORT), diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt index 6e2d480c4..89dc358e8 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/decoder/prot/GameServerProtId.kt @@ -130,16 +130,16 @@ internal object GameServerProtId { const val UPDATE_ZONE_FULL_FOLLOWS = 126 const val VARP_SMALL = 127 const val CAM_ROTATETO_COORDINATE_V3 = 128 - const val UNHANDLED_4 = 129 + const val UNHANDLED = 129 const val CAM_MOVETO_CYCLES_V3 = 130 const val CAM_MOVETO_ARC_V3 = 131 const val IF_SETMODEL_V2 = 132 const val CAM_ROTATETO_COORDINATE_V2 = 133 const val CAM_MOVETO_V3 = 134 - const val AMBIENCE_START = 135 + const val AMBIENTSOUND_START = 135 const val SET_MAP_FLAG_V2 = 136 const val GROUP_VAR_LONG = 137 - const val AMBIENCE_STOP = 138 + const val AMBIENTSOUND_STOP = 138 const val GROUP_FULL = 139 const val CAM_SKYBOX = 140 const val NPC_INFO_LARGE_V6 = 141 diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt index 524323f6f..6d0be317c 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/TranscriberPlugin.kt @@ -114,8 +114,10 @@ public class TranscriberPlugin( GameServerProt.OBJ_COUNT_SPECIFIC -> pass(message, Transcriber::objCountSpecific) GameServerProt.OBJ_CUSTOMISE_SPECIFIC -> pass(message, Transcriber::objUncustomiseSpecific) GameServerProt.PLAYER_INFO -> pass(message, Transcriber::playerInfo) - GameServerProt.NPC_INFO_SMALL_V5 -> pass(message, Transcriber::npcInfoV5) - GameServerProt.NPC_INFO_LARGE_V5 -> pass(message, Transcriber::npcInfoV5) + GameServerProt.NPC_INFO_SMALL_V6 -> pass(message, Transcriber::npcInfoV6) + GameServerProt.NPC_INFO_LARGE_V6 -> pass(message, Transcriber::npcInfoV6) + GameServerProt.NPC_INFO_SMALL_V5 -> pass(message, Transcriber::npcInfoV6) + GameServerProt.NPC_INFO_LARGE_V5 -> pass(message, Transcriber::npcInfoV6) GameServerProt.SET_NPC_UPDATE_ORIGIN -> pass(message, Transcriber::setNpcUpdateOrigin) GameServerProt.CLEAR_ENTITIES -> pass(message, Transcriber::clearEntities) GameServerProt.SET_ACTIVE_WORLD_V1 -> pass(message, Transcriber::setActiveWorldV1) @@ -234,8 +236,8 @@ public class TranscriberPlugin( GameServerProt.RECONNECT -> pass(message, Transcriber::reconnect) GameServerProt.HIDEOBJOPS -> pass(message, Transcriber::hideObjOps) GameServerProt.UNKNOWN_STRING -> pass(message, Transcriber::unknownString) - GameServerProt.NPC_INFO_SMALL_V4 -> pass(message, Transcriber::npcInfoV5) - GameServerProt.NPC_INFO_LARGE_V4 -> pass(message, Transcriber::npcInfoV5) + GameServerProt.NPC_INFO_SMALL_V4 -> pass(message, Transcriber::npcInfoV6) + GameServerProt.NPC_INFO_LARGE_V4 -> pass(message, Transcriber::npcInfoV6) GameServerProt.OBJ_CUSTOMISE -> pass(message, Transcriber::objCustomise) GameServerProt.OBJ_UNCUSTOMISE -> pass(message, Transcriber::objUncustomise) GameServerProt.SET_INTERACTION_MODE -> pass(message, Transcriber::setInteractionMode) @@ -244,6 +246,7 @@ public class TranscriberPlugin( GameServerProt.WORLDENTITY_INFO_V7 -> pass(message, Transcriber::worldEntityInfoV7) GameServerProt.ACCOUNT_FLAGS -> pass(message, Transcriber::accountFlags) GameServerProt.ZBUF -> pass(message, Transcriber::zbuf) + GameServerProt.UNHANDLED -> error("Unhandled message in use") } } diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt index 602662217..85c14a70c 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/indexer/IndexerTranscriber.kt @@ -1484,7 +1484,7 @@ public class IndexerTranscriber( binaryIndex.increment(IndexedType.SPOTANIM, id) } - override fun npcInfoV5(message: NpcInfo) { + override fun npcInfoV6(message: NpcInfo) { val world = sessionState.getActiveWorld() for ((index, update) in message.updates) { when (update) { diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/NpcInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/NpcInfoTranscriber.kt index 46ee6a5ba..e78e312c4 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/NpcInfoTranscriber.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/interfaces/NpcInfoTranscriber.kt @@ -3,5 +3,5 @@ package net.rsprox.transcriber.interfaces import net.rsprox.protocol.game.outgoing.model.info.npcinfo.NpcInfo public fun interface NpcInfoTranscriber { - public fun npcInfoV5(message: NpcInfo) + public fun npcInfoV6(message: NpcInfo) } diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt index 9c9ce8581..a016ba8a3 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/prot/GameServerProt.kt @@ -86,6 +86,8 @@ public enum class GameServerProt : Prot { // Info packets PLAYER_INFO, + NPC_INFO_SMALL_V6, + NPC_INFO_LARGE_V6, NPC_INFO_SMALL_V5, NPC_INFO_LARGE_V5, NPC_INFO_SMALL_V4, @@ -237,6 +239,7 @@ public enum class GameServerProt : Prot { // Unknown packets UNKNOWN_STRING, + UNHANDLED, RECONNECT, } diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt index 427e8b19b..cd10f916c 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt @@ -177,7 +177,7 @@ public class TextNpcInfoTranscriber( return coordGridProperty(coord.level, coord.x, coord.z, name) } - override fun npcInfoV5(message: NpcInfo) { + override fun npcInfoV6(message: NpcInfo) { npcInfoUpdate(message) } From 3d6a5fdff554d37db12b74355ef43bf16dcbb767 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 17:12:06 +0300 Subject: [PATCH 12/13] fix: disable revision check in clientscript inference --- .../clientscript/RSProxArchiveClientScriptIndex.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cache/src/main/kotlin/net/rsprox/cache/clientscript/RSProxArchiveClientScriptIndex.kt b/cache/src/main/kotlin/net/rsprox/cache/clientscript/RSProxArchiveClientScriptIndex.kt index bdced7967..be51ba692 100644 --- a/cache/src/main/kotlin/net/rsprox/cache/clientscript/RSProxArchiveClientScriptIndex.kt +++ b/cache/src/main/kotlin/net/rsprox/cache/clientscript/RSProxArchiveClientScriptIndex.kt @@ -73,9 +73,10 @@ internal class RSProxArchiveClientScriptIndex( "Unsupported clientscript index schema ${index.kind} version ${index.version}" } require(index.game == OLDSCHOOL_GAME) { "Unexpected clientscript index game: ${index.game}" } - require(index.revision == masterIndex.revision) { - "Clientscript index revision ${index.revision} does not match cache revision ${masterIndex.revision}" - } + // Don't allow this check as it breaks during revision transitions. + // require(index.revision == masterIndex.revision) { + // "Clientscript index revision ${index.revision} does not match cache revision ${masterIndex.revision}" + // } require(index.masterIndexSha256.equals(sha256, ignoreCase = true)) { "Clientscript index master SHA ${index.masterIndexSha256} does not match $sha256" } @@ -86,9 +87,10 @@ internal class RSProxArchiveClientScriptIndex( ClientScriptDefinition( type = definition.type, name = definition.name, - arguments = definition.arguments.map { argument -> - ClientScriptArgument(argument.type, argument.name) - }, + arguments = + definition.arguments.map { argument -> + ClientScriptArgument(argument.type, argument.name) + }, returnTypes = definition.returnTypes, ) } From 4eba5a8eaeda3d9bd44c0bde6abd67c8638731a6 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 4 Aug 2026 18:06:14 +0300 Subject: [PATCH 13/13] fix: correct worldentity extended info decoding & removal --- .../info/worldentityinfo/WorldEntityInfoClient.kt | 3 ++- .../info/worldentityinfo/WorldEntityInfoClient.kt | 3 ++- .../info/worldentityinfo/WorldEntityInfoClient.kt | 3 ++- .../info/worldentityinfo/WorldEntityInfoClient.kt | 3 ++- .../info/worldentityinfo/WorldEntityInfoClient.kt | 15 ++++++++------- .../rsprox/transcriber/state/SessionTracker.kt | 12 +++++++++++- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt index 21991de4b..c31f8e73f 100644 --- a/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt +++ b/protocol/osrs-236/src/main/kotlin/net/rsprox/protocol/v236/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt @@ -281,7 +281,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { } this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index if (opcode == 1) { - val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer) + val flags = buffer.g1() + val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags) if (extendedInfo.isEmpty()) { updates[index] = WorldEntityUpdateType.Idle } else { diff --git a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt index 6d90ddb5b..6a022fa6f 100644 --- a/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt +++ b/protocol/osrs-237/src/main/kotlin/net/rsprox/protocol/v237/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt @@ -281,7 +281,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { } this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index if (opcode == 1) { - val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer) + val flags = buffer.g1() + val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags) if (extendedInfo.isEmpty()) { updates[index] = WorldEntityUpdateType.Idle } else { diff --git a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt index 8ab871b58..2dea54d08 100644 --- a/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt +++ b/protocol/osrs-238/src/main/kotlin/net/rsprox/protocol/v238/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt @@ -281,7 +281,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { } this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index if (opcode == 1) { - val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer) + val flags = buffer.g1() + val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags) if (extendedInfo.isEmpty()) { updates[index] = WorldEntityUpdateType.Idle } else { diff --git a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt index 59ea2255a..e56d6b275 100644 --- a/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt +++ b/protocol/osrs-239/src/main/kotlin/net/rsprox/protocol/v239/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt @@ -281,7 +281,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { } this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index if (opcode == 1) { - val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer) + val flags = buffer.g1() + val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags) if (extendedInfo.isEmpty()) { updates[index] = WorldEntityUpdateType.Idle } else { diff --git a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt index 79949d379..1b628c611 100644 --- a/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt +++ b/protocol/osrs-240/src/main/kotlin/net/rsprox/protocol/v240/game/outgoing/model/info/worldentityinfo/WorldEntityInfoClient.kt @@ -281,7 +281,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { } this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index if (opcode == 1) { - val extendedInfo = decodeWorldEntityInfoExtendedInfoUnobfuscated(buffer) + val flags = buffer.g1() + val extendedInfo = decodeWorldEntityInfoExtendedInfoObfuscated(buffer, flags) if (extendedInfo.isEmpty()) { updates[index] = WorldEntityUpdateType.Idle } else { @@ -339,14 +340,14 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { return emptyList() } val blocks = mutableListOf() - if (flags and 0x2 != 0) { - blocks += EnabledOpsExtendedInfo(buffer.g1Alt3()) - } if (flags and 0x1 != 0) { val id = buffer.g2() - val delay = buffer.g1() + val delay = buffer.g1Alt1() blocks += SequenceExtendedInfo(id, delay) } + if (flags and 0x2 != 0) { + blocks += EnabledOpsExtendedInfo(buffer.g1Alt1()) + } return blocks } @@ -564,8 +565,8 @@ public class WorldEntityInfoClient : WorldEntityInfoDecoder { val index = buffer.g2() // Note: If serverVersion < 237, add +1 to index this.transmittedWorldEntity[this.transmittedWorldEntityCount++] = index - val extendedInfoFlags = buffer.g1() - val packedSize = buffer.g1Alt2() + val extendedInfoFlags = buffer.g1Alt3() + val packedSize = buffer.g1Alt3() val priority = buffer.g1Alt1() val id = buffer.g2sAlt1() diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt index 0fc04734c..051a9f3b3 100644 --- a/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt +++ b/transcriber/src/main/kotlin/net/rsprox/transcriber/state/SessionTracker.kt @@ -14,8 +14,13 @@ import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.Move import net.rsprox.protocol.game.outgoing.model.info.playerinfo.extendedinfo.TemporaryMoveSpeedExtendedInfo import net.rsprox.protocol.game.outgoing.model.info.shared.extendedinfo.ExtendedInfo import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfo +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV1 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV2 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV3 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV4 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV5 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV6 +import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityInfoV7 import net.rsprox.protocol.game.outgoing.model.info.worldentityinfo.WorldEntityUpdateType import net.rsprox.protocol.game.outgoing.model.interfaces.IfCloseSub import net.rsprox.protocol.game.outgoing.model.interfaces.IfMoveSub @@ -217,9 +222,14 @@ public class SessionTracker( is WorldEntityInfo -> { val earlyRemovals = when (message) { + is WorldEntityInfoV1 -> emptyList() + is WorldEntityInfoV2 -> emptyList() + is WorldEntityInfoV3 -> emptyList() + is WorldEntityInfoV4 -> emptyList() is WorldEntityInfoV5 -> message.earlyRemovals is WorldEntityInfoV6 -> message.earlyRemovals - else -> emptySet() + is WorldEntityInfoV7 -> message.earlyRemovals + else -> error("Missing handler for $message") } if (earlyRemovals.isNotEmpty()) { for (index in earlyRemovals) {