From a364af098595e31b4d5c16819d646de37e0be67a Mon Sep 17 00:00:00 2001 From: dank074 Date: Sun, 22 Aug 2021 01:50:51 -0500 Subject: [PATCH 1/3] added jukebox outgoing packets --- src/nitro/communication/NitroMessages.ts | 14 ++++++++++++- .../messages/outgoing/OutgoingHeader.ts | 10 ++++++++- .../communication/messages/outgoing/index.ts | 1 + .../outgoing/sound/AddJukeboxDiskComposer.ts | 21 +++++++++++++++++++ .../GetJukeboxPlayListMessageComposer.ts | 21 +++++++++++++++++++ .../sound/GetNowPlayingMessageComposer.ts | 21 +++++++++++++++++++ .../sound/GetOfficialSongIdMessageComposer.ts | 21 +++++++++++++++++++ .../sound/GetSongInfoMessageComposer.ts | 21 +++++++++++++++++++ .../GetSoundMachinePlayListMessageComposer.ts | 21 +++++++++++++++++++ .../sound/GetSoundSettingsComposer.ts | 21 +++++++++++++++++++ .../sound/GetUserSongDisksMessageComposer.ts | 21 +++++++++++++++++++ .../sound/RemoveJukeboxDiskComposer.ts | 21 +++++++++++++++++++ .../messages/outgoing/sound/index.ts | 9 ++++++++ 13 files changed, 221 insertions(+), 2 deletions(-) create mode 100644 src/nitro/communication/messages/outgoing/sound/AddJukeboxDiskComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetJukeboxPlayListMessageComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetNowPlayingMessageComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetOfficialSongIdMessageComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetSongInfoMessageComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetSoundMachinePlayListMessageComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetSoundSettingsComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/GetUserSongDisksMessageComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/RemoveJukeboxDiskComposer.ts create mode 100644 src/nitro/communication/messages/outgoing/sound/index.ts diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts index 40f96e60..180ae3f0 100644 --- a/src/nitro/communication/NitroMessages.ts +++ b/src/nitro/communication/NitroMessages.ts @@ -1,5 +1,5 @@ import { IMessageConfiguration } from '../../core/communication/messages/IMessageConfiguration'; -import { AchievementNotificationMessageEvent, ApproveNameMessageComposer, BadgeReceivedEvent, BonusRareInfoMessageEvent, CatalogApproveNameResultEvent, ChangeUserNameResultMessageEvent, FurnitureGuildInfoComposer, GetBonusRareInfoMessageComposer, MysteryBoxKeysEvent, PetExperienceEvent, PetMountComposer, PetSupplementComposer, RemoveAllRightsMessageComposer, RemoveOwnRoomRightsRoomMessageComposer, RemovePetSaddleComposer, RoomUnitGiveHandItemPetComposer, SellablePetPalettesEvent, TogglePetBreedingComposer, TogglePetRidingComposer, UnseenResetCategoryComposer, UnseenResetItemsComposer, UsePetProductComposer } from './messages'; +import { AchievementNotificationMessageEvent, AddJukeboxDiskComposer, ApproveNameMessageComposer, BadgeReceivedEvent, BonusRareInfoMessageEvent, CatalogApproveNameResultEvent, ChangeUserNameResultMessageEvent, FurnitureGuildInfoComposer, GetBonusRareInfoMessageComposer, GetJukeboxPlayListMessageComposer, GetNowPlayingMessageComposer, GetOfficialSongIdMessageComposer, GetSongInfoMessageComposer, GetSoundMachinePlayListMessageComposer, GetUserSongDisksMessageComposer, MysteryBoxKeysEvent, PetExperienceEvent, PetMountComposer, PetSupplementComposer, RemoveAllRightsMessageComposer, RemoveJukeboxDiskComposer, RemoveOwnRoomRightsRoomMessageComposer, RemovePetSaddleComposer, RoomUnitGiveHandItemPetComposer, SellablePetPalettesEvent, TogglePetBreedingComposer, TogglePetRidingComposer, UnseenResetCategoryComposer, UnseenResetItemsComposer, UsePetProductComposer } from './messages'; import { AvailabilityStatusMessageEvent } from './messages/incoming/availability/AvailabilityStatusMessageEvent'; import { CameraPublishStatusMessageEvent } from './messages/incoming/camera/CameraPublishStatusMessageEvent'; import { CameraPurchaseOKMessageEvent } from './messages/incoming/camera/CameraPurchaseOKMessageEvent'; @@ -436,6 +436,7 @@ import { RoomMuteComposer } from './messages/outgoing/roomevents/RoomMuteCompose import { UpdateActionMessageComposer } from './messages/outgoing/roomevents/UpdateActionMessageComposer'; import { UpdateConditionMessageComposer } from './messages/outgoing/roomevents/UpdateConditionMessageComposer'; import { UpdateTriggerMessageComposer } from './messages/outgoing/roomevents/UpdateTriggerMessageComposer'; +import { GetSoundSettingsComposer } from './messages/outgoing/sound/GetSoundSettingsComposer'; import { GetIgnoredUsersComposer } from './messages/outgoing/user/data/GetIgnoredUsersComposer'; import { IgnoreUserComposer } from './messages/outgoing/user/data/IgnoreUserComposer'; import { IgnoreUserIdComposer } from './messages/outgoing/user/data/IgnoreUserIdComposer'; @@ -1164,6 +1165,17 @@ export class NitroMessages implements IMessageConfiguration this._composers.set(OutgoingHeader.PURCHASE_PHOTO, PurchasePhotoMessageComposer); this._composers.set(OutgoingHeader.PUBLISH_PHOTO, PublishPhotoMessageComposer); this._composers.set(OutgoingHeader.PHOTO_COMPETITION, PhotoCompetitionMessageComposer); + + // SOUNDS + this._composers.set(OutgoingHeader.GET_SOUND_SETTINGS, GetSoundSettingsComposer); + this._composers.set(OutgoingHeader.ADD_JUKEBOX_DISK, AddJukeboxDiskComposer); + this._composers.set(OutgoingHeader.GET_JUKEBOX_PLAYLIST, GetJukeboxPlayListMessageComposer); + this._composers.set(OutgoingHeader.GET_NOW_PLAYING, GetNowPlayingMessageComposer); + this._composers.set(OutgoingHeader.GET_OFFICIAL_SONG_ID, GetOfficialSongIdMessageComposer); + this._composers.set(OutgoingHeader.GET_SONG_INFO, GetSongInfoMessageComposer); + this._composers.set(OutgoingHeader.GET_SOUND_MACHINE_PLAYLIST, GetSoundMachinePlayListMessageComposer); + this._composers.set(OutgoingHeader.GET_USER_SONG_DISKS, GetUserSongDisksMessageComposer); + this._composers.set(OutgoingHeader.REMOVE_JUKEBOX_DISK, RemoveJukeboxDiskComposer); } public get events(): Map diff --git a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts index 1808f14c..a3ef8162 100644 --- a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts +++ b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts @@ -177,7 +177,7 @@ export class OutgoingHeader public static USER_PETS = 3095; public static USER_PROFILE = 3265; public static USER_RESPECT = 2694; - public static USER_SETTINGS = 2388; + public static GET_SOUND_SETTINGS = 2388; public static USER_SETTINGS_CAMERA = 1461; public static USER_SETTINGS_CHAT_STYLE = 1030; public static USER_SETTINGS_INVITES = 1086; @@ -271,4 +271,12 @@ export class OutgoingHeader public static RENDER_ROOM = 3226; public static RENDER_ROOM_THUMBNAIL = 1982; public static REQUEST_CAMERA_CONFIGURATION = 796; + public static ADD_JUKEBOX_DISK = 753; + public static GET_JUKEBOX_PLAYLIST = 1435; + public static GET_NOW_PLAYING = 1325; + public static GET_OFFICIAL_SONG_ID = 3189; + public static GET_SONG_INFO = 3082; + public static GET_SOUND_MACHINE_PLAYLIST = 3498; + public static GET_USER_SONG_DISKS = 2304; + public static REMOVE_JUKEBOX_DISK = 3050; } diff --git a/src/nitro/communication/messages/outgoing/index.ts b/src/nitro/communication/messages/outgoing/index.ts index ee10b047..da6a0e6a 100644 --- a/src/nitro/communication/messages/outgoing/index.ts +++ b/src/nitro/communication/messages/outgoing/index.ts @@ -15,4 +15,5 @@ export * from './pet'; export * from './quest'; export * from './room'; export * from './roomevents'; +export * from './sound'; export * from './user'; diff --git a/src/nitro/communication/messages/outgoing/sound/AddJukeboxDiskComposer.ts b/src/nitro/communication/messages/outgoing/sound/AddJukeboxDiskComposer.ts new file mode 100644 index 00000000..0b5748da --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/AddJukeboxDiskComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class AddJukeboxDiskComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor(k: number, _arg2: number) + { + this._data = [k, _arg2]; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetJukeboxPlayListMessageComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetJukeboxPlayListMessageComposer.ts new file mode 100644 index 00000000..0f4da65e --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetJukeboxPlayListMessageComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetJukeboxPlayListMessageComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor() + { + this._data = []; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetNowPlayingMessageComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetNowPlayingMessageComposer.ts new file mode 100644 index 00000000..b13cc0c6 --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetNowPlayingMessageComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetNowPlayingMessageComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor() + { + this._data = []; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetOfficialSongIdMessageComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetOfficialSongIdMessageComposer.ts new file mode 100644 index 00000000..c200b8ce --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetOfficialSongIdMessageComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetOfficialSongIdMessageComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor(k: string) + { + this._data = [ k ]; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetSongInfoMessageComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetSongInfoMessageComposer.ts new file mode 100644 index 00000000..3814a31e --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetSongInfoMessageComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetSongInfoMessageComposer implements IMessageComposer> +{ + private _data: ConstructorParameters< typeof GetSongInfoMessageComposer>; + + constructor(...args: number[]) + { + this._data = [args.length].concat(args); + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetSoundMachinePlayListMessageComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetSoundMachinePlayListMessageComposer.ts new file mode 100644 index 00000000..2a161a40 --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetSoundMachinePlayListMessageComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetSoundMachinePlayListMessageComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor() + { + this._data = []; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetSoundSettingsComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetSoundSettingsComposer.ts new file mode 100644 index 00000000..2c12f089 --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetSoundSettingsComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetSoundSettingsComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor() + { + this._data = []; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/GetUserSongDisksMessageComposer.ts b/src/nitro/communication/messages/outgoing/sound/GetUserSongDisksMessageComposer.ts new file mode 100644 index 00000000..6a809d5f --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/GetUserSongDisksMessageComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class GetUserSongDisksMessageComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor() + { + this._data = []; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/RemoveJukeboxDiskComposer.ts b/src/nitro/communication/messages/outgoing/sound/RemoveJukeboxDiskComposer.ts new file mode 100644 index 00000000..e679deae --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/RemoveJukeboxDiskComposer.ts @@ -0,0 +1,21 @@ +import { IMessageComposer } from '../../../../../core'; + +export class RemoveJukeboxDiskComposer implements IMessageComposer> +{ + private _data: ConstructorParameters; + + constructor(k: number) + { + this._data = [ k ]; + } + + public getMessageArray() + { + return this._data; + } + + public dispose(): void + { + return; + } +} diff --git a/src/nitro/communication/messages/outgoing/sound/index.ts b/src/nitro/communication/messages/outgoing/sound/index.ts new file mode 100644 index 00000000..bb1dffdc --- /dev/null +++ b/src/nitro/communication/messages/outgoing/sound/index.ts @@ -0,0 +1,9 @@ +export * from './AddJukeboxDiskComposer'; +export * from './GetJukeboxPlayListMessageComposer'; +export * from './GetNowPlayingMessageComposer'; +export * from './GetOfficialSongIdMessageComposer'; +export * from './GetSongInfoMessageComposer'; +export * from './GetSoundMachinePlayListMessageComposer'; +export * from './GetSoundSettingsComposer'; +export * from './GetUserSongDisksMessageComposer'; +export * from './RemoveJukeboxDiskComposer'; From 8b58133e6effa422b0c4a8e9da661ae1f362d91f Mon Sep 17 00:00:00 2001 From: dank074 Date: Sun, 22 Aug 2021 03:04:17 -0500 Subject: [PATCH 2/3] added incoming jukebox messages --- src/nitro/communication/NitroMessages.ts | 12 +++- .../messages/incoming/IncomingHeader.ts | 8 +++ .../communication/messages/incoming/index.ts | 1 + .../sound/JukeboxPlayListFullMessageEvent.ts | 15 +++++ .../sound/JukeboxSongDisksMessageEvent.ts | 15 +++++ .../incoming/sound/NowPlayingMessageEvent.ts | 15 +++++ .../sound/OfficialSongIdMessageEvent.ts | 15 +++++ .../messages/incoming/sound/PlayListEntry.ts | 46 +++++++++++++++ .../incoming/sound/PlayListMessageEvent.ts | 15 +++++ .../sound/PlayListSongAddedMessageEvent.ts | 15 +++++ .../messages/incoming/sound/SongInfoEntry.ts | 17 ++++++ .../sound/TraxSongInfoMessageEvent.ts | 15 +++++ .../UserSongDisksInventoryMessageEvent.ts | 15 +++++ .../messages/incoming/sound/index.ts | 10 ++++ .../communication/messages/parser/index.ts | 1 + .../sound/JukeboxPlayListFullMessageParser.ts | 14 +++++ .../sound/JukeboxSongDisksMessageParser.ts | 37 ++++++++++++ .../parser/sound/NowPlayingMessageParser.ts | 56 +++++++++++++++++++ .../sound/OfficialSongIdMessageParser.ts | 31 ++++++++++ .../parser/sound/PlayListMessageParser.ts | 40 +++++++++++++ .../sound/PlayListSongAddedMessageParser.ts | 24 ++++++++ .../parser/sound/TraxSongInfoMessageParser.ts | 35 ++++++++++++ .../UserSongDisksInventoryMessageParser.ts | 46 +++++++++++++++ .../messages/parser/sound/index.ts | 8 +++ 24 files changed, 505 insertions(+), 1 deletion(-) create mode 100644 src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/PlayListEntry.ts create mode 100644 src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts create mode 100644 src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts create mode 100644 src/nitro/communication/messages/incoming/sound/index.ts create mode 100644 src/nitro/communication/messages/parser/sound/JukeboxPlayListFullMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/JukeboxSongDisksMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/NowPlayingMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/OfficialSongIdMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts create mode 100644 src/nitro/communication/messages/parser/sound/index.ts diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts index 180ae3f0..a5230b1e 100644 --- a/src/nitro/communication/NitroMessages.ts +++ b/src/nitro/communication/NitroMessages.ts @@ -1,5 +1,5 @@ import { IMessageConfiguration } from '../../core/communication/messages/IMessageConfiguration'; -import { AchievementNotificationMessageEvent, AddJukeboxDiskComposer, ApproveNameMessageComposer, BadgeReceivedEvent, BonusRareInfoMessageEvent, CatalogApproveNameResultEvent, ChangeUserNameResultMessageEvent, FurnitureGuildInfoComposer, GetBonusRareInfoMessageComposer, GetJukeboxPlayListMessageComposer, GetNowPlayingMessageComposer, GetOfficialSongIdMessageComposer, GetSongInfoMessageComposer, GetSoundMachinePlayListMessageComposer, GetUserSongDisksMessageComposer, MysteryBoxKeysEvent, PetExperienceEvent, PetMountComposer, PetSupplementComposer, RemoveAllRightsMessageComposer, RemoveJukeboxDiskComposer, RemoveOwnRoomRightsRoomMessageComposer, RemovePetSaddleComposer, RoomUnitGiveHandItemPetComposer, SellablePetPalettesEvent, TogglePetBreedingComposer, TogglePetRidingComposer, UnseenResetCategoryComposer, UnseenResetItemsComposer, UsePetProductComposer } from './messages'; +import { AchievementNotificationMessageEvent, AddJukeboxDiskComposer, ApproveNameMessageComposer, BadgeReceivedEvent, BonusRareInfoMessageEvent, CatalogApproveNameResultEvent, ChangeUserNameResultMessageEvent, FurnitureGuildInfoComposer, GetBonusRareInfoMessageComposer, GetJukeboxPlayListMessageComposer, GetNowPlayingMessageComposer, GetOfficialSongIdMessageComposer, GetSongInfoMessageComposer, GetSoundMachinePlayListMessageComposer, GetUserSongDisksMessageComposer, JukeboxPlayListFullMessageEvent, JukeboxSongDisksMessageEvent, MysteryBoxKeysEvent, NowPlayingMessageEvent, OfficialSongIdMessageEvent, PetExperienceEvent, PetMountComposer, PetSupplementComposer, PlayListMessageEvent, PlayListSongAddedMessageEvent, RemoveAllRightsMessageComposer, RemoveJukeboxDiskComposer, RemoveOwnRoomRightsRoomMessageComposer, RemovePetSaddleComposer, RoomUnitGiveHandItemPetComposer, SellablePetPalettesEvent, TogglePetBreedingComposer, TogglePetRidingComposer, TraxSongInfoMessageEvent, UnseenResetCategoryComposer, UnseenResetItemsComposer, UsePetProductComposer, UserSongDisksInventoryMessageEvent } from './messages'; import { AvailabilityStatusMessageEvent } from './messages/incoming/availability/AvailabilityStatusMessageEvent'; import { CameraPublishStatusMessageEvent } from './messages/incoming/camera/CameraPublishStatusMessageEvent'; import { CameraPurchaseOKMessageEvent } from './messages/incoming/camera/CameraPurchaseOKMessageEvent'; @@ -817,6 +817,16 @@ export class NitroMessages implements IMessageConfiguration this._events.set(IncomingHeader.COMPETITION_STATUS, CompetitionStatusMessageEvent); this._events.set(IncomingHeader.INIT_CAMERA, InitCameraMessageEvent); this._events.set(IncomingHeader.THUMBNAIL_STATUS, ThumbnailStatusMessageEvent); + + // SOUNDS + this._events.set(IncomingHeader.JUKEBOX_PLAYLIST_FULL, JukeboxPlayListFullMessageEvent); + this._events.set(IncomingHeader.JUKEBOX_SONG_DISKS, JukeboxSongDisksMessageEvent); + this._events.set(IncomingHeader.NOW_PLAYING, NowPlayingMessageEvent); + this._events.set(IncomingHeader.OFFICIAL_SONG_ID, OfficialSongIdMessageEvent); + this._events.set(IncomingHeader.PLAYLIST, PlayListMessageEvent); + this._events.set(IncomingHeader.PLAYLIST_SONG_ADDED, PlayListSongAddedMessageEvent); + this._events.set(IncomingHeader.TRAX_SONG_INFO, TraxSongInfoMessageEvent); + this._events.set(IncomingHeader.USER_SONG_DISKS_INVENTORY, UserSongDisksInventoryMessageEvent); } private registerComposers(): void diff --git a/src/nitro/communication/messages/incoming/IncomingHeader.ts b/src/nitro/communication/messages/incoming/IncomingHeader.ts index 9efcd5be..abdfe4ed 100644 --- a/src/nitro/communication/messages/incoming/IncomingHeader.ts +++ b/src/nitro/communication/messages/incoming/IncomingHeader.ts @@ -272,4 +272,12 @@ export class IncomingHeader public static INIT_CAMERA = 3878; public static THUMBNAIL_STATUS = 3595; public static ACHIEVEMENT_NOTIFICATION = 806; + public static JUKEBOX_PLAYLIST_FULL = 105; + public static JUKEBOX_SONG_DISKS = 34; + public static NOW_PLAYING = 469; + public static OFFICIAL_SONG_ID = 1381; + public static PLAYLIST = 1748; + public static PLAYLIST_SONG_ADDED = 1140; + public static TRAX_SONG_INFO = 3365; + public static USER_SONG_DISKS_INVENTORY = 2602; } diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts index 997f29e8..ff0a0af2 100644 --- a/src/nitro/communication/messages/incoming/index.ts +++ b/src/nitro/communication/messages/incoming/index.ts @@ -46,6 +46,7 @@ export * from './room/unit'; export * from './room/unit/chat'; export * from './roomevents'; export * from './security'; +export * from './sound'; export * from './user'; export * from './user/access'; export * from './user/data'; diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts new file mode 100644 index 00000000..350a4bf6 --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { JukeboxPlayListFullMessageParser } from '../../parser'; + +export class JukeboxPlayListFullMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, JukeboxPlayListFullMessageParser); + } + + public getParser(): JukeboxPlayListFullMessageParser + { + return this.parser as JukeboxPlayListFullMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts new file mode 100644 index 00000000..dc383a5e --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { JukeboxSongDisksMessageParser } from '../../parser'; + +export class JukeboxSongDisksMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, JukeboxSongDisksMessageParser); + } + + public getParser(): JukeboxSongDisksMessageParser + { + return this.parser as JukeboxSongDisksMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts new file mode 100644 index 00000000..d8756b4e --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { NowPlayingMessageParser } from '../../parser'; + +export class NowPlayingMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, NowPlayingMessageParser); + } + + public getParser(): NowPlayingMessageParser + { + return this.parser as NowPlayingMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts new file mode 100644 index 00000000..01524c21 --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { OfficialSongIdMessageParser } from '../../parser'; + +export class OfficialSongIdMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, OfficialSongIdMessageParser); + } + + public getParser(): OfficialSongIdMessageParser + { + return this.parser as OfficialSongIdMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/PlayListEntry.ts b/src/nitro/communication/messages/incoming/sound/PlayListEntry.ts new file mode 100644 index 00000000..6a0f447e --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/PlayListEntry.ts @@ -0,0 +1,46 @@ +export class PlayListEntry +{ + protected _id: number; + protected _length: number; + protected _name: string; + protected _creator: string; + private _startPlayHead: number = 0; + + constructor(id: number, length: number, name: string, creator: string) + { + this._id = id; + this._length = length; + this._name = name; + this._creator = creator; + } + + public get id(): number + { + return this._id; + } + + public get length(): number + { + return this._length; + } + + public get name(): string + { + return this._name; + } + + public get creator(): string + { + return this._creator; + } + + public get startPlayHeadPos(): number + { + return this._startPlayHead; + } + + public set startPlayHeadPos(k: number) + { + this._startPlayHead = k; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts new file mode 100644 index 00000000..27eb5279 --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { PlayListMessageParser } from '../../parser'; + +export class PlayListMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, PlayListMessageParser); + } + + public getParser(): PlayListMessageParser + { + return this.parser as PlayListMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts new file mode 100644 index 00000000..7ce8fc79 --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { PlayListSongAddedMessageParser } from '../../parser'; + +export class PlayListSongAddedMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, PlayListSongAddedMessageParser); + } + + public getParser(): PlayListSongAddedMessageParser + { + return this.parser as PlayListSongAddedMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts b/src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts new file mode 100644 index 00000000..37eaaabb --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/SongInfoEntry.ts @@ -0,0 +1,17 @@ +import { PlayListEntry } from '.'; + +export class SongInfoEntry extends PlayListEntry +{ + private _data:string = ''; + + constructor(id:number, length:number, name:string, creator:string, data:string) + { + super(id, length, name, creator); + this._data = data; + } + + public get data():string + { + return this._data; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts new file mode 100644 index 00000000..80c1b83b --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { TraxSongInfoMessageParser } from '../../parser'; + +export class TraxSongInfoMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, TraxSongInfoMessageParser); + } + + public getParser(): TraxSongInfoMessageParser + { + return this.parser as TraxSongInfoMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts new file mode 100644 index 00000000..006912ca --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts @@ -0,0 +1,15 @@ +import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { UserSongDisksInventoryMessageParser } from '../../parser'; + +export class UserSongDisksInventoryMessageEvent extends MessageEvent implements IMessageEvent +{ + constructor(callBack: Function) + { + super(callBack, UserSongDisksInventoryMessageParser); + } + + public getParser(): UserSongDisksInventoryMessageParser + { + return this.parser as UserSongDisksInventoryMessageParser; + } +} diff --git a/src/nitro/communication/messages/incoming/sound/index.ts b/src/nitro/communication/messages/incoming/sound/index.ts new file mode 100644 index 00000000..7fa245a1 --- /dev/null +++ b/src/nitro/communication/messages/incoming/sound/index.ts @@ -0,0 +1,10 @@ +export * from './JukeboxPlayListFullMessageEvent'; +export * from './JukeboxSongDisksMessageEvent'; +export * from './NowPlayingMessageEvent'; +export * from './OfficialSongIdMessageEvent'; +export * from './PlayListEntry'; +export * from './PlayListMessageEvent'; +export * from './PlayListSongAddedMessageEvent'; +export * from './SongInfoEntry'; +export * from './TraxSongInfoMessageEvent'; +export * from './UserSongDisksInventoryMessageEvent'; diff --git a/src/nitro/communication/messages/parser/index.ts b/src/nitro/communication/messages/parser/index.ts index f9898c17..6f954ccb 100644 --- a/src/nitro/communication/messages/parser/index.ts +++ b/src/nitro/communication/messages/parser/index.ts @@ -20,4 +20,5 @@ export * from './quest'; export * from './room'; export * from './roomevents'; export * from './security'; +export * from './sound'; export * from './user'; diff --git a/src/nitro/communication/messages/parser/sound/JukeboxPlayListFullMessageParser.ts b/src/nitro/communication/messages/parser/sound/JukeboxPlayListFullMessageParser.ts new file mode 100644 index 00000000..9daa014a --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/JukeboxPlayListFullMessageParser.ts @@ -0,0 +1,14 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; + +export class JukeboxPlayListFullMessageParser implements IMessageParser +{ + flush(): boolean + { + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + return true; + } +} diff --git a/src/nitro/communication/messages/parser/sound/JukeboxSongDisksMessageParser.ts b/src/nitro/communication/messages/parser/sound/JukeboxSongDisksMessageParser.ts new file mode 100644 index 00000000..f07ab3fa --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/JukeboxSongDisksMessageParser.ts @@ -0,0 +1,37 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; + +export class JukeboxSongDisksMessageParser implements IMessageParser +{ + private _songDisks: Map = new Map(); + private _maxLength: number; + + flush(): boolean + { + this._songDisks.clear(); + this._maxLength = 0; + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + this._maxLength = wrapper.readInt(); + const count = wrapper.readInt(); + + for(let i = 0; i < count; i++) + { + this._songDisks.set(wrapper.readInt(), wrapper.readInt()); + } + + return true; + } + + public get songDisks(): Map + { + return this._songDisks; + } + + public get maxLength(): number + { + return this._maxLength; + } +} diff --git a/src/nitro/communication/messages/parser/sound/NowPlayingMessageParser.ts b/src/nitro/communication/messages/parser/sound/NowPlayingMessageParser.ts new file mode 100644 index 00000000..2ea7d4f0 --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/NowPlayingMessageParser.ts @@ -0,0 +1,56 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; + +export class NowPlayingMessageParser implements IMessageParser +{ + private _currentSongId:number; + private _currentPosition:number; + private _nextSongId:number; + private _nextPosition:number; + private _syncCount:number; + + flush(): boolean + { + this._currentSongId = -1; + this._currentPosition = -1; + this._nextSongId = -1; + this._nextPosition = -1; + this._syncCount = -1; + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + this._currentSongId = wrapper.readInt(); + this._currentPosition = wrapper.readInt(); + this._nextSongId = wrapper.readInt(); + this._nextPosition = wrapper.readInt(); + this._syncCount = wrapper.readInt(); + return true; + } + + public get currentSongId():number + { + return this._currentSongId; + } + + public get currentPosition():number + { + return this._currentPosition; + } + + public get nextSongId():number + { + return this._nextSongId; + } + + public get nextPosition():number + { + return this._nextPosition; + } + + public get syncCount():number + { + return this._syncCount; + } + +} diff --git a/src/nitro/communication/messages/parser/sound/OfficialSongIdMessageParser.ts b/src/nitro/communication/messages/parser/sound/OfficialSongIdMessageParser.ts new file mode 100644 index 00000000..c6d2770d --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/OfficialSongIdMessageParser.ts @@ -0,0 +1,31 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; + +export class OfficialSongIdMessageParser implements IMessageParser +{ + private _songId:number; + private _officialSongId:string; + + flush(): boolean + { + this._songId = 0; + this._officialSongId = ''; + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + this._officialSongId = wrapper.readString(); + this._songId = wrapper.readInt(); + return true; + } + + public get songId():number + { + return this._songId; + } + + public get officialSongId():string + { + return this._officialSongId; + } +} diff --git a/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts b/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts new file mode 100644 index 00000000..3ceb7920 --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/PlayListMessageParser.ts @@ -0,0 +1,40 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; +import { PlayListEntry } from '../../incoming/sound'; + +export class PlayListMessageParser implements IMessageParser +{ + private _synchronizationCount:number; + private _playlist:PlayListEntry[]; + + flush(): boolean + { + this._synchronizationCount = -1; + this._playlist = []; + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + this._synchronizationCount = wrapper.readInt(); + const count = wrapper.readInt(); + + for(let i = 0; i < count; i++) + { + this._playlist.push(new PlayListEntry( + wrapper.readInt(), wrapper.readInt(), wrapper.readString(), wrapper.readString() + )); + } + return true; + } + + public get synchronizationCount():number + { + return this._synchronizationCount; + } + + public get playList():PlayListEntry[] + { + return this._playlist; + } + +} diff --git a/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts b/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts new file mode 100644 index 00000000..d138839b --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/PlayListSongAddedMessageParser.ts @@ -0,0 +1,24 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; +import { PlayListEntry } from '../../incoming/sound'; + +export class PlayListSongAddedMessageParser implements IMessageParser +{ + private _entry:PlayListEntry; + + flush(): boolean + { + this._entry = null; + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + this._entry = new PlayListEntry(wrapper.readInt(), wrapper.readInt(), wrapper.readString(), wrapper.readString()); + return true; + } + + public get entry():PlayListEntry + { + return this._entry; + } +} diff --git a/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts b/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts new file mode 100644 index 00000000..71fe79e6 --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/TraxSongInfoMessageParser.ts @@ -0,0 +1,35 @@ +import { IMessageDataWrapper, IMessageParser } from '../../../../../core'; +import { SongInfoEntry } from '../../incoming/sound/SongInfoEntry'; + +export class TraxSongInfoMessageParser implements IMessageParser +{ + private _songs:SongInfoEntry[]; + + flush(): boolean + { + this._songs = []; + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + const count = wrapper.readInt(); + for(let i = 0; i< count; i++) + { + const id = wrapper.readInt(); + const _local_3 = wrapper.readString(); + const name = wrapper.readString(); + const data = wrapper.readString(); + const length = wrapper.readInt(); + const creator = wrapper.readString(); + const _local_10 = new SongInfoEntry(id, length, name, creator, data); + this._songs.push(_local_10); + } + return true; + } + + public get songs():SongInfoEntry[] + { + return this._songs; + } +} diff --git a/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts b/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts new file mode 100644 index 00000000..8717ea9c --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts @@ -0,0 +1,46 @@ +import { AdvancedMap, IMessageDataWrapper, IMessageParser } from '../../../../../core'; + +export class UserSongDisksInventoryMessageParser implements IMessageParser +{ + private _songDiskInventory: AdvancedMap = new AdvancedMap(); + + flush(): boolean + { + this._songDiskInventory.reset(); + return true; + } + + parse(wrapper: IMessageDataWrapper): boolean + { + const count = wrapper.readInt(); + + for(let i = 0; i < count; i++) + { + this._songDiskInventory.add(wrapper.readInt(), wrapper.readInt()); + } + return true; + } + + public getDiskId(k: number): number + { + if(((k >= 0) && (k < this._songDiskInventory.length))) + { + return this._songDiskInventory.getKey(k); + } + return -1; + } + + public getSongId(k: number): number + { + if(((k >= 0) && (k < this._songDiskInventory.length))) + { + return this._songDiskInventory.getWithIndex(k); + } + return -1; + } + + public get songDiskCount(): number + { + return this._songDiskInventory.length; + } +} diff --git a/src/nitro/communication/messages/parser/sound/index.ts b/src/nitro/communication/messages/parser/sound/index.ts new file mode 100644 index 00000000..edf11c6d --- /dev/null +++ b/src/nitro/communication/messages/parser/sound/index.ts @@ -0,0 +1,8 @@ +export * from './JukeboxPlayListFullMessageParser'; +export * from './JukeboxSongDisksMessageParser'; +export * from './NowPlayingMessageParser'; +export * from './OfficialSongIdMessageParser'; +export * from './PlayListMessageParser'; +export * from './PlayListSongAddedMessageParser'; +export * from './TraxSongInfoMessageParser'; +export * from './UserSongDisksInventoryMessageParser'; From b893a9d9b11767d34d84f206921bb2647b87ade8 Mon Sep 17 00:00:00 2001 From: dank074 Date: Sun, 22 Aug 2021 03:16:14 -0500 Subject: [PATCH 3/3] my life is a lie --- .../messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts | 3 ++- .../messages/incoming/sound/JukeboxSongDisksMessageEvent.ts | 3 ++- .../messages/incoming/sound/NowPlayingMessageEvent.ts | 3 ++- .../messages/incoming/sound/OfficialSongIdMessageEvent.ts | 3 ++- .../messages/incoming/sound/PlayListMessageEvent.ts | 3 ++- .../messages/incoming/sound/PlayListSongAddedMessageEvent.ts | 3 ++- .../messages/incoming/sound/TraxSongInfoMessageEvent.ts | 3 ++- .../incoming/sound/UserSongDisksInventoryMessageEvent.ts | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts index 350a4bf6..fcfdf849 100644 --- a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { JukeboxPlayListFullMessageParser } from '../../parser'; export class JukeboxPlayListFullMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts index dc383a5e..48ace66a 100644 --- a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { JukeboxSongDisksMessageParser } from '../../parser'; export class JukeboxSongDisksMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts index d8756b4e..ae016990 100644 --- a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { NowPlayingMessageParser } from '../../parser'; export class NowPlayingMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts index 01524c21..883f53c0 100644 --- a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { OfficialSongIdMessageParser } from '../../parser'; export class OfficialSongIdMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts index 27eb5279..21d35432 100644 --- a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { PlayListMessageParser } from '../../parser'; export class PlayListMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts index 7ce8fc79..dea1784d 100644 --- a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { PlayListSongAddedMessageParser } from '../../parser'; export class PlayListSongAddedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts index 80c1b83b..8685aa8e 100644 --- a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { TraxSongInfoMessageParser } from '../../parser'; export class TraxSongInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts index 006912ca..6a58eae0 100644 --- a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts @@ -1,4 +1,5 @@ -import { IMessageEvent, MessageEvent } from '../../../../../core'; +import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent'; +import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent'; import { UserSongDisksInventoryMessageParser } from '../../parser'; export class UserSongDisksInventoryMessageEvent extends MessageEvent implements IMessageEvent